From d090d0ad447837b0f2b6f4f2ade391b87f460393 Mon Sep 17 00:00:00 2001 From: Scott Seago Date: Wed, 15 Jan 2025 16:26:45 -0500 Subject: [PATCH] Always create DataUpload configmap in restore namespace Signed-off-by: Scott Seago --- changelogs/unreleased/8621-sseago | 1 + pkg/restore/actions/dataupload_retrieve_action.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/8621-sseago diff --git a/changelogs/unreleased/8621-sseago b/changelogs/unreleased/8621-sseago new file mode 100644 index 0000000000..5ddcb85f49 --- /dev/null +++ b/changelogs/unreleased/8621-sseago @@ -0,0 +1 @@ +Always create DataUpload configmap in restore namespace diff --git a/pkg/restore/actions/dataupload_retrieve_action.go b/pkg/restore/actions/dataupload_retrieve_action.go index d5b922d6f0..ef8bcb3337 100644 --- a/pkg/restore/actions/dataupload_retrieve_action.go +++ b/pkg/restore/actions/dataupload_retrieve_action.go @@ -94,7 +94,7 @@ func (d *DataUploadRetrieveAction) Execute(input *velero.RestoreItemActionExecut }, ObjectMeta: metav1.ObjectMeta{ GenerateName: dataUpload.Name + "-", - Namespace: dataUpload.Namespace, + Namespace: input.Restore.Namespace, Labels: map[string]string{ velerov1api.RestoreUIDLabel: label.GetValidName(string(input.Restore.UID)), velerov1api.PVCNamespaceNameLabel: label.GetValidName(dataUpload.Spec.SourceNamespace + "." + dataUpload.Spec.SourcePVC),