Skip to content

Commit c6f652d

Browse files
committed
Refactor pod failure policy defaults
1 parent 616d6d4 commit c6f652d

File tree

3 files changed

+34
-11
lines changed

3 files changed

+34
-11
lines changed

pkg/apis/batch/v1/defaults.go

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,6 @@ func SetDefaults_Job(obj *batchv1.Job) {
5959
if obj.Spec.Suspend == nil {
6060
obj.Spec.Suspend = ptr.To(false)
6161
}
62-
if obj.Spec.PodFailurePolicy != nil {
63-
for _, rule := range obj.Spec.PodFailurePolicy.Rules {
64-
if rule.OnPodConditions != nil {
65-
for i, pattern := range rule.OnPodConditions {
66-
if pattern.Status == "" {
67-
rule.OnPodConditions[i].Status = corev1.ConditionTrue
68-
}
69-
}
70-
}
71-
}
72-
}
7362
if utilfeature.DefaultFeatureGate.Enabled(features.JobPodReplacementPolicy) {
7463
if obj.Spec.PodReplacementPolicy == nil {
7564
if obj.Spec.PodFailurePolicy != nil {
@@ -98,3 +87,9 @@ func SetDefaults_CronJob(obj *batchv1.CronJob) {
9887
obj.Spec.FailedJobsHistoryLimit = ptr.To[int32](1)
9988
}
10089
}
90+
91+
func SetDefaults_PodFailurePolicyOnPodConditionsPattern(obj *batchv1.PodFailurePolicyOnPodConditionsPattern) {
92+
if obj.Status == "" {
93+
obj.Status = corev1.ConditionTrue
94+
}
95+
}

pkg/apis/batch/v1/zz_generated.defaults.go

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/batch/v1beta1/zz_generated.defaults.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)