mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-07-20 15:03:04 +00:00
Joseph Antony Vaikath
2826b98190
* Merge backup PV labels instead of wholesale replacement during restore finalization Change patchDynamicPVWithVolumeInfo to merge backup labels into the dynamically provisioned PV rather than overwriting its entire label map. Labels already present on the new PV (e.g. topology labels set by the provisioner) are preserved, and only missing labels from the backup are added. This prevents stale topology labels from the source cluster from overwriting correct values set by the target cluster's provisioner. Update needPatch to only trigger when backup labels are absent from the new PV, not when values differ — since differing values now intentionally favour the dynamically provisioned PV. Signed-off-by: Joseph <joseph@amazee.io> Signed-off-by: Joseph <jvaikath@redhat.com> * Add changelog Signed-off-by: Joseph <jvaikath@redhat.com> * Update changelog to reflect new approach Signed-off-by: Joseph <joseph@amazee.io> Signed-off-by: Joseph <jvaikath@redhat.com> * Trigger CI rebuild Signed-off-by: Joseph <joseph@amazee.io> Signed-off-by: Joseph <jvaikath@redhat.com> --------- Signed-off-by: Joseph <joseph@amazee.io> Signed-off-by: Joseph <jvaikath@redhat.com>