Merge pull request #6713 from kaovilai/jobs-label-k8s1.27-velero1.12

release-1.12: On restore, delete Kubernetes 1.27 job controller uid label
vmware-tanzu · Sep 29, 2023 · 554403d · 554403d
2 parents 9d5dd8e + aba64ba
commit 554403d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/changelogs/unreleased/6713-kaovilai b/changelogs/unreleased/6713-kaovilai
@@ -0,0 +1 @@
+Kubernetes 1.27 new job label batch.kubernetes.io/controller-uid are deleted during restore per https://github.com/kubernetes/kubernetes/pull/114930
diff --git a/pkg/restore/job_action.go b/pkg/restore/job_action.go
@@ -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 {