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

[release-1.15] Datamover new ns 1.15
2025-01-16 18:21:48 +08:00 · 2025-01-16 18:21:48 +08:00 · 0d18f1d156
parent 804d73c4f2 233f3d0d56
commit 0d18f1d156
2 changed files with 2 additions and 1 deletions
--- a/changelogs/unreleased/8622-sseago
+++ b/changelogs/unreleased/8622-sseago
@ -0,0 +1 @@
+Always create DataUpload configmap in restore namespace
--- 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),
				`@ -0,0 +1 @@`
				`Always create DataUpload configmap in restore namespace`