From c4579165f1f39190009f65dd3faa6d0798aec9bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E4=B8=AD=E8=B0=8510171568?= Date: Fri, 22 Apr 2022 16:48:16 +0800 Subject: [PATCH] refactor: remove deprecated flags refactor: remove deprecated deleting-pods-qps deleting-pods-burst register-retry-count flags --- api/api-rules/violation_exceptions.list | 3 --- .../app/options/deprecatedcontroller.go | 12 --------- .../app/options/options_test.go | 10 ++----- pkg/controller/apis/config/types.go | 9 ------- .../apis/config/v1alpha1/defaults.go | 4 --- .../v1alpha1/zz_generated.conversion.go | 6 ----- pkg/generated/openapi/zz_generated.openapi.go | 27 ------------------- .../config/v1alpha1/types.go | 9 ------- 8 files changed, 2 insertions(+), 78 deletions(-) diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list index c8d8fe4c697b9..b95d4e53e6442 100644 --- a/api/api-rules/violation_exceptions.list +++ b/api/api-rules/violation_exceptions.list @@ -496,9 +496,6 @@ API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,C API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,CronJobControllerConfiguration,ConcurrentCronJobSyncs API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,DaemonSetControllerConfiguration,ConcurrentDaemonSetSyncs API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,DeploymentControllerConfiguration,ConcurrentDeploymentSyncs -API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,DeprecatedControllerConfiguration,DeletingPodsBurst -API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,DeprecatedControllerConfiguration,DeletingPodsQPS -API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,DeprecatedControllerConfiguration,RegisterRetryCount API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,EndpointControllerConfiguration,ConcurrentEndpointSyncs API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,EndpointControllerConfiguration,EndpointUpdatesBatchPeriod API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,EndpointSliceControllerConfiguration,ConcurrentServiceEndpointSyncs diff --git a/cmd/kube-controller-manager/app/options/deprecatedcontroller.go b/cmd/kube-controller-manager/app/options/deprecatedcontroller.go index 48ff5dd0d0a20..034e77a47e5e3 100644 --- a/cmd/kube-controller-manager/app/options/deprecatedcontroller.go +++ b/cmd/kube-controller-manager/app/options/deprecatedcontroller.go @@ -33,14 +33,6 @@ func (o *DeprecatedControllerOptions) AddFlags(fs *pflag.FlagSet) { if o == nil { return } - - fs.Float32Var(&o.DeletingPodsQPS, "deleting-pods-qps", 0.1, "Number of nodes per second on which pods are deleted in case of node failure.") - fs.MarkDeprecated("deleting-pods-qps", "This flag is currently no-op and will be deleted.") - fs.Int32Var(&o.DeletingPodsBurst, "deleting-pods-burst", 0, "Number of nodes on which pods are bursty deleted in case of node failure. For more details look into RateLimiter.") - fs.MarkDeprecated("deleting-pods-burst", "This flag is currently no-op and will be deleted.") - fs.Int32Var(&o.RegisterRetryCount, "register-retry-count", o.RegisterRetryCount, ""+ - "The number of retries for initial node registration. Retry interval equals node-sync-period.") - fs.MarkDeprecated("register-retry-count", "This flag is currently no-op and will be deleted.") } // ApplyTo fills up DeprecatedController config with options. @@ -49,10 +41,6 @@ func (o *DeprecatedControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.DeprecatedC return nil } - cfg.DeletingPodsQPS = o.DeletingPodsQPS - cfg.DeletingPodsBurst = o.DeletingPodsBurst - cfg.RegisterRetryCount = o.RegisterRetryCount - return nil } diff --git a/cmd/kube-controller-manager/app/options/options_test.go b/cmd/kube-controller-manager/app/options/options_test.go index 8c4675573493b..0369b9dd07cc6 100644 --- a/cmd/kube-controller-manager/app/options/options_test.go +++ b/cmd/kube-controller-manager/app/options/options_test.go @@ -266,10 +266,7 @@ func TestAddFlags(t *testing.T) { }, }, DeprecatedFlags: &DeprecatedControllerOptions{ - &kubectrlmgrconfig.DeprecatedControllerConfiguration{ - DeletingPodsQPS: 0.1, - RegisterRetryCount: 10, - }, + &kubectrlmgrconfig.DeprecatedControllerConfiguration{}, }, EndpointController: &EndpointControllerOptions{ &endpointconfig.EndpointControllerConfiguration{ @@ -534,10 +531,7 @@ func TestApplyTo(t *testing.T) { StatefulSetController: statefulsetconfig.StatefulSetControllerConfiguration{ ConcurrentStatefulSetSyncs: 15, }, - DeprecatedController: kubectrlmgrconfig.DeprecatedControllerConfiguration{ - DeletingPodsQPS: 0.1, - RegisterRetryCount: 10, - }, + DeprecatedController: kubectrlmgrconfig.DeprecatedControllerConfiguration{}, EndpointController: endpointconfig.EndpointControllerConfiguration{ ConcurrentEndpointSyncs: 10, }, diff --git a/pkg/controller/apis/config/types.go b/pkg/controller/apis/config/types.go index 8fd65bc37232d..9ec93e3c33b3c 100644 --- a/pkg/controller/apis/config/types.go +++ b/pkg/controller/apis/config/types.go @@ -134,13 +134,4 @@ type KubeControllerManagerConfiguration struct { // DeprecatedControllerConfiguration contains elements be deprecated. type DeprecatedControllerConfiguration struct { - // DEPRECATED: deletingPodsQps is the number of nodes per second on which pods are deleted in - // case of node failure. - DeletingPodsQPS float32 - // DEPRECATED: deletingPodsBurst is the number of nodes on which pods are bursty deleted in - // case of node failure. For more details look into RateLimiter. - DeletingPodsBurst int32 - // registerRetryCount is the number of retries for initial node registration. - // Retry interval equals node-sync-period. - RegisterRetryCount int32 } diff --git a/pkg/controller/apis/config/v1alpha1/defaults.go b/pkg/controller/apis/config/v1alpha1/defaults.go index bb3d6132f02a1..14b177073d03e 100644 --- a/pkg/controller/apis/config/v1alpha1/defaults.go +++ b/pkg/controller/apis/config/v1alpha1/defaults.go @@ -51,10 +51,6 @@ func addDefaultingFuncs(scheme *kruntime.Scheme) error { } func SetDefaults_KubeControllerManagerConfiguration(obj *kubectrlmgrconfigv1alpha1.KubeControllerManagerConfiguration) { - if obj.DeprecatedController.RegisterRetryCount == 0 { - obj.DeprecatedController.RegisterRetryCount = 10 - } - // These defaults override the recommended defaults from the componentbaseconfigv1alpha1 package that are applied automatically // These client-connection defaults are specific to the kube-controller-manager if obj.Generic.ClientConnection.QPS == 0.0 { diff --git a/pkg/controller/apis/config/v1alpha1/zz_generated.conversion.go b/pkg/controller/apis/config/v1alpha1/zz_generated.conversion.go index 1ca5ff5b2204e..e3f30346bced1 100644 --- a/pkg/controller/apis/config/v1alpha1/zz_generated.conversion.go +++ b/pkg/controller/apis/config/v1alpha1/zz_generated.conversion.go @@ -96,9 +96,6 @@ func RegisterConversions(s *runtime.Scheme) error { } func autoConvert_v1alpha1_DeprecatedControllerConfiguration_To_config_DeprecatedControllerConfiguration(in *v1alpha1.DeprecatedControllerConfiguration, out *config.DeprecatedControllerConfiguration, s conversion.Scope) error { - out.DeletingPodsQPS = in.DeletingPodsQPS - out.DeletingPodsBurst = in.DeletingPodsBurst - out.RegisterRetryCount = in.RegisterRetryCount return nil } @@ -108,9 +105,6 @@ func Convert_v1alpha1_DeprecatedControllerConfiguration_To_config_DeprecatedCont } func autoConvert_config_DeprecatedControllerConfiguration_To_v1alpha1_DeprecatedControllerConfiguration(in *config.DeprecatedControllerConfiguration, out *v1alpha1.DeprecatedControllerConfiguration, s conversion.Scope) error { - out.DeletingPodsQPS = in.DeletingPodsQPS - out.DeletingPodsBurst = in.DeletingPodsBurst - out.RegisterRetryCount = in.RegisterRetryCount return nil } diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 87ce880c93509..08e44de6b7d8d 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -48459,33 +48459,6 @@ func schema_k8sio_kube_controller_manager_config_v1alpha1_DeprecatedControllerCo SchemaProps: spec.SchemaProps{ Description: "DeprecatedControllerConfiguration contains elements be deprecated.", Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "DeletingPodsQPS": { - SchemaProps: spec.SchemaProps{ - Description: "DEPRECATED: deletingPodsQps is the number of nodes per second on which pods are deleted in case of node failure.", - Default: 0, - Type: []string{"number"}, - Format: "float", - }, - }, - "DeletingPodsBurst": { - SchemaProps: spec.SchemaProps{ - Description: "DEPRECATED: deletingPodsBurst is the number of nodes on which pods are bursty deleted in case of node failure. For more details look into RateLimiter.", - Default: 0, - Type: []string{"integer"}, - Format: "int32", - }, - }, - "RegisterRetryCount": { - SchemaProps: spec.SchemaProps{ - Description: "registerRetryCount is the number of retries for initial node registration. Retry interval equals node-sync-period.", - Default: 0, - Type: []string{"integer"}, - Format: "int32", - }, - }, - }, - Required: []string{"DeletingPodsQPS", "DeletingPodsBurst", "RegisterRetryCount"}, }, }, } diff --git a/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/types.go b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/types.go index 6f0710c67715b..7162fb927df47 100644 --- a/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/types.go +++ b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/types.go @@ -237,15 +237,6 @@ type StatefulSetControllerConfiguration struct { // DeprecatedControllerConfiguration contains elements be deprecated. type DeprecatedControllerConfiguration struct { - // DEPRECATED: deletingPodsQps is the number of nodes per second on which pods are deleted in - // case of node failure. - DeletingPodsQPS float32 - // DEPRECATED: deletingPodsBurst is the number of nodes on which pods are bursty deleted in - // case of node failure. For more details look into RateLimiter. - DeletingPodsBurst int32 - // registerRetryCount is the number of retries for initial node registration. - // Retry interval equals node-sync-period. - RegisterRetryCount int32 } // EndpointControllerConfiguration contains elements describing EndpointController.