From 8dba9f782d5283112831ea2ee5c2fbb715f913e8 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Tue, 20 Sep 2022 11:00:43 +0800 Subject: [PATCH] remove GA featuregates IndexedJob and SuspendJob --- pkg/apis/batch/validation/validation.go | 1 - pkg/features/kube_features.go | 20 -------------------- 2 files changed, 21 deletions(-) diff --git a/pkg/apis/batch/validation/validation.go b/pkg/apis/batch/validation/validation.go index b63c65e9e7a..6ebb1a4fefd 100644 --- a/pkg/apis/batch/validation/validation.go +++ b/pkg/apis/batch/validation/validation.go @@ -181,7 +181,6 @@ func validateJobSpec(spec *batch.JobSpec, fldPath *field.Path, opts apivalidatio if spec.TTLSecondsAfterFinished != nil { allErrs = append(allErrs, apivalidation.ValidateNonnegativeField(int64(*spec.TTLSecondsAfterFinished), fldPath.Child("ttlSecondsAfterFinished"))...) } - // CompletionMode might be nil when IndexedJob feature gate is disabled. if spec.CompletionMode != nil { if *spec.CompletionMode != batch.NonIndexedCompletion && *spec.CompletionMode != batch.IndexedCompletion { allErrs = append(allErrs, field.NotSupported(fldPath.Child("completionMode"), spec.CompletionMode, []string{string(batch.NonIndexedCompletion), string(batch.IndexedCompletion)})) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 2cb339f8d55..107db141490 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -411,14 +411,6 @@ const ( // Disables the vSphere in-tree driver. InTreePluginvSphereUnregister featuregate.Feature = "InTreePluginvSphereUnregister" - // owner: @alculquicondor - // alpha: v1.21 - // beta: v1.22 - // stable: v1.24 - // - // Allows Job controller to manage Pod completions per completion index. - IndexedJob featuregate.Feature = "IndexedJob" - // owner: @danwinship // kep: http://kep.k8s.io/3178 // alpha: v1.25 @@ -763,14 +755,6 @@ const ( // StatefulSetMinReadySeconds allows minReadySeconds to be respected by StatefulSet controller StatefulSetMinReadySeconds featuregate.Feature = "StatefulSetMinReadySeconds" - // owner: @adtac - // alpha: v1.21 - // beta: v1.22 - // GA: v1.24 - // - // Allows jobs to be created in the suspended state. - SuspendJob featuregate.Feature = "SuspendJob" - // owner: @robscott // kep: http://kep.k8s.io/2433 // alpha: v1.21 @@ -949,8 +933,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS InTreePluginvSphereUnregister: {Default: false, PreRelease: featuregate.Alpha}, - IndexedJob: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.26 - IPTablesOwnershipCleanup: {Default: false, PreRelease: featuregate.Alpha}, JobPodFailurePolicy: {Default: false, PreRelease: featuregate.Alpha}, @@ -1045,8 +1027,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS StatefulSetMinReadySeconds: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.27 - SuspendJob: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.26 - TopologyAwareHints: {Default: true, PreRelease: featuregate.Beta}, TopologyManager: {Default: true, PreRelease: featuregate.Beta},