Merge pull request #70472 from stewart-yu/stewart-kube-controller-manager-optionToconfig

[*-controller-manager]get rid of copied fields in the options and using componentconfig fields

cmd/cloud-controller-manager/app/options/BUILD

@@ -55,6 +55,7 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//cmd/controller-manager/app/options:go_default_library",
+        "//pkg/controller/apis/config:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",

cmd/cloud-controller-manager/app/options/options.go

@@ -82,10 +82,10 @@ func NewCloudControllerManagerOptions() (*CloudControllerManagerOptions, error)
 	}
 
 	s := CloudControllerManagerOptions{
-		Generic:         cmoptions.NewGenericControllerManagerConfigurationOptions(componentConfig.Generic),
+		Generic:         cmoptions.NewGenericControllerManagerConfigurationOptions(&componentConfig.Generic),
-		KubeCloudShared: cmoptions.NewKubeCloudSharedOptions(componentConfig.KubeCloudShared),
+		KubeCloudShared: cmoptions.NewKubeCloudSharedOptions(&componentConfig.KubeCloudShared),
 		ServiceController: &cmoptions.ServiceControllerOptions{
-			ConcurrentServiceSyncs: componentConfig.ServiceController.ConcurrentServiceSyncs,
+			ServiceControllerConfiguration: &componentConfig.ServiceController,
 		},
 		SecureServing: apiserveroptions.NewSecureServingOptions().WithLoopback(),
 		InsecureServing: (&apiserveroptions.DeprecatedInsecureServingOptions{

cmd/cloud-controller-manager/app/options/options_test.go

@@ -29,6 +29,7 @@ import (
 	apiserveroptions "k8s.io/apiserver/pkg/server/options"
 	componentbaseconfig "k8s.io/component-base/config"
 	cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"
+	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )
 
 func TestDefaultFlags(t *testing.T) {
@@ -36,6 +37,7 @@ func TestDefaultFlags(t *testing.T) {
 
 	expected := &CloudControllerManagerOptions{
 		Generic: &cmoptions.GenericControllerManagerConfigurationOptions{
+			GenericControllerManagerConfiguration: &kubectrlmgrconfig.GenericControllerManagerConfiguration{
 				Port:            DefaultInsecureCloudControllerManagerPort, // Note: InsecureServingOptions.ApplyTo will write the flag value back into the component config
 				Address:         "0.0.0.0",                                 // Note: InsecureServingOptions.ApplyTo will write the flag value back into the component config
 				MinResyncPeriod: metav1.Duration{Duration: 12 * time.Hour},
@@ -52,12 +54,16 @@ func TestDefaultFlags(t *testing.T) {
 					RenewDeadline: metav1.Duration{Duration: 10 * time.Second},
 					RetryPeriod:   metav1.Duration{Duration: 2 * time.Second},
 				},
-			Debugging: &cmoptions.DebuggingOptions{
-				EnableContentionProfiling: false,
-			},
 				Controllers: []string{"*"},
 			},
+			Debugging: &cmoptions.DebuggingOptions{
+				DebuggingConfiguration: &componentbaseconfig.DebuggingConfiguration{
+					EnableContentionProfiling: false,
+				},
+			},
+		},
 		KubeCloudShared: &cmoptions.KubeCloudSharedOptions{
+			KubeCloudSharedConfiguration: &kubectrlmgrconfig.KubeCloudSharedConfiguration{
 				RouteReconciliationPeriod: metav1.Duration{Duration: 10 * time.Second},
 				NodeMonitorPeriod:         metav1.Duration{Duration: 5 * time.Second},
 				ClusterName:               "kubernetes",
@@ -65,14 +71,19 @@ func TestDefaultFlags(t *testing.T) {
 				AllocateNodeCIDRs:         false,
 				CIDRAllocatorType:         "",
 				ConfigureCloudRoutes:      true,
+			},
 			CloudProvider: &cmoptions.CloudProviderOptions{
+				CloudProviderConfiguration: &kubectrlmgrconfig.CloudProviderConfiguration{
 					Name:            "",
 					CloudConfigFile: "",
 				},
 			},
+		},
 		ServiceController: &cmoptions.ServiceControllerOptions{
+			ServiceControllerConfiguration: &kubectrlmgrconfig.ServiceControllerConfiguration{
 				ConcurrentServiceSyncs: 1,
 			},
+		},
 		SecureServing: (&apiserveroptions.SecureServingOptions{
 			BindPort:    10258,
 			BindAddress: net.ParseIP("0.0.0.0"),
@@ -155,6 +166,7 @@ func TestAddFlags(t *testing.T) {
 
 	expected := &CloudControllerManagerOptions{
 		Generic: &cmoptions.GenericControllerManagerConfigurationOptions{
+			GenericControllerManagerConfiguration: &kubectrlmgrconfig.GenericControllerManagerConfiguration{
 				Port:            DefaultInsecureCloudControllerManagerPort, // Note: InsecureServingOptions.ApplyTo will write the flag value back into the component config
 				Address:         "0.0.0.0",                                 // Note: InsecureServingOptions.ApplyTo will write the flag value back into the component config
 				MinResyncPeriod: metav1.Duration{Duration: 100 * time.Minute},
@@ -171,16 +183,16 @@ func TestAddFlags(t *testing.T) {
 					RenewDeadline: metav1.Duration{Duration: 15 * time.Second},
 					RetryPeriod:   metav1.Duration{Duration: 5 * time.Second},
 				},
-			Debugging: &cmoptions.DebuggingOptions{
-				EnableContentionProfiling: true,
-			},
 				Controllers: []string{"foo", "bar"},
 			},
-		KubeCloudShared: &cmoptions.KubeCloudSharedOptions{
+			Debugging: &cmoptions.DebuggingOptions{
-			CloudProvider: &cmoptions.CloudProviderOptions{
+				DebuggingConfiguration: &componentbaseconfig.DebuggingConfiguration{
-				Name:            "gce",
+					EnableContentionProfiling: true,
-				CloudConfigFile: "/cloud-config",
 				},
+			},
+		},
+		KubeCloudShared: &cmoptions.KubeCloudSharedOptions{
+			KubeCloudSharedConfiguration: &kubectrlmgrconfig.KubeCloudSharedConfiguration{
 				RouteReconciliationPeriod: metav1.Duration{Duration: 30 * time.Second},
 				NodeMonitorPeriod:         metav1.Duration{Duration: 5 * time.Second},
 				ClusterName:               "k8s",
@@ -189,9 +201,18 @@ func TestAddFlags(t *testing.T) {
 				CIDRAllocatorType:         "RangeAllocator",
 				ConfigureCloudRoutes:      false,
 			},
+			CloudProvider: &cmoptions.CloudProviderOptions{
+				CloudProviderConfiguration: &kubectrlmgrconfig.CloudProviderConfiguration{
+					Name:            "gce",
+					CloudConfigFile: "/cloud-config",
+				},
+			},
+		},
 		ServiceController: &cmoptions.ServiceControllerOptions{
+			ServiceControllerConfiguration: &kubectrlmgrconfig.ServiceControllerConfiguration{
 				ConcurrentServiceSyncs: 1,
 			},
+		},
 		SecureServing: (&apiserveroptions.SecureServingOptions{
 			BindPort:    10001,
 			BindAddress: net.ParseIP("192.168.4.21"),

cmd/controller-manager/app/options/BUILD

@@ -16,7 +16,6 @@ go_library(
         "//pkg/client/leaderelectionconfig:go_default_library",
         "//pkg/cloudprovider/providers:go_default_library",
         "//pkg/controller/apis/config:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/globalflag:go_default_library",

cmd/controller-manager/app/options/cloudprovider.go

@@ -24,8 +24,7 @@ import (
 
 // CloudProviderOptions holds the cloudprovider options.
 type CloudProviderOptions struct {
-	CloudConfigFile string
+	*kubectrlmgrconfig.CloudProviderConfiguration
-	Name            string
 }
 
 // Validate checks validation of cloudprovider options.

cmd/controller-manager/app/options/debugging.go

@@ -24,8 +24,7 @@ import (
 
 // DebuggingOptions holds the Debugging options.
 type DebuggingOptions struct {
-	EnableProfiling           bool
+	*componentbaseconfig.DebuggingConfiguration
-	EnableContentionProfiling bool
 }
 
 // AddFlags adds flags related to debugging for controller manager to the specified FlagSet.

cmd/controller-manager/app/options/generic.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"strings"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	apiserverflag "k8s.io/apiserver/pkg/util/flag"
 	componentbaseconfig "k8s.io/component-base/config"
@@ -30,29 +29,19 @@ import (
 
 // GenericControllerManagerConfigurationOptions holds the options which are generic.
 type GenericControllerManagerConfigurationOptions struct {
-	Port                    int32
+	*kubectrlmgrconfig.GenericControllerManagerConfiguration
-	Address                 string
-	MinResyncPeriod         metav1.Duration
-	ClientConnection        componentbaseconfig.ClientConnectionConfiguration
-	ControllerStartInterval metav1.Duration
-	LeaderElection          componentbaseconfig.LeaderElectionConfiguration
 	Debugging *DebuggingOptions
-	Controllers             []string
 }
 
 // NewGenericControllerManagerConfigurationOptions returns generic configuration default values for both
 // the kube-controller-manager and the cloud-contoller-manager. Any common changes should
 // be made here. Any individual changes should be made in that controller.
-func NewGenericControllerManagerConfigurationOptions(cfg kubectrlmgrconfig.GenericControllerManagerConfiguration) *GenericControllerManagerConfigurationOptions {
+func NewGenericControllerManagerConfigurationOptions(cfg *kubectrlmgrconfig.GenericControllerManagerConfiguration) *GenericControllerManagerConfigurationOptions {
 	o := &GenericControllerManagerConfigurationOptions{
-		Port:                    cfg.Port,
+		GenericControllerManagerConfiguration: cfg,
-		Address:                 cfg.Address,
+		Debugging: &DebuggingOptions{
-		MinResyncPeriod:         cfg.MinResyncPeriod,
+			DebuggingConfiguration: &componentbaseconfig.DebuggingConfiguration{},
-		ClientConnection:        cfg.ClientConnection,
+		},
-		ControllerStartInterval: cfg.ControllerStartInterval,
-		LeaderElection:          cfg.LeaderElection,
-		Debugging:               &DebuggingOptions{},
-		Controllers:             cfg.Controllers,
 	}
 
 	return o

cmd/controller-manager/app/options/kubecloudshared.go

@@ -19,39 +19,25 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )
 
 // KubeCloudSharedOptions holds the options shared between kube-controller-manager
 // and cloud-controller-manager.
 type KubeCloudSharedOptions struct {
+	*kubectrlmgrconfig.KubeCloudSharedConfiguration
 	CloudProvider *CloudProviderOptions
-	ExternalCloudVolumePlugin    string
-	UseServiceAccountCredentials bool
-	AllowUntaggedCloud           bool
-	RouteReconciliationPeriod    metav1.Duration
-	NodeMonitorPeriod            metav1.Duration
-	ClusterName                  string
-	ClusterCIDR                  string
-	AllocateNodeCIDRs            bool
-	CIDRAllocatorType            string
-	ConfigureCloudRoutes         bool
-	NodeSyncPeriod               metav1.Duration
 }
 
 // NewKubeCloudSharedOptions returns common/default configuration values for both
 // the kube-controller-manager and the cloud-contoller-manager. Any common changes should
 // be made here. Any individual changes should be made in that controller.
-func NewKubeCloudSharedOptions(cfg kubectrlmgrconfig.KubeCloudSharedConfiguration) *KubeCloudSharedOptions {
+func NewKubeCloudSharedOptions(cfg *kubectrlmgrconfig.KubeCloudSharedConfiguration) *KubeCloudSharedOptions {
 	o := &KubeCloudSharedOptions{
-		CloudProvider:                &CloudProviderOptions{},
+		KubeCloudSharedConfiguration: cfg,
-		ExternalCloudVolumePlugin:    cfg.ExternalCloudVolumePlugin,
+		CloudProvider: &CloudProviderOptions{
-		UseServiceAccountCredentials: cfg.UseServiceAccountCredentials,
+			CloudProviderConfiguration: &kubectrlmgrconfig.CloudProviderConfiguration{},
-		RouteReconciliationPeriod:    cfg.RouteReconciliationPeriod,
+		},
-		NodeMonitorPeriod:            cfg.NodeMonitorPeriod,
-		ClusterName:                  cfg.ClusterName,
-		ConfigureCloudRoutes:         cfg.ConfigureCloudRoutes,
 	}
 
 	return o
@@ -92,6 +78,7 @@ func (o *KubeCloudSharedOptions) ApplyTo(cfg *kubectrlmgrconfig.KubeCloudSharedC
 	if err := o.CloudProvider.ApplyTo(&cfg.CloudProvider); err != nil {
 		return err
 	}
+
 	cfg.ExternalCloudVolumePlugin = o.ExternalCloudVolumePlugin
 	cfg.UseServiceAccountCredentials = o.UseServiceAccountCredentials
 	cfg.AllowUntaggedCloud = o.AllowUntaggedCloud

cmd/controller-manager/app/options/servicecontroller.go

@@ -24,7 +24,7 @@ import (
 
 // ServiceControllerOptions holds the ServiceController options.
 type ServiceControllerOptions struct {
-	ConcurrentServiceSyncs int32
+	*kubectrlmgrconfig.ServiceControllerConfiguration
 }
 
 // AddFlags adds flags related to ServiceController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/BUILD

@@ -40,7 +40,6 @@ go_library(
         "//pkg/features:go_default_library",
         "//pkg/master/ports:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",

cmd/kube-controller-manager/app/options/attachdetachcontroller.go

@@ -19,14 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )
 
 // AttachDetachControllerOptions holds the AttachDetachController options.
 type AttachDetachControllerOptions struct {
-	ReconcilerSyncLoopPeriod          metav1.Duration
+	*kubectrlmgrconfig.AttachDetachControllerConfiguration
-	DisableAttachDetachReconcilerSync bool
 }
 
 // AddFlags adds flags related to AttachDetachController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/csrsigningcontroller.go

@@ -19,7 +19,6 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )
 
@@ -35,9 +34,7 @@ const (
 
 // CSRSigningControllerOptions holds the CSRSigningController options.
 type CSRSigningControllerOptions struct {
-	ClusterSigningDuration metav1.Duration
+	*kubectrlmgrconfig.CSRSigningControllerConfiguration
-	ClusterSigningKeyFile  string
-	ClusterSigningCertFile string
 }
 
 // AddFlags adds flags related to CSRSigningController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/daemonsetcontroller.go

@@ -24,7 +24,7 @@ import (
 
 // DaemonSetControllerOptions holds the DaemonSetController options.
 type DaemonSetControllerOptions struct {
-	ConcurrentDaemonSetSyncs int32
+	*kubectrlmgrconfig.DaemonSetControllerConfiguration
 }
 
 // AddFlags adds flags related to DaemonSetController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/deploymentcontroller.go

@@ -19,14 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )
 
 // DeploymentControllerOptions holds the DeploymentController options.
 type DeploymentControllerOptions struct {
-	ConcurrentDeploymentSyncs      int32
+	*kubectrlmgrconfig.DeploymentControllerConfiguration
-	DeploymentControllerSyncPeriod metav1.Duration
 }
 
 // AddFlags adds flags related to DeploymentController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/deprecatedcontroller.go

@@ -25,9 +25,7 @@ import (
 // DeprecatedControllerOptions holds the DeprecatedController options, those option are deprecated.
 // TODO remove these fields once the deprecated flags are removed.
 type DeprecatedControllerOptions struct {
-	DeletingPodsQPS    float32
+	*kubectrlmgrconfig.DeprecatedControllerConfiguration
-	DeletingPodsBurst  int32
-	RegisterRetryCount int32
 }
 
 // AddFlags adds flags related to DeprecatedController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/endpointcontroller.go

@@ -24,7 +24,7 @@ import (
 
 // EndpointControllerOptions holds the EndPointController options.
 type EndpointControllerOptions struct {
-	ConcurrentEndpointSyncs int32
+	*kubectrlmgrconfig.EndpointControllerConfiguration
 }
 
 // AddFlags adds flags related to EndPointController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/garbagecollectorcontroller.go

@@ -24,9 +24,7 @@ import (
 
 // GarbageCollectorControllerOptions holds the GarbageCollectorController options.
 type GarbageCollectorControllerOptions struct {
-	ConcurrentGCSyncs      int32
+	*kubectrlmgrconfig.GarbageCollectorControllerConfiguration
-	GCIgnoredResources     []kubectrlmgrconfig.GroupResource
-	EnableGarbageCollector bool
 }
 
 // AddFlags adds flags related to GarbageCollectorController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/hpacontroller.go

@@ -19,20 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )
 
 // HPAControllerOptions holds the HPAController options.
 type HPAControllerOptions struct {
-	HorizontalPodAutoscalerUseRESTClients               bool
+	*kubectrlmgrconfig.HPAControllerConfiguration
-	HorizontalPodAutoscalerTolerance                    float64
-	HorizontalPodAutoscalerDownscaleStabilizationWindow metav1.Duration
-	HorizontalPodAutoscalerDownscaleForbiddenWindow     metav1.Duration
-	HorizontalPodAutoscalerUpscaleForbiddenWindow       metav1.Duration
-	HorizontalPodAutoscalerSyncPeriod                   metav1.Duration
-	HorizontalPodAutoscalerCPUInitializationPeriod      metav1.Duration
-	HorizontalPodAutoscalerInitialReadinessDelay        metav1.Duration
 }
 
 // AddFlags adds flags related to HPAController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/jobcontroller.go

@@ -24,7 +24,7 @@ import (
 
 // JobControllerOptions holds the JobController options.
 type JobControllerOptions struct {
-	ConcurrentJobSyncs int32
+	*kubectrlmgrconfig.JobControllerConfiguration
 }
 
 // AddFlags adds flags related to JobController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/namespacecontroller.go

@@ -19,14 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )
 
 // NamespaceControllerOptions holds the NamespaceController options.
 type NamespaceControllerOptions struct {
-	NamespaceSyncPeriod      metav1.Duration
+	*kubectrlmgrconfig.NamespaceControllerConfiguration
-	ConcurrentNamespaceSyncs int32
 }
 
 // AddFlags adds flags related to NamespaceController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/nodeipamcontroller.go

@@ -24,8 +24,7 @@ import (
 
 // NodeIPAMControllerOptions holds the NodeIpamController options.
 type NodeIPAMControllerOptions struct {
-	ServiceCIDR      string
+	*kubectrlmgrconfig.NodeIPAMControllerConfiguration
-	NodeCIDRMaskSize int32
 }
 
 // AddFlags adds flags related to NodeIpamController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/nodelifecyclecontroller.go

@@ -19,20 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )
 
 // NodeLifecycleControllerOptions holds the NodeLifecycleController options.
 type NodeLifecycleControllerOptions struct {
-	EnableTaintManager        bool
+	*kubectrlmgrconfig.NodeLifecycleControllerConfiguration
-	NodeEvictionRate          float32
-	SecondaryNodeEvictionRate float32
-	NodeStartupGracePeriod    metav1.Duration
-	NodeMonitorGracePeriod    metav1.Duration
-	PodEvictionTimeout        metav1.Duration
-	LargeClusterSizeThreshold int32
-	UnhealthyZoneThreshold    float32
 }
 
 // AddFlags adds flags related to NodeLifecycleController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/options.go

@@ -96,84 +96,67 @@ func NewKubeControllerManagerOptions() (*KubeControllerManagerOptions, error) {
 	}
 
 	s := KubeControllerManagerOptions{
-		Generic:         cmoptions.NewGenericControllerManagerConfigurationOptions(componentConfig.Generic),
+		Generic:         cmoptions.NewGenericControllerManagerConfigurationOptions(&componentConfig.Generic),
-		KubeCloudShared: cmoptions.NewKubeCloudSharedOptions(componentConfig.KubeCloudShared),
+		KubeCloudShared: cmoptions.NewKubeCloudSharedOptions(&componentConfig.KubeCloudShared),
+		ServiceController: &cmoptions.ServiceControllerOptions{
+			ServiceControllerConfiguration: &componentConfig.ServiceController,
+		},
 		AttachDetachController: &AttachDetachControllerOptions{
-			ReconcilerSyncLoopPeriod: componentConfig.AttachDetachController.ReconcilerSyncLoopPeriod,
+			&componentConfig.AttachDetachController,
 		},
 		CSRSigningController: &CSRSigningControllerOptions{
-			ClusterSigningCertFile: componentConfig.CSRSigningController.ClusterSigningCertFile,
+			&componentConfig.CSRSigningController,
-			ClusterSigningKeyFile:  componentConfig.CSRSigningController.ClusterSigningKeyFile,
-			ClusterSigningDuration: componentConfig.CSRSigningController.ClusterSigningDuration,
 		},
 		DaemonSetController: &DaemonSetControllerOptions{
-			ConcurrentDaemonSetSyncs: componentConfig.DaemonSetController.ConcurrentDaemonSetSyncs,
+			&componentConfig.DaemonSetController,
 		},
 		DeploymentController: &DeploymentControllerOptions{
-			ConcurrentDeploymentSyncs:      componentConfig.DeploymentController.ConcurrentDeploymentSyncs,
+			&componentConfig.DeploymentController,
-			DeploymentControllerSyncPeriod: componentConfig.DeploymentController.DeploymentControllerSyncPeriod,
 		},
 		DeprecatedFlags: &DeprecatedControllerOptions{
-			RegisterRetryCount: componentConfig.DeprecatedController.RegisterRetryCount,
+			&componentConfig.DeprecatedController,
 		},
 		EndpointController: &EndpointControllerOptions{
-			ConcurrentEndpointSyncs: componentConfig.EndpointController.ConcurrentEndpointSyncs,
+			&componentConfig.EndpointController,
 		},
 		GarbageCollectorController: &GarbageCollectorControllerOptions{
-			ConcurrentGCSyncs:      componentConfig.GarbageCollectorController.ConcurrentGCSyncs,
+			&componentConfig.GarbageCollectorController,
-			EnableGarbageCollector: componentConfig.GarbageCollectorController.EnableGarbageCollector,
 		},
 		HPAController: &HPAControllerOptions{
-			HorizontalPodAutoscalerSyncPeriod:                   componentConfig.HPAController.HorizontalPodAutoscalerSyncPeriod,
+			&componentConfig.HPAController,
-			HorizontalPodAutoscalerUpscaleForbiddenWindow:       componentConfig.HPAController.HorizontalPodAutoscalerUpscaleForbiddenWindow,
-			HorizontalPodAutoscalerDownscaleForbiddenWindow:     componentConfig.HPAController.HorizontalPodAutoscalerDownscaleForbiddenWindow,
-			HorizontalPodAutoscalerDownscaleStabilizationWindow: componentConfig.HPAController.HorizontalPodAutoscalerDownscaleStabilizationWindow,
-			HorizontalPodAutoscalerCPUInitializationPeriod:      componentConfig.HPAController.HorizontalPodAutoscalerCPUInitializationPeriod,
-			HorizontalPodAutoscalerInitialReadinessDelay:        componentConfig.HPAController.HorizontalPodAutoscalerInitialReadinessDelay,
-			HorizontalPodAutoscalerTolerance:                    componentConfig.HPAController.HorizontalPodAutoscalerTolerance,
-			HorizontalPodAutoscalerUseRESTClients:               componentConfig.HPAController.HorizontalPodAutoscalerUseRESTClients,
 		},
 		JobController: &JobControllerOptions{
-			ConcurrentJobSyncs: componentConfig.JobController.ConcurrentJobSyncs,
+			&componentConfig.JobController,
 		},
 		NamespaceController: &NamespaceControllerOptions{
-			NamespaceSyncPeriod:      componentConfig.NamespaceController.NamespaceSyncPeriod,
+			&componentConfig.NamespaceController,
-			ConcurrentNamespaceSyncs: componentConfig.NamespaceController.ConcurrentNamespaceSyncs,
 		},
 		NodeIPAMController: &NodeIPAMControllerOptions{
-			NodeCIDRMaskSize: componentConfig.NodeIPAMController.NodeCIDRMaskSize,
+			&componentConfig.NodeIPAMController,
 		},
 		NodeLifecycleController: &NodeLifecycleControllerOptions{
-			EnableTaintManager:     componentConfig.NodeLifecycleController.EnableTaintManager,
+			&componentConfig.NodeLifecycleController,
-			NodeMonitorGracePeriod: componentConfig.NodeLifecycleController.NodeMonitorGracePeriod,
-			NodeStartupGracePeriod: componentConfig.NodeLifecycleController.NodeStartupGracePeriod,
-			PodEvictionTimeout:     componentConfig.NodeLifecycleController.PodEvictionTimeout,
 		},
 		PersistentVolumeBinderController: &PersistentVolumeBinderControllerOptions{
-			PVClaimBinderSyncPeriod: componentConfig.PersistentVolumeBinderController.PVClaimBinderSyncPeriod,
+			&componentConfig.PersistentVolumeBinderController,
-			VolumeConfiguration:     componentConfig.PersistentVolumeBinderController.VolumeConfiguration,
 		},
 		PodGCController: &PodGCControllerOptions{
-			TerminatedPodGCThreshold: componentConfig.PodGCController.TerminatedPodGCThreshold,
+			&componentConfig.PodGCController,
 		},
 		ReplicaSetController: &ReplicaSetControllerOptions{
-			ConcurrentRSSyncs: componentConfig.ReplicaSetController.ConcurrentRSSyncs,
+			&componentConfig.ReplicaSetController,
 		},
 		ReplicationController: &ReplicationControllerOptions{
-			ConcurrentRCSyncs: componentConfig.ReplicationController.ConcurrentRCSyncs,
+			&componentConfig.ReplicationController,
 		},
 		ResourceQuotaController: &ResourceQuotaControllerOptions{
-			ResourceQuotaSyncPeriod:      componentConfig.ResourceQuotaController.ResourceQuotaSyncPeriod,
+			&componentConfig.ResourceQuotaController,
-			ConcurrentResourceQuotaSyncs: componentConfig.ResourceQuotaController.ConcurrentResourceQuotaSyncs,
 		},
 		SAController: &SAControllerOptions{
-			ConcurrentSATokenSyncs: componentConfig.SAController.ConcurrentSATokenSyncs,
+			&componentConfig.SAController,
-		},
-		ServiceController: &cmoptions.ServiceControllerOptions{
-			ConcurrentServiceSyncs: componentConfig.ServiceController.ConcurrentServiceSyncs,
 		},
 		TTLAfterFinishedController: &TTLAfterFinishedControllerOptions{
-			ConcurrentTTLSyncs: componentConfig.TTLAfterFinishedController.ConcurrentTTLSyncs,
+			&componentConfig.TTLAfterFinishedController,
 		},
 		SecureServing: apiserveroptions.NewSecureServingOptions().WithLoopback(),
 		InsecureServing: (&apiserveroptions.DeprecatedInsecureServingOptions{

cmd/kube-controller-manager/app/options/options_test.go

@@ -124,6 +124,7 @@ func TestAddFlags(t *testing.T) {
 
 	expected := &KubeControllerManagerOptions{
 		Generic: &cmoptions.GenericControllerManagerConfigurationOptions{
+			GenericControllerManagerConfiguration: &kubectrlmgrconfig.GenericControllerManagerConfiguration{
 				Port:            10252,     // Note: InsecureServingOptions.ApplyTo will write the flag value back into the component config
 				Address:         "0.0.0.0", // Note: InsecureServingOptions.ApplyTo will write the flag value back into the component config
 				MinResyncPeriod: metav1.Duration{Duration: 8 * time.Hour},
@@ -140,13 +141,17 @@ func TestAddFlags(t *testing.T) {
 					RenewDeadline: metav1.Duration{Duration: 15 * time.Second},
 					RetryPeriod:   metav1.Duration{Duration: 5 * time.Second},
 				},
+				Controllers: []string{"foo", "bar"},
+			},
 			Debugging: &cmoptions.DebuggingOptions{
+				DebuggingConfiguration: &componentbaseconfig.DebuggingConfiguration{
 					EnableProfiling:           false,
 					EnableContentionProfiling: true,
 				},
-			Controllers: []string{"foo", "bar"},
+			},
 		},
 		KubeCloudShared: &cmoptions.KubeCloudSharedOptions{
+			KubeCloudSharedConfiguration: &kubectrlmgrconfig.KubeCloudSharedConfiguration{
 				UseServiceAccountCredentials: true,
 				RouteReconciliationPeriod:    metav1.Duration{Duration: 30 * time.Second},
 				NodeMonitorPeriod:            metav1.Duration{Duration: 10 * time.Second},
@@ -155,42 +160,65 @@ func TestAddFlags(t *testing.T) {
 				AllocateNodeCIDRs:            true,
 				CIDRAllocatorType:            "CloudAllocator",
 				ConfigureCloudRoutes:         false,
+			},
 			CloudProvider: &cmoptions.CloudProviderOptions{
+				CloudProviderConfiguration: &kubectrlmgrconfig.CloudProviderConfiguration{
 					Name:            "gce",
 					CloudConfigFile: "/cloud-config",
 				},
 			},
+		},
+		ServiceController: &cmoptions.ServiceControllerOptions{
+			ServiceControllerConfiguration: &kubectrlmgrconfig.ServiceControllerConfiguration{
+				ConcurrentServiceSyncs: 2,
+			},
+		},
 		AttachDetachController: &AttachDetachControllerOptions{
+			&kubectrlmgrconfig.AttachDetachControllerConfiguration{
 				ReconcilerSyncLoopPeriod:          metav1.Duration{Duration: 30 * time.Second},
 				DisableAttachDetachReconcilerSync: true,
 			},
+		},
 		CSRSigningController: &CSRSigningControllerOptions{
+			&kubectrlmgrconfig.CSRSigningControllerConfiguration{
 				ClusterSigningCertFile: "/cluster-signing-cert",
 				ClusterSigningKeyFile:  "/cluster-signing-key",
 				ClusterSigningDuration: metav1.Duration{Duration: 10 * time.Hour},
 			},
+		},
 		DaemonSetController: &DaemonSetControllerOptions{
+			&kubectrlmgrconfig.DaemonSetControllerConfiguration{
 				ConcurrentDaemonSetSyncs: 2,
 			},
+		},
 		DeploymentController: &DeploymentControllerOptions{
+			&kubectrlmgrconfig.DeploymentControllerConfiguration{
 				ConcurrentDeploymentSyncs:      10,
 				DeploymentControllerSyncPeriod: metav1.Duration{Duration: 45 * time.Second},
 			},
+		},
 		DeprecatedFlags: &DeprecatedControllerOptions{
+			&kubectrlmgrconfig.DeprecatedControllerConfiguration{
 				DeletingPodsQPS:    0.1,
 				RegisterRetryCount: 10,
 			},
+		},
 		EndpointController: &EndpointControllerOptions{
+			&kubectrlmgrconfig.EndpointControllerConfiguration{
 				ConcurrentEndpointSyncs: 10,
 			},
+		},
 		GarbageCollectorController: &GarbageCollectorControllerOptions{
+			&kubectrlmgrconfig.GarbageCollectorControllerConfiguration{
 				ConcurrentGCSyncs: 30,
 				GCIgnoredResources: []kubectrlmgrconfig.GroupResource{
 					{Group: "", Resource: "events"},
 				},
 				EnableGarbageCollector: false,
 			},
+		},
 		HPAController: &HPAControllerOptions{
+			&kubectrlmgrconfig.HPAControllerConfiguration{
 				HorizontalPodAutoscalerSyncPeriod:                   metav1.Duration{Duration: 45 * time.Second},
 				HorizontalPodAutoscalerUpscaleForbiddenWindow:       metav1.Duration{Duration: 1 * time.Minute},
 				HorizontalPodAutoscalerDownscaleForbiddenWindow:     metav1.Duration{Duration: 2 * time.Minute},
@@ -200,17 +228,25 @@ func TestAddFlags(t *testing.T) {
 				HorizontalPodAutoscalerTolerance:                    0.1,
 				HorizontalPodAutoscalerUseRESTClients:               true,
 			},
+		},
 		JobController: &JobControllerOptions{
+			&kubectrlmgrconfig.JobControllerConfiguration{
 				ConcurrentJobSyncs: 5,
 			},
+		},
 		NamespaceController: &NamespaceControllerOptions{
+			&kubectrlmgrconfig.NamespaceControllerConfiguration{
 				NamespaceSyncPeriod:      metav1.Duration{Duration: 10 * time.Minute},
 				ConcurrentNamespaceSyncs: 20,
 			},
+		},
 		NodeIPAMController: &NodeIPAMControllerOptions{
+			&kubectrlmgrconfig.NodeIPAMControllerConfiguration{
 				NodeCIDRMaskSize: 48,
 			},
+		},
 		NodeLifecycleController: &NodeLifecycleControllerOptions{
+			&kubectrlmgrconfig.NodeLifecycleControllerConfiguration{
 				EnableTaintManager:        false,
 				NodeEvictionRate:          0.2,
 				SecondaryNodeEvictionRate: 0.05,
@@ -220,7 +256,9 @@ func TestAddFlags(t *testing.T) {
 				LargeClusterSizeThreshold: 100,
 				UnhealthyZoneThreshold:    0.6,
 			},
+		},
 		PersistentVolumeBinderController: &PersistentVolumeBinderControllerOptions{
+			&kubectrlmgrconfig.PersistentVolumeBinderControllerConfiguration{
 				PVClaimBinderSyncPeriod: metav1.Duration{Duration: 30 * time.Second},
 				VolumeConfiguration: kubectrlmgrconfig.VolumeConfiguration{
 					EnableDynamicProvisioning:  false,
@@ -235,29 +273,39 @@ func TestAddFlags(t *testing.T) {
 					},
 				},
 			},
+		},
 		PodGCController: &PodGCControllerOptions{
+			&kubectrlmgrconfig.PodGCControllerConfiguration{
 				TerminatedPodGCThreshold: 12000,
 			},
+		},
 		ReplicaSetController: &ReplicaSetControllerOptions{
+			&kubectrlmgrconfig.ReplicaSetControllerConfiguration{
 				ConcurrentRSSyncs: 10,
 			},
+		},
 		ReplicationController: &ReplicationControllerOptions{
+			&kubectrlmgrconfig.ReplicationControllerConfiguration{
 				ConcurrentRCSyncs: 10,
 			},
+		},
 		ResourceQuotaController: &ResourceQuotaControllerOptions{
+			&kubectrlmgrconfig.ResourceQuotaControllerConfiguration{
 				ResourceQuotaSyncPeriod:      metav1.Duration{Duration: 10 * time.Minute},
 				ConcurrentResourceQuotaSyncs: 10,
 			},
+		},
 		SAController: &SAControllerOptions{
+			&kubectrlmgrconfig.SAControllerConfiguration{
 				ServiceAccountKeyFile:  "/service-account-private-key",
 				ConcurrentSATokenSyncs: 10,
 			},
-		ServiceController: &cmoptions.ServiceControllerOptions{
-			ConcurrentServiceSyncs: 2,
 		},
 		TTLAfterFinishedController: &TTLAfterFinishedControllerOptions{
+			&kubectrlmgrconfig.TTLAfterFinishedControllerConfiguration{
 				ConcurrentTTLSyncs: 8,
 			},
+		},
 		SecureServing: (&apiserveroptions.SecureServingOptions{
 			BindPort:    10001,
 			BindAddress: net.ParseIP("192.168.4.21"),

cmd/kube-controller-manager/app/options/persistentvolumebindercontroller.go

@@ -19,14 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )
 
 // PersistentVolumeBinderControllerOptions holds the PersistentVolumeBinderController options.
 type PersistentVolumeBinderControllerOptions struct {
-	PVClaimBinderSyncPeriod metav1.Duration
+	*kubectrlmgrconfig.PersistentVolumeBinderControllerConfiguration
-	VolumeConfiguration     kubectrlmgrconfig.VolumeConfiguration
 }
 
 // AddFlags adds flags related to PersistentVolumeBinderController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/podgccontroller.go

@@ -24,7 +24,7 @@ import (
 
 // PodGCControllerOptions holds the PodGCController options.
 type PodGCControllerOptions struct {
-	TerminatedPodGCThreshold int32
+	*kubectrlmgrconfig.PodGCControllerConfiguration
 }
 
 // AddFlags adds flags related to PodGCController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/replicasetcontroller.go

@@ -24,7 +24,7 @@ import (
 
 // ReplicaSetControllerOptions holds the ReplicaSetController options.
 type ReplicaSetControllerOptions struct {
-	ConcurrentRSSyncs int32
+	*kubectrlmgrconfig.ReplicaSetControllerConfiguration
 }
 
 // AddFlags adds flags related to ReplicaSetController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/replicationcontroller.go

@@ -24,7 +24,7 @@ import (
 
 // ReplicationControllerOptions holds the ReplicationController options.
 type ReplicationControllerOptions struct {
-	ConcurrentRCSyncs int32
+	*kubectrlmgrconfig.ReplicationControllerConfiguration
 }
 
 // AddFlags adds flags related to ReplicationController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/resourcequotacontroller.go

@@ -19,14 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )
 
 // ResourceQuotaControllerOptions holds the ResourceQuotaController options.
 type ResourceQuotaControllerOptions struct {
-	ResourceQuotaSyncPeriod      metav1.Duration
+	*kubectrlmgrconfig.ResourceQuotaControllerConfiguration
-	ConcurrentResourceQuotaSyncs int32
 }
 
 // AddFlags adds flags related to ResourceQuotaController for controller manager to the specified FlagSet.

cmd/kube-controller-manager/app/options/serviceaccountcontroller.go

@@ -24,9 +24,7 @@ import (
 
 // SAControllerOptions holds the ServiceAccountController options.
 type SAControllerOptions struct {
-	ServiceAccountKeyFile  string
+	*kubectrlmgrconfig.SAControllerConfiguration
-	ConcurrentSATokenSyncs int32
-	RootCAFile             string
 }
 
 // AddFlags adds flags related to ServiceAccountController for controller manager to the specified FlagSet

cmd/kube-controller-manager/app/options/ttlafterfinishedcontroller.go

@@ -24,7 +24,7 @@ import (
 
 // TTLAfterFinishedControllerOptions holds the TTLAfterFinishedController options.
 type TTLAfterFinishedControllerOptions struct {
-	ConcurrentTTLSyncs int32
+	*kubectrlmgrconfig.TTLAfterFinishedControllerConfiguration
 }
 
 // AddFlags adds flags related to TTLAfterFinishedController for controller manager to the specified FlagSet.