Merge pull request kubernetes#125442 from mimowo/job-pod-failure-policy-stable

Graduate JobPodFailurePolicy to stable

Author: k8s-ci-robot

api/openapi-spec/swagger.json

@@ -368,7 +368,7 @@
                 "$ref": "#/components/schemas/io.k8s.api.batch.v1.PodFailurePolicy"
               }
             ],
-            "description": "Specifies the policy of handling failed pods. In particular, it allows to specify the set of actions and conditions which need to be satisfied to take the associated action. If empty, the default behaviour applies - the counter of failed pods, represented by the jobs's .status.failed field, is incremented and it is checked against the backoffLimit. This field cannot be used in combination with restartPolicy=OnFailure.\n\nThis field is beta-level. It can be used when the `JobPodFailurePolicy` feature gate is enabled (enabled by default)."
+            "description": "Specifies the policy of handling failed pods. In particular, it allows to specify the set of actions and conditions which need to be satisfied to take the associated action. If empty, the default behaviour applies - the counter of failed pods, represented by the jobs's .status.failed field, is incremented and it is checked against the backoffLimit. This field cannot be used in combination with restartPolicy=OnFailure."
           },
           "podReplacementPolicy": {
             "description": "podReplacementPolicy specifies when to create replacement Pods. Possible values are: - TerminatingOrFailed means that we recreate pods\n  when they are terminating (has a metadata.deletionTimestamp) or failed.\n- Failed means to wait until a previously created Pod is fully terminated (has phase\n  Failed or Succeeded) before creating a replacement Pod.\n\nWhen using podFailurePolicy, Failed is the the only allowed value. TerminatingOrFailed and Failed are allowed values when podFailurePolicy is not in use. This is an beta field. To use this, enable the JobPodReplacementPolicy feature toggle. This is on by default.",

api/openapi-spec/v3/apis__batch__v1_openapi.json

@@ -330,8 +330,6 @@ type JobSpec struct {
 	// checked against the backoffLimit. This field cannot be used in combination
 	// with .spec.podTemplate.spec.restartPolicy=OnFailure.
 	//
-	// This field is beta-level. It can be used when the `JobPodFailurePolicy`
-	// feature gate is enabled (enabled by default).
 	// +optional
 	PodFailurePolicy *PodFailurePolicy
 

pkg/apis/batch/types.go

@@ -230,10 +230,9 @@ func TestCalculateSucceededIndexes(t *testing.T) {
 func TestIsIndexFailed(t *testing.T) {
 	logger, _ := ktesting.NewTestContext(t)
 	cases := map[string]struct {
-		enableJobPodFailurePolicy bool
-		job                       batch.Job
-		pod                       *v1.Pod
-		wantResult                bool
+		job        batch.Job
+		pod        *v1.Pod
+		wantResult bool
 	}{
 		"failed pod exceeding backoffLimitPerIndex, when backoffLimitPerIndex=0": {
 			job: batch.Job{
@@ -255,8 +254,7 @@ func TestIsIndexFailed(t *testing.T) {
 			pod:        buildPod().indexFailureCount("1").phase(v1.PodFailed).index("1").trackingFinalizer().Pod,
 			wantResult: true,
 		},
-		"matching FailIndex pod failure policy; JobPodFailurePolicy enabled": {
-			enableJobPodFailurePolicy: true,
+		"matching FailIndex pod failure policy": {
 			job: batch.Job{
 				Spec: batch.JobSpec{
 					Completions:          ptr.To[int32](2),
@@ -288,44 +286,10 @@ func TestIsIndexFailed(t *testing.T) {
 			}).index("0").trackingFinalizer().Pod,
 			wantResult: true,
 		},
-		"matching FailIndex pod failure policy; JobPodFailurePolicy disabled": {
-			enableJobPodFailurePolicy: false,
-			job: batch.Job{
-				Spec: batch.JobSpec{
-					Completions:          ptr.To[int32](2),
-					BackoffLimitPerIndex: ptr.To[int32](1),
-					PodFailurePolicy: &batch.PodFailurePolicy{
-						Rules: []batch.PodFailurePolicyRule{
-							{
-								Action: batch.PodFailurePolicyActionFailIndex,
-								OnExitCodes: &batch.PodFailurePolicyOnExitCodesRequirement{
-									Operator: batch.PodFailurePolicyOnExitCodesOpIn,
-									Values:   []int32{3},
-								},
-							},
-						},
-					},
-				},
-			},
-			pod: buildPod().indexFailureCount("0").status(v1.PodStatus{
-				Phase: v1.PodFailed,
-				ContainerStatuses: []v1.ContainerStatus{
-					{
-						State: v1.ContainerState{
-							Terminated: &v1.ContainerStateTerminated{
-								ExitCode: 3,
-							},
-						},
-					},
-				},
-			}).index("0").trackingFinalizer().Pod,
-			wantResult: false,
-		},
 	}
 	for name, tc := range cases {
 		t.Run(name, func(t *testing.T) {
 			featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, features.JobBackoffLimitPerIndex, true)
-			featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, features.JobPodFailurePolicy, tc.enableJobPodFailurePolicy)
 			gotResult := isIndexFailed(logger, &tc.job, tc.pod)
 			if diff := cmp.Diff(tc.wantResult, gotResult); diff != "" {
 				t.Errorf("Unexpected result (-want,+got):\n%s", diff)
@@ -337,11 +301,10 @@ func TestIsIndexFailed(t *testing.T) {
 func TestCalculateFailedIndexes(t *testing.T) {
 	logger, _ := ktesting.NewTestContext(t)
 	cases := map[string]struct {
-		enableJobPodFailurePolicy bool
-		job                       batch.Job
-		pods                      []*v1.Pod
-		wantPrevFailedIndexes     orderedIntervals
-		wantFailedIndexes         orderedIntervals
+		job                   batch.Job
+		pods                  []*v1.Pod
+		wantPrevFailedIndexes orderedIntervals
+		wantFailedIndexes     orderedIntervals
 	}{
 		"one new index failed": {
 			job: batch.Job{
@@ -440,7 +403,6 @@ func TestGetPodsWithDelayedDeletionPerIndex(t *testing.T) {
 	logger, _ := ktesting.NewTestContext(t)
 	now := time.Now()
 	cases := map[string]struct {
-		enableJobPodFailurePolicy           bool
 		job                                 batch.Job
 		pods                                []*v1.Pod
 		expectedRmFinalizers                sets.Set[string]
@@ -581,7 +543,6 @@ func TestGetPodsWithDelayedDeletionPerIndex(t *testing.T) {
 func TestGetNewIndexFailureCountValue(t *testing.T) {
 	logger, _ := ktesting.NewTestContext(t)
 	cases := map[string]struct {
-		enableJobPodFailurePolicy       bool
 		job                             batch.Job
 		pod                             *v1.Pod
 		wantNewIndexFailureCount        int32
@@ -601,8 +562,7 @@ func TestGetNewIndexFailureCountValue(t *testing.T) {
 			pod:                      buildPod().uid("a").indexFailureCount("3").phase(v1.PodFailed).index("0").trackingFinalizer().Pod,
 			wantNewIndexFailureCount: 4,
 		},
-		"failed pod being replaced, matching the ignore rule; JobPodFailurePolicy enabled": {
-			enableJobPodFailurePolicy: true,
+		"failed pod being replaced, matching the ignore rule": {
 			job: batch.Job{
 				Spec: batch.JobSpec{
 					PodFailurePolicy: &batch.PodFailurePolicy{
@@ -636,7 +596,6 @@ func TestGetNewIndexFailureCountValue(t *testing.T) {
 	for name, tc := range cases {
 		t.Run(name, func(t *testing.T) {
 			featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, features.JobBackoffLimitPerIndex, true)
-			featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, features.JobPodFailurePolicy, tc.enableJobPodFailurePolicy)
 			gotNewIndexFailureCount, gotNewIndexIgnoredFailureCount := getNewIndexFailureCounts(logger, &tc.job, tc.pod)
 			if diff := cmp.Diff(tc.wantNewIndexFailureCount, gotNewIndexFailureCount); diff != "" {
 				t.Errorf("Unexpected set of pods with delayed deletion (-want,+got):\n%s", diff)