diff --git a/cmd/cloud-controller-manager/app/options/options_test.go b/cmd/cloud-controller-manager/app/options/options_test.go index 7538169b427..57f26c8ca9d 100644 --- a/cmd/cloud-controller-manager/app/options/options_test.go +++ b/cmd/cloud-controller-manager/app/options/options_test.go @@ -85,7 +85,6 @@ func TestAddFlags(t *testing.T) { ConcurrentRCSyncs: 5, MinResyncPeriod: metav1.Duration{Duration: 100 * time.Minute}, NodeMonitorPeriod: metav1.Duration{Duration: 5 * time.Second}, - ServiceSyncPeriod: metav1.Duration{Duration: 5 * time.Minute}, ResourceQuotaSyncPeriod: metav1.Duration{Duration: 5 * time.Minute}, NamespaceSyncPeriod: metav1.Duration{Duration: 5 * time.Minute}, PVClaimBinderSyncPeriod: metav1.Duration{Duration: 15 * time.Second}, diff --git a/cmd/controller-manager/app/options/utils.go b/cmd/controller-manager/app/options/utils.go index 903158f2eb4..196e4df2bc7 100644 --- a/cmd/controller-manager/app/options/utils.go +++ b/cmd/controller-manager/app/options/utils.go @@ -63,7 +63,6 @@ func GetDefaultControllerOptions(port int32) componentconfig.KubeControllerManag ConcurrentDeploymentSyncs: 5, ConcurrentNamespaceSyncs: 10, ConcurrentSATokenSyncs: 5, - ServiceSyncPeriod: metav1.Duration{Duration: 5 * time.Minute}, RouteReconciliationPeriod: metav1.Duration{Duration: 10 * time.Second}, ResourceQuotaSyncPeriod: metav1.Duration{Duration: 5 * time.Minute}, NamespaceSyncPeriod: metav1.Duration{Duration: 5 * time.Minute}, diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index 94548812aaa..3e2f0debe4c 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -80,7 +80,6 @@ func (s *CMServer) AddFlags(fs *pflag.FlagSet, allControllers []string, disabled fs.Int32Var(&s.ConcurrentDeploymentSyncs, "concurrent-deployment-syncs", s.ConcurrentDeploymentSyncs, "The number of deployment objects that are allowed to sync concurrently. Larger number = more responsive deployments, but more CPU (and network) load") fs.Int32Var(&s.ConcurrentNamespaceSyncs, "concurrent-namespace-syncs", s.ConcurrentNamespaceSyncs, "The number of namespace objects that are allowed to sync concurrently. Larger number = more responsive namespace termination, but more CPU (and network) load") fs.Int32Var(&s.ConcurrentSATokenSyncs, "concurrent-serviceaccount-token-syncs", s.ConcurrentSATokenSyncs, "The number of service account token objects that are allowed to sync concurrently. Larger number = more responsive token generation, but more CPU (and network) load") - fs.DurationVar(&s.ServiceSyncPeriod.Duration, "service-sync-period", s.ServiceSyncPeriod.Duration, "The period for syncing services with their external load balancers") fs.DurationVar(&s.NodeSyncPeriod.Duration, "node-sync-period", 0, ""+ "This flag is deprecated and will be removed in future releases. See node-monitor-period for Node health checking or "+ "route-reconciliation-period for cloud provider's route configuration settings.") diff --git a/cmd/kube-controller-manager/app/options/options_test.go b/cmd/kube-controller-manager/app/options/options_test.go index 904535121f7..94ac9382b9f 100644 --- a/cmd/kube-controller-manager/app/options/options_test.go +++ b/cmd/kube-controller-manager/app/options/options_test.go @@ -100,7 +100,6 @@ func TestAddFlags(t *testing.T) { "--route-reconciliation-period=30s", "--secondary-node-eviction-rate=0.05", "--service-account-private-key-file=/service-account-private-key", - "--service-sync-period=2m", "--terminated-pod-gc-threshold=12000", "--unhealthy-zone-threshold=0.6", "--use-service-account-credentials=true", @@ -138,7 +137,6 @@ func TestAddFlags(t *testing.T) { EnableProfiling: false, CIDRAllocatorType: "CloudAllocator", NodeCIDRMaskSize: 48, - ServiceSyncPeriod: metav1.Duration{Duration: 2 * time.Minute}, ResourceQuotaSyncPeriod: metav1.Duration{Duration: 10 * time.Minute}, NamespaceSyncPeriod: metav1.Duration{Duration: 10 * time.Minute}, PVClaimBinderSyncPeriod: metav1.Duration{Duration: 30 * time.Second}, diff --git a/pkg/apis/componentconfig/types.go b/pkg/apis/componentconfig/types.go index 4788176be67..89671f046a3 100644 --- a/pkg/apis/componentconfig/types.go +++ b/pkg/apis/componentconfig/types.go @@ -226,9 +226,6 @@ type KubeControllerManagerConfiguration struct { ConcurrentSATokenSyncs int32 // lookupCacheSizeForRC is the size of lookup cache for replication controllers. // Larger number = more responsive replica management, but more MEM load. - // serviceSyncPeriod is the period for syncing services with their external - // load balancers. - ServiceSyncPeriod metav1.Duration // nodeSyncPeriod is the period for syncing nodes from cloudprovider. Longer // periods will result in fewer calls to cloud provider, but may delay addition // of new nodes to cluster. diff --git a/pkg/apis/componentconfig/zz_generated.deepcopy.go b/pkg/apis/componentconfig/zz_generated.deepcopy.go index 31fad659dfc..0cce599efd9 100644 --- a/pkg/apis/componentconfig/zz_generated.deepcopy.go +++ b/pkg/apis/componentconfig/zz_generated.deepcopy.go @@ -90,7 +90,6 @@ func (in *KubeControllerManagerConfiguration) DeepCopyInto(out *KubeControllerMa *out = make([]string, len(*in)) copy(*out, *in) } - out.ServiceSyncPeriod = in.ServiceSyncPeriod out.NodeSyncPeriod = in.NodeSyncPeriod out.RouteReconciliationPeriod = in.RouteReconciliationPeriod out.ResourceQuotaSyncPeriod = in.ResourceQuotaSyncPeriod