Merge pull request #8622 from sseago/datamover-new-ns-1.15

[release-1.15] Datamover new ns 1.15
vmware-tanzu · Jan 16, 2025 · 0d18f1d · 0d18f1d
2 parents 804d73c + 233f3d0
commit 0d18f1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelogs/unreleased/8622-sseago b/changelogs/unreleased/8622-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
@@ -93,7 +93,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),
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Always create DataUpload configmap in restore namespace