mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-08 22:23:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6712 from kaovilai/jobs-label-k8s1.27

Browse Source 
On restore, delete Kubernetes 1.27 job controller uid label
This commit is contained in:
Daniel Jiang
2023-09-18 16:49:50 +08:00
committed by GitHub
parent 8481b4c035 c5aad9e488
commit cf3cb9c4ed
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/restore/job_action.go
View File

@@ -26,6 +26,11 @@ import (
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
)
const (
legacyControllerUIDLabel = "controller-uid" // <=1.27 This still exists in 1.27 for backward compatibility, maybe remove in 1.28?
controllerUIDLabel = "batch.kubernetes.io/controller-uid" // >=1.27 https://github.com/kubernetes/kubernetes/pull/114930#issuecomment-1384667494
)
type JobAction struct {
logger logrus.FieldLogger
}
@@ -47,9 +52,11 @@ func (a *JobAction) Execute(input *velero.RestoreItemActionExecuteInput) (*veler
}
if job.Spec.Selector != nil {
delete(job.Spec.Selector.MatchLabels, "controller-uid")
delete(job.Spec.Selector.MatchLabels, controllerUIDLabel)
delete(job.Spec.Selector.MatchLabels, legacyControllerUIDLabel)
}
delete(job.Spec.Template.ObjectMeta.Labels, "controller-uid")
delete(job.Spec.Template.ObjectMeta.Labels, controllerUIDLabel)
delete(job.Spec.Template.ObjectMeta.Labels, legacyControllerUIDLabel)
res, err := runtime.DefaultUnstructuredConverter.ToUnstructured(job)
if err != nil {