github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #109612 from pandaamanda/remove_DeprecatedControllerOptions

Browse Source 
refactor: remove deprecated `deleting-pods-qps` `deleting-pods-burst` `register-retry-count`  flags
This commit is contained in:
Kubernetes Prow Robot
2022-05-04 02:34:54 -07:00
committed by GitHub
parent 366dcaa81c c4579165f1
commit 7adb7c1d06
8 changed files with 2 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/controller/apis/config/types.go
View File

@@ -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
}

4
pkg/controller/apis/config/v1alpha1/defaults.go
View File

@@ -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 {

6
pkg/controller/apis/config/v1alpha1/zz_generated.conversion.go generated
View File

@@ -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
}