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 #2294 from chaunceyjiang/ttl 

No need to propagate ttlsecondsafterfinished
This commit is contained in:
karmada-bot 2022-08-29 12:34:57 +08:00 committed by GitHub
parent b73ea25e8c 83c91ac909
commit 41615f8783
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/resourceinterpreter/defaultinterpreter/prune/prune.go
View File

@ -14,7 +14,7 @@ import (
// RemoveIrrelevantField used to remove fields that generated by kube-apiserver and no need(or can't) propagate to // RemoveIrrelevantField used to remove fields that generated by kube-apiserver and no need(or can't) propagate to
// member clusters. // member clusters.
func RemoveIrrelevantField(workload *unstructured.Unstructured) error { func RemoveIrrelevantField(workload *unstructured.Unstructured, extraHooks ...func(*unstructured.Unstructured)) error {
// populated by the kubernetes. // populated by the kubernetes.
unstructured.RemoveNestedField(workload.Object, "metadata", "creationTimestamp") unstructured.RemoveNestedField(workload.Object, "metadata", "creationTimestamp")
@ -63,9 +63,10 @@ func RemoveIrrelevantField(workload *unstructured.Unstructured) error {
if err != nil { if err != nil {
return err return err
} }
if job.Spec.ManualSelector == nil || !*job.Spec.ManualSelector { if job.Spec.ManualSelector == nil || !*job.Spec.ManualSelector {
return removeGenerateSelectorOfJob(workload) if err = removeGenerateSelectorOfJob(workload); err != nil {
return err
}
} }
} }
@ -83,6 +84,9 @@ func RemoveIrrelevantField(workload *unstructured.Unstructured) error {
} }
} }
for i := range extraHooks {
extraHooks[i](workload)
}
return nil return nil
} }
@ -121,3 +125,16 @@ func removeGenerateSelectorOfJob(workload *unstructured.Unstructured) error {
} }
return nil return nil
} }
// RemoveJobTTLSeconds removes the '.spec.ttlSecondsAfterFinished' from a Job.
// The reason for removing it is that the Job propagated by Karmada probably be automatically deleted
// from member clusters(by 'ttl-after-finished' controller in member clusters). That will cause a conflict if
// Karmada tries to re-create it. See https://github.com/karmada-io/karmada/issues/2197 for more details.
//
// It is recommended to enable the `ttl-after-finished` controller in the Karmada control plane.
// See https://karmada.io/docs/administrator/configuration/configure-controllers#ttl-after-finished for more details.
func RemoveJobTTLSeconds(workload *unstructured.Unstructured) {
if workload.GetKind() == util.JobKind {
unstructured.RemoveNestedField(workload.Object, "spec", "ttlSecondsAfterFinished")
}
}

2
pkg/webhook/work/mutating.go
View File

@ -43,7 +43,7 @@ func (a *MutatingAdmission) Handle(ctx context.Context, req admission.Request) a
return admission.Errored(http.StatusInternalServerError, err) return admission.Errored(http.StatusInternalServerError, err)
} }
err = prune.RemoveIrrelevantField(workloadObj) err = prune.RemoveIrrelevantField(workloadObj, prune.RemoveJobTTLSeconds)
if err != nil { if err != nil {
klog.Errorf("Failed to remove irrelevant field for work(%s): %v", work.Name, err) klog.Errorf("Failed to remove irrelevant field for work(%s): %v", work.Name, err)
return admission.Errored(http.StatusInternalServerError, err) return admission.Errored(http.StatusInternalServerError, err)