mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-09 14:43:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8621 from sseago/datamover-new-ns
Some checks failed
Run the E2E test on kind / build (push) Failing after 5m31s
Details
Run the E2E test on kind / setup-test-matrix (push) Successful in 3s
Details
Run the E2E test on kind / run-e2e-test (push) Has been skipped
Details
Main CI / Build (push) Failing after 32s
Details
Close stale issues and PRs / stale (push) Successful in 8s
Details
Trivy Nightly Scan / Trivy nightly scan (velero, main) (push) Failing after 52s
Details
Trivy Nightly Scan / Trivy nightly scan (velero-restore-helper, main) (push) Failing after 49s
Details

Browse Source 
Always create DataUpload configmap in restore namespace
This commit is contained in:
lyndon-li
2025-01-16 11:11:50 +08:00
committed by GitHub
parent 054375093d d090d0ad44
commit 223e1fca70
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/8621-sseago Normal file
View File

@@ -0,0 +1 @@
Always create DataUpload configmap in restore namespace

2
pkg/restore/actions/dataupload_retrieve_action.go
View File

@@ -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),