karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4160 from liangyuanpeng/prune_joblabel_1.27 

Remove label of job for kubernetes 1.27
This commit is contained in:
karmada-bot 2023-11-17 17:59:48 +08:00 committed by GitHub
parent 98e655fc55 3296603788
commit 5180ad5034
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/resourceinterpreter/default/native/prune/prune.go
View File

@ -98,9 +98,12 @@ func removeGenerateSelectorOfJob(workload *unstructured.Unstructured) error {
return err
}
if exist {
if util.GetLabelValue(matchLabels, "controller-uid") != "" {
delete(matchLabels, "controller-uid")
}
delete(matchLabels, "controller-uid")
// The label 'batch.kubernetes.io/controller-uid' was introduced at Kubernetes v1.27, which intend to replace
// the previous label "controller-uid"(without batch.kubernetes.io prefix).
// See https://github.com/kubernetes/kubernetes/pull/114930 for more details.
delete(matchLabels, batchv1.ControllerUidLabel)
err = unstructured.SetNestedStringMap(workload.Object, matchLabels, "spec", "selector", "matchLabels")
if err != nil {
return err
@ -112,13 +115,13 @@ func removeGenerateSelectorOfJob(workload *unstructured.Unstructured) error {
return err
}
if exist {
if util.GetLabelValue(templateLabels, "controller-uid") != "" {
delete(templateLabels, "controller-uid")
}
if util.GetLabelValue(templateLabels, "job-name") != "" {
delete(templateLabels, "job-name")
}
delete(templateLabels, "controller-uid")
delete(templateLabels, "job-name")
// The label 'batch.kubernetes.io/controller-uid' and 'batch.kubernetes.io/job-name' were introduced at
// Kubernetes v1.27, which intend to replace the previous labels 'controller-uid' and 'job-name' respectively.
// See https://github.com/kubernetes/kubernetes/pull/114930 for more details.
delete(templateLabels, batchv1.ControllerUidLabel)
delete(templateLabels, batchv1.JobNameLabel)
err = unstructured.SetNestedStringMap(workload.Object, templateLabels, "spec", "template", "metadata", "labels")
if err != nil {