From 444001ed44351b4e427955f4a2f4366bc25727f2 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Thu, 30 Sep 2021 13:49:10 +0800 Subject: [PATCH] Remove GAed feature gate CronJobControllerV2 --- cmd/kube-controller-manager/app/batch.go | 20 ++++---------------- pkg/features/kube_features.go | 10 ---------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/cmd/kube-controller-manager/app/batch.go b/cmd/kube-controller-manager/app/batch.go index fa363a4ce4e..92882973db5 100644 --- a/cmd/kube-controller-manager/app/batch.go +++ b/cmd/kube-controller-manager/app/batch.go @@ -24,11 +24,9 @@ import ( "context" "fmt" - utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/controller-manager/controller" "k8s.io/kubernetes/pkg/controller/cronjob" "k8s.io/kubernetes/pkg/controller/job" - kubefeatures "k8s.io/kubernetes/pkg/features" ) func startJobController(ctx context.Context, controllerContext ControllerContext) (controller.Interface, bool, error) { @@ -41,23 +39,13 @@ func startJobController(ctx context.Context, controllerContext ControllerContext } func startCronJobController(ctx context.Context, controllerContext ControllerContext) (controller.Interface, bool, error) { - if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.CronJobControllerV2) { - cj2c, err := cronjob.NewControllerV2(controllerContext.InformerFactory.Batch().V1().Jobs(), - controllerContext.InformerFactory.Batch().V1().CronJobs(), - controllerContext.ClientBuilder.ClientOrDie("cronjob-controller"), - ) - if err != nil { - return nil, true, fmt.Errorf("error creating CronJob controller V2: %v", err) - } - go cj2c.Run(int(controllerContext.ComponentConfig.CronJobController.ConcurrentCronJobSyncs), ctx.Done()) - return nil, true, nil - } - cjc, err := cronjob.NewController( + cj2c, err := cronjob.NewControllerV2(controllerContext.InformerFactory.Batch().V1().Jobs(), + controllerContext.InformerFactory.Batch().V1().CronJobs(), controllerContext.ClientBuilder.ClientOrDie("cronjob-controller"), ) if err != nil { - return nil, true, fmt.Errorf("error creating CronJob controller: %v", err) + return nil, true, fmt.Errorf("error creating CronJob controller V2: %v", err) } - go cjc.Run(ctx.Done()) + go cj2c.Run(int(controllerContext.ComponentConfig.CronJobController.ConcurrentCronJobSyncs), ctx.Done()) return nil, true, nil } diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 22cf9654e99..d288573c3d9 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -406,15 +406,6 @@ const ( // Enable all logic related to the PodDisruptionBudget API object in policy PodDisruptionBudget featuregate.Feature = "PodDisruptionBudget" - // owner: @alaypatel07, @soltysh - // alpha: v1.20 - // beta: v1.21 - // GA: v1.22 - // - // CronJobControllerV2 controls whether the controller manager starts old cronjob - // controller or new one which is implemented with informers and delaying queue - CronJobControllerV2 featuregate.Feature = "CronJobControllerV2" - // owner: @smarterclayton // alpha: v1.21 // beta: v1.22 @@ -804,7 +795,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS EndpointSliceNodeName: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, //remove in 1.25 WindowsEndpointSliceProxying: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.25 PodDisruptionBudget: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.25 - CronJobControllerV2: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.23 DaemonSetUpdateSurge: {Default: true, PreRelease: featuregate.Beta}, // on by default in 1.22 ImmutableEphemeralVolumes: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.24 HugePageStorageMediumSize: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.24