Graduate IndexedJob to stable

- Lock feature gate to true and schedule for deletion in 1.26
- Remove checks on feature gate
- Graduate E2E test to Conformance

Change-Id: I6814819d318edaed5c86dae4055f4b050a4d39fd

pkg/apis/batch/types.go

@@ -194,9 +194,10 @@ type JobSpec struct {
 	// `$(job-name)-$(index)-$(random-string)`,
 	// the Pod hostname takes the form `$(job-name)-$(index)`.
 	//
-	// This field is beta-level. More completion modes can be added in the future.
-	// If the Job controller observes a mode that it doesn't recognize, the
-	// controller skips updates for the Job.
+	// More completion modes can be added in the future.
+	// If the Job controller observes a mode that it doesn't recognize, which
+	// is possible during upgrades due to version skew, the controller
+	// skips updates for the Job.
 	// +optional
 	CompletionMode *CompletionMode
 

pkg/apis/batch/v1/defaults.go

@@ -19,8 +19,6 @@ package v1
 import (
 	batchv1 "k8s.io/api/batch/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
-	"k8s.io/kubernetes/pkg/features"
 	utilpointer "k8s.io/utils/pointer"
 )
 
@@ -45,7 +43,7 @@ func SetDefaults_Job(obj *batchv1.Job) {
 	if labels != nil && len(obj.Labels) == 0 {
 		obj.Labels = labels
 	}
-	if utilfeature.DefaultFeatureGate.Enabled(features.IndexedJob) && obj.Spec.CompletionMode == nil {
+	if obj.Spec.CompletionMode == nil {
 		mode := batchv1.NonIndexedCompletion
 		obj.Spec.CompletionMode = &mode
 	}

pkg/apis/batch/v1/defaults_test.go

@@ -25,12 +25,9 @@ import (
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apiserver/pkg/util/feature"
-	featuregatetesting "k8s.io/component-base/featuregate/testing"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	_ "k8s.io/kubernetes/pkg/apis/batch/install"
 	_ "k8s.io/kubernetes/pkg/apis/core/install"
-	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/utils/pointer"
 
 	. "k8s.io/kubernetes/pkg/apis/batch/v1"
@@ -39,31 +36,11 @@ import (
 func TestSetDefaultJob(t *testing.T) {
 	defaultLabels := map[string]string{"default": "default"}
 	tests := map[string]struct {
-		indexedJobEnabled bool
-		original          *batchv1.Job
-		expected          *batchv1.Job
-		expectLabels      bool
+		original     *batchv1.Job
+		expected     *batchv1.Job
+		expectLabels bool
 	}{
 		"All unspecified -> sets all to default values": {
-			original: &batchv1.Job{
-				Spec: batchv1.JobSpec{
-					Template: v1.PodTemplateSpec{
-						ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
-					},
-				},
-			},
-			expected: &batchv1.Job{
-				Spec: batchv1.JobSpec{
-					Completions:  pointer.Int32Ptr(1),
-					Parallelism:  pointer.Int32Ptr(1),
-					BackoffLimit: pointer.Int32Ptr(6),
-					Suspend:      pointer.BoolPtr(false),
-				},
-			},
-			expectLabels: true,
-		},
-		"All unspecified, indexed job enabled -> sets all to default values": {
-			indexedJobEnabled: true,
 			original: &batchv1.Job{
 				Spec: batchv1.JobSpec{
 					Template: v1.PodTemplateSpec{
@@ -92,10 +69,11 @@ func TestSetDefaultJob(t *testing.T) {
 			},
 			expected: &batchv1.Job{
 				Spec: batchv1.JobSpec{
-					Completions:  pointer.Int32Ptr(1),
-					Parallelism:  pointer.Int32Ptr(1),
-					BackoffLimit: pointer.Int32Ptr(6),
-					Suspend:      pointer.BoolPtr(false),
+					Completions:    pointer.Int32Ptr(1),
+					Parallelism:    pointer.Int32Ptr(1),
+					BackoffLimit:   pointer.Int32Ptr(6),
+					CompletionMode: completionModePtr(batchv1.NonIndexedCompletion),
+					Suspend:        pointer.BoolPtr(false),
 				},
 			},
 			expectLabels: true,
@@ -111,10 +89,11 @@ func TestSetDefaultJob(t *testing.T) {
 			},
 			expected: &batchv1.Job{
 				Spec: batchv1.JobSpec{
-					Completions:  pointer.Int32Ptr(1),
-					Parallelism:  pointer.Int32Ptr(1),
-					BackoffLimit: pointer.Int32Ptr(6),
-					Suspend:      pointer.BoolPtr(true),
+					Completions:    pointer.Int32Ptr(1),
+					Parallelism:    pointer.Int32Ptr(1),
+					BackoffLimit:   pointer.Int32Ptr(6),
+					CompletionMode: completionModePtr(batchv1.NonIndexedCompletion),
+					Suspend:        pointer.BoolPtr(true),
 				},
 			},
 			expectLabels: true,
@@ -132,10 +111,11 @@ func TestSetDefaultJob(t *testing.T) {
 			},
 			expected: &batchv1.Job{
 				Spec: batchv1.JobSpec{
-					Completions:  pointer.Int32Ptr(1),
-					Parallelism:  pointer.Int32Ptr(1),
-					BackoffLimit: pointer.Int32Ptr(6),
-					Suspend:      pointer.BoolPtr(false),
+					Completions:    pointer.Int32Ptr(1),
+					Parallelism:    pointer.Int32Ptr(1),
+					BackoffLimit:   pointer.Int32Ptr(6),
+					CompletionMode: completionModePtr(batchv1.NonIndexedCompletion),
+					Suspend:        pointer.BoolPtr(false),
 				},
 			},
 		},
@@ -150,9 +130,10 @@ func TestSetDefaultJob(t *testing.T) {
 			},
 			expected: &batchv1.Job{
 				Spec: batchv1.JobSpec{
-					Parallelism:  pointer.Int32Ptr(0),
-					BackoffLimit: pointer.Int32Ptr(6),
-					Suspend:      pointer.BoolPtr(false),
+					Parallelism:    pointer.Int32Ptr(0),
+					BackoffLimit:   pointer.Int32Ptr(6),
+					CompletionMode: completionModePtr(batchv1.NonIndexedCompletion),
+					Suspend:        pointer.BoolPtr(false),
 				},
 			},
 			expectLabels: true,
@@ -168,9 +149,10 @@ func TestSetDefaultJob(t *testing.T) {
 			},
 			expected: &batchv1.Job{
 				Spec: batchv1.JobSpec{
-					Parallelism:  pointer.Int32Ptr(2),
-					BackoffLimit: pointer.Int32Ptr(6),
-					Suspend:      pointer.BoolPtr(false),
+					Parallelism:    pointer.Int32Ptr(2),
+					BackoffLimit:   pointer.Int32Ptr(6),
+					CompletionMode: completionModePtr(batchv1.NonIndexedCompletion),
+					Suspend:        pointer.BoolPtr(false),
 				},
 			},
 			expectLabels: true,
@@ -186,10 +168,11 @@ func TestSetDefaultJob(t *testing.T) {
 			},
 			expected: &batchv1.Job{
 				Spec: batchv1.JobSpec{
-					Completions:  pointer.Int32Ptr(2),
-					Parallelism:  pointer.Int32Ptr(1),
-					BackoffLimit: pointer.Int32Ptr(6),
-					Suspend:      pointer.BoolPtr(false),
+					Completions:    pointer.Int32Ptr(2),
+					Parallelism:    pointer.Int32Ptr(1),
+					BackoffLimit:   pointer.Int32Ptr(6),
+					CompletionMode: completionModePtr(batchv1.NonIndexedCompletion),
+					Suspend:        pointer.BoolPtr(false),
 				},
 			},
 			expectLabels: true,
@@ -205,10 +188,11 @@ func TestSetDefaultJob(t *testing.T) {
 			},
 			expected: &batchv1.Job{
 				Spec: batchv1.JobSpec{
-					Completions:  pointer.Int32Ptr(1),
-					Parallelism:  pointer.Int32Ptr(1),
-					BackoffLimit: pointer.Int32Ptr(5),
-					Suspend:      pointer.BoolPtr(false),
+					Completions:    pointer.Int32Ptr(1),
+					Parallelism:    pointer.Int32Ptr(1),
+					BackoffLimit:   pointer.Int32Ptr(5),
+					CompletionMode: completionModePtr(batchv1.NonIndexedCompletion),
+					Suspend:        pointer.BoolPtr(false),
 				},
 			},
 			expectLabels: true,
@@ -268,8 +252,6 @@ func TestSetDefaultJob(t *testing.T) {
 
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			defer featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, features.IndexedJob, test.indexedJobEnabled)()
-
 			original := test.original
 			expected := test.expected
 			obj2 := roundTrip(t, runtime.Object(original))