fix all the reference about the API packages change

cmd/cloud-controller-manager/app/apis/config/types.go

@@ -19,6 +19,7 @@ package config
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	serviceconfig "k8s.io/kubernetes/pkg/controller/service/config"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -35,7 +36,7 @@ type CloudControllerManagerConfiguration struct {
 
 	// ServiceControllerConfiguration holds configuration for ServiceController
 	// related features.
-	ServiceController kubectrlmgrconfig.ServiceControllerConfiguration
+	ServiceController serviceconfig.ServiceControllerConfiguration
 
 	// NodeStatusUpdateFrequency is the frequency at which the controller updates nodes' status
 	NodeStatusUpdateFrequency metav1.Duration

cmd/cloud-controller-manager/app/apis/config/v1alpha1/defaults.go

@@ -22,6 +22,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	kubectrlmgrconfigv1alpha1 "k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1"
+	serviceconfigv1alpha1 "k8s.io/kubernetes/pkg/controller/service/config/v1alpha1"
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
@@ -45,4 +46,6 @@ func SetDefaults_CloudControllerManagerConfiguration(obj *CloudControllerManager
 
 	// Use the default RecommendedDefaultGenericControllerManagerConfiguration options
 	kubectrlmgrconfigv1alpha1.RecommendedDefaultGenericControllerManagerConfiguration(&obj.Generic)
+	// Use the default RecommendedDefaultServiceControllerConfiguration options
+	serviceconfigv1alpha1.RecommendedDefaultServiceControllerConfiguration(&obj.ServiceController)
 }

cmd/cloud-controller-manager/app/apis/config/v1alpha1/doc.go

@@ -23,6 +23,7 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config
 // +k8s:conversion-gen=k8s.io/component-base/config/v1alpha1
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/service/config/v1alpha1
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=cloudcontrollermanager.config.k8s.io

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

@@ -30,6 +30,7 @@ import (
 	componentbaseconfig "k8s.io/component-base/config"
 	cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	serviceconfig "k8s.io/kubernetes/pkg/controller/service/config"
 )
 
 func TestDefaultFlags(t *testing.T) {
@@ -80,7 +81,7 @@ func TestDefaultFlags(t *testing.T) {
 			},
 		},
 		ServiceController: &cmoptions.ServiceControllerOptions{
-			ServiceControllerConfiguration: &kubectrlmgrconfig.ServiceControllerConfiguration{
+			ServiceControllerConfiguration: &serviceconfig.ServiceControllerConfiguration{
 				ConcurrentServiceSyncs: 1,
 			},
 		},
@@ -209,7 +210,7 @@ func TestAddFlags(t *testing.T) {
 			},
 		},
 		ServiceController: &cmoptions.ServiceControllerOptions{
-			ServiceControllerConfiguration: &kubectrlmgrconfig.ServiceControllerConfiguration{
+			ServiceControllerConfiguration: &serviceconfig.ServiceControllerConfiguration{
 				ConcurrentServiceSyncs: 1,
 			},
 		},

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	serviceconfig "k8s.io/kubernetes/pkg/controller/service/config"
 )
 
 // ServiceControllerOptions holds the ServiceController options.
 type ServiceControllerOptions struct {
-	*kubectrlmgrconfig.ServiceControllerConfiguration
+	*serviceconfig.ServiceControllerConfiguration
 }
 
 // AddFlags adds flags related to ServiceController for controller manager to the specified FlagSet.
@@ -37,7 +37,7 @@ func (o *ServiceControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up ServiceController config with options.
-func (o *ServiceControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.ServiceControllerConfiguration) error {
+func (o *ServiceControllerOptions) ApplyTo(cfg *serviceconfig.ServiceControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	attachdetachconfig "k8s.io/kubernetes/pkg/controller/volume/attachdetach/config"
 )
 
 // AttachDetachControllerOptions holds the AttachDetachController options.
 type AttachDetachControllerOptions struct {
-	*kubectrlmgrconfig.AttachDetachControllerConfiguration
+	*attachdetachconfig.AttachDetachControllerConfiguration
 }
 
 // AddFlags adds flags related to AttachDetachController for controller manager to the specified FlagSet.
@@ -38,7 +38,7 @@ func (o *AttachDetachControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up AttachDetachController config with options.
-func (o *AttachDetachControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.AttachDetachControllerConfiguration) error {
+func (o *AttachDetachControllerOptions) ApplyTo(cfg *attachdetachconfig.AttachDetachControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,7 +19,7 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	csrsigningconfig "k8s.io/kubernetes/pkg/controller/certificates/signer/config"
 )
 
 const (
@@ -34,7 +34,7 @@ const (
 
 // CSRSigningControllerOptions holds the CSRSigningController options.
 type CSRSigningControllerOptions struct {
-	*kubectrlmgrconfig.CSRSigningControllerConfiguration
+	*csrsigningconfig.CSRSigningControllerConfiguration
 }
 
 // AddFlags adds flags related to CSRSigningController for controller manager to the specified FlagSet.
@@ -49,7 +49,7 @@ func (o *CSRSigningControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up CSRSigningController config with options.
-func (o *CSRSigningControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.CSRSigningControllerConfiguration) error {
+func (o *CSRSigningControllerOptions) ApplyTo(cfg *csrsigningconfig.CSRSigningControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	daemonconfig "k8s.io/kubernetes/pkg/controller/daemon/config"
 )
 
 // DaemonSetControllerOptions holds the DaemonSetController options.
 type DaemonSetControllerOptions struct {
-	*kubectrlmgrconfig.DaemonSetControllerConfiguration
+	*daemonconfig.DaemonSetControllerConfiguration
 }
 
 // AddFlags adds flags related to DaemonSetController for controller manager to the specified FlagSet.
@@ -35,7 +35,7 @@ func (o *DaemonSetControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up DaemonSetController config with options.
-func (o *DaemonSetControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.DaemonSetControllerConfiguration) error {
+func (o *DaemonSetControllerOptions) ApplyTo(cfg *daemonconfig.DaemonSetControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	deploymentconfig "k8s.io/kubernetes/pkg/controller/deployment/config"
 )
 
 // DeploymentControllerOptions holds the DeploymentController options.
 type DeploymentControllerOptions struct {
-	*kubectrlmgrconfig.DeploymentControllerConfiguration
+	*deploymentconfig.DeploymentControllerConfiguration
 }
 
 // AddFlags adds flags related to DeploymentController for controller manager to the specified FlagSet.
@@ -38,7 +38,7 @@ func (o *DeploymentControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up DeploymentController config with options.
-func (o *DeploymentControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.DeploymentControllerConfiguration) error {
+func (o *DeploymentControllerOptions) ApplyTo(cfg *deploymentconfig.DeploymentControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	endpointconfig "k8s.io/kubernetes/pkg/controller/endpoint/config"
 )
 
 // EndpointControllerOptions holds the EndPointController options.
 type EndpointControllerOptions struct {
-	*kubectrlmgrconfig.EndpointControllerConfiguration
+	*endpointconfig.EndpointControllerConfiguration
 }
 
 // AddFlags adds flags related to EndPointController for controller manager to the specified FlagSet.
@@ -37,7 +37,7 @@ func (o *EndpointControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up EndPointController config with options.
-func (o *EndpointControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.EndpointControllerConfiguration) error {
+func (o *EndpointControllerOptions) ApplyTo(cfg *endpointconfig.EndpointControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	garbagecollectorconfig "k8s.io/kubernetes/pkg/controller/garbagecollector/config"
 )
 
 // GarbageCollectorControllerOptions holds the GarbageCollectorController options.
 type GarbageCollectorControllerOptions struct {
-	*kubectrlmgrconfig.GarbageCollectorControllerConfiguration
+	*garbagecollectorconfig.GarbageCollectorControllerConfiguration
 }
 
 // AddFlags adds flags related to GarbageCollectorController for controller manager to the specified FlagSet.
@@ -38,7 +38,7 @@ func (o *GarbageCollectorControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up GarbageCollectorController config with options.
-func (o *GarbageCollectorControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.GarbageCollectorControllerConfiguration) error {
+func (o *GarbageCollectorControllerOptions) ApplyTo(cfg *garbagecollectorconfig.GarbageCollectorControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	poautosclerconfig "k8s.io/kubernetes/pkg/controller/podautoscaler/config"
 )
 
 // HPAControllerOptions holds the HPAController options.
 type HPAControllerOptions struct {
-	*kubectrlmgrconfig.HPAControllerConfiguration
+	*poautosclerconfig.HPAControllerConfiguration
 }
 
 // AddFlags adds flags related to HPAController for controller manager to the specified FlagSet.
@@ -47,7 +47,7 @@ func (o *HPAControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up HPAController config with options.
-func (o *HPAControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.HPAControllerConfiguration) error {
+func (o *HPAControllerOptions) ApplyTo(cfg *poautosclerconfig.HPAControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	jobconfig "k8s.io/kubernetes/pkg/controller/job/config"
 )
 
 // JobControllerOptions holds the JobController options.
 type JobControllerOptions struct {
-	*kubectrlmgrconfig.JobControllerConfiguration
+	*jobconfig.JobControllerConfiguration
 }
 
 // AddFlags adds flags related to JobController for controller manager to the specified FlagSet.
@@ -35,7 +35,7 @@ func (o *JobControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up JobController config with options.
-func (o *JobControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.JobControllerConfiguration) error {
+func (o *JobControllerOptions) ApplyTo(cfg *jobconfig.JobControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	namespaceconfig "k8s.io/kubernetes/pkg/controller/namespace/config"
 )
 
 // NamespaceControllerOptions holds the NamespaceController options.
 type NamespaceControllerOptions struct {
-	*kubectrlmgrconfig.NamespaceControllerConfiguration
+	*namespaceconfig.NamespaceControllerConfiguration
 }
 
 // AddFlags adds flags related to NamespaceController for controller manager to the specified FlagSet.
@@ -38,7 +38,7 @@ func (o *NamespaceControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up NamespaceController config with options.
-func (o *NamespaceControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.NamespaceControllerConfiguration) error {
+func (o *NamespaceControllerOptions) ApplyTo(cfg *namespaceconfig.NamespaceControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	nodeipamconfig "k8s.io/kubernetes/pkg/controller/nodeipam/config"
 )
 
 // NodeIPAMControllerOptions holds the NodeIpamController options.
 type NodeIPAMControllerOptions struct {
-	*kubectrlmgrconfig.NodeIPAMControllerConfiguration
+	*nodeipamconfig.NodeIPAMControllerConfiguration
 }
 
 // AddFlags adds flags related to NodeIpamController for controller manager to the specified FlagSet.
@@ -38,7 +38,7 @@ func (o *NodeIPAMControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up NodeIpamController config with options.
-func (o *NodeIPAMControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.NodeIPAMControllerConfiguration) error {
+func (o *NodeIPAMControllerOptions) ApplyTo(cfg *nodeipamconfig.NodeIPAMControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	nodelifecycleconfig "k8s.io/kubernetes/pkg/controller/nodelifecycle/config"
 )
 
 // NodeLifecycleControllerOptions holds the NodeLifecycleController options.
 type NodeLifecycleControllerOptions struct {
-	*kubectrlmgrconfig.NodeLifecycleControllerConfiguration
+	*nodelifecycleconfig.NodeLifecycleControllerConfiguration
 }
 
 // AddFlags adds flags related to NodeLifecycleController for controller manager to the specified FlagSet.
@@ -48,7 +48,7 @@ func (o *NodeLifecycleControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up NodeLifecycleController config with options.
-func (o *NodeLifecycleControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.NodeLifecycleControllerConfiguration) error {
+func (o *NodeLifecycleControllerOptions) ApplyTo(cfg *nodelifecycleconfig.NodeLifecycleControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -39,6 +39,7 @@ import (
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 	kubectrlmgrconfigscheme "k8s.io/kubernetes/pkg/controller/apis/config/scheme"
 	"k8s.io/kubernetes/pkg/controller/garbagecollector"
+	garbagecollectorconfig "k8s.io/kubernetes/pkg/controller/garbagecollector/config"
 	"k8s.io/kubernetes/pkg/master/ports"
 
 	// add the kubernetes feature gates
@@ -177,9 +178,9 @@ func NewKubeControllerManagerOptions() (*KubeControllerManagerOptions, error) {
 	s.SecureServing.ServerCert.PairName = "kube-controller-manager"
 	s.SecureServing.BindPort = ports.KubeControllerManagerPort
 
-	gcIgnoredResources := make([]kubectrlmgrconfig.GroupResource, 0, len(garbagecollector.DefaultIgnoredResources()))
+	gcIgnoredResources := make([]garbagecollectorconfig.GroupResource, 0, len(garbagecollector.DefaultIgnoredResources()))
 	for r := range garbagecollector.DefaultIgnoredResources() {
-		gcIgnoredResources = append(gcIgnoredResources, kubectrlmgrconfig.GroupResource{Group: r.Group, Resource: r.Resource})
+		gcIgnoredResources = append(gcIgnoredResources, garbagecollectorconfig.GroupResource{Group: r.Group, Resource: r.Resource})
 	}
 
 	s.GarbageCollectorController.GCIgnoredResources = gcIgnoredResources

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

@@ -31,6 +31,25 @@ import (
 	componentbaseconfig "k8s.io/component-base/config"
 	cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	csrsigningconfig "k8s.io/kubernetes/pkg/controller/certificates/signer/config"
+	daemonconfig "k8s.io/kubernetes/pkg/controller/daemon/config"
+	deploymentconfig "k8s.io/kubernetes/pkg/controller/deployment/config"
+	endpointconfig "k8s.io/kubernetes/pkg/controller/endpoint/config"
+	garbagecollectorconfig "k8s.io/kubernetes/pkg/controller/garbagecollector/config"
+	jobconfig "k8s.io/kubernetes/pkg/controller/job/config"
+	namespaceconfig "k8s.io/kubernetes/pkg/controller/namespace/config"
+	nodeipamconfig "k8s.io/kubernetes/pkg/controller/nodeipam/config"
+	nodelifecycleconfig "k8s.io/kubernetes/pkg/controller/nodelifecycle/config"
+	poautosclerconfig "k8s.io/kubernetes/pkg/controller/podautoscaler/config"
+	podgcconfig "k8s.io/kubernetes/pkg/controller/podgc/config"
+	replicasetconfig "k8s.io/kubernetes/pkg/controller/replicaset/config"
+	replicationconfig "k8s.io/kubernetes/pkg/controller/replication/config"
+	resourcequotaconfig "k8s.io/kubernetes/pkg/controller/resourcequota/config"
+	serviceconfig "k8s.io/kubernetes/pkg/controller/service/config"
+	serviceaccountconfig "k8s.io/kubernetes/pkg/controller/serviceaccount/config"
+	ttlafterfinishedconfig "k8s.io/kubernetes/pkg/controller/ttlafterfinished/config"
+	attachdetachconfig "k8s.io/kubernetes/pkg/controller/volume/attachdetach/config"
+	persistentvolumeconfig "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/config"
 )
 
 func TestAddFlags(t *testing.T) {
@@ -169,30 +188,30 @@ func TestAddFlags(t *testing.T) {
 			},
 		},
 		ServiceController: &cmoptions.ServiceControllerOptions{
-			ServiceControllerConfiguration: &kubectrlmgrconfig.ServiceControllerConfiguration{
+			ServiceControllerConfiguration: &serviceconfig.ServiceControllerConfiguration{
 				ConcurrentServiceSyncs: 2,
 			},
 		},
 		AttachDetachController: &AttachDetachControllerOptions{
-			&kubectrlmgrconfig.AttachDetachControllerConfiguration{
+			&attachdetachconfig.AttachDetachControllerConfiguration{
 				ReconcilerSyncLoopPeriod:          metav1.Duration{Duration: 30 * time.Second},
 				DisableAttachDetachReconcilerSync: true,
 			},
 		},
 		CSRSigningController: &CSRSigningControllerOptions{
-			&kubectrlmgrconfig.CSRSigningControllerConfiguration{
+			&csrsigningconfig.CSRSigningControllerConfiguration{
 				ClusterSigningCertFile: "/cluster-signing-cert",
 				ClusterSigningKeyFile:  "/cluster-signing-key",
 				ClusterSigningDuration: metav1.Duration{Duration: 10 * time.Hour},
 			},
 		},
 		DaemonSetController: &DaemonSetControllerOptions{
-			&kubectrlmgrconfig.DaemonSetControllerConfiguration{
+			&daemonconfig.DaemonSetControllerConfiguration{
 				ConcurrentDaemonSetSyncs: 2,
 			},
 		},
 		DeploymentController: &DeploymentControllerOptions{
-			&kubectrlmgrconfig.DeploymentControllerConfiguration{
+			&deploymentconfig.DeploymentControllerConfiguration{
 				ConcurrentDeploymentSyncs:      10,
 				DeploymentControllerSyncPeriod: metav1.Duration{Duration: 45 * time.Second},
 			},
@@ -204,21 +223,21 @@ func TestAddFlags(t *testing.T) {
 			},
 		},
 		EndpointController: &EndpointControllerOptions{
-			&kubectrlmgrconfig.EndpointControllerConfiguration{
+			&endpointconfig.EndpointControllerConfiguration{
 				ConcurrentEndpointSyncs: 10,
 			},
 		},
 		GarbageCollectorController: &GarbageCollectorControllerOptions{
-			&kubectrlmgrconfig.GarbageCollectorControllerConfiguration{
+			&garbagecollectorconfig.GarbageCollectorControllerConfiguration{
 				ConcurrentGCSyncs: 30,
-				GCIgnoredResources: []kubectrlmgrconfig.GroupResource{
+				GCIgnoredResources: []garbagecollectorconfig.GroupResource{
 					{Group: "", Resource: "events"},
 				},
 				EnableGarbageCollector: false,
 			},
 		},
 		HPAController: &HPAControllerOptions{
-			&kubectrlmgrconfig.HPAControllerConfiguration{
+			&poautosclerconfig.HPAControllerConfiguration{
 				HorizontalPodAutoscalerSyncPeriod:                   metav1.Duration{Duration: 45 * time.Second},
 				HorizontalPodAutoscalerUpscaleForbiddenWindow:       metav1.Duration{Duration: 1 * time.Minute},
 				HorizontalPodAutoscalerDownscaleForbiddenWindow:     metav1.Duration{Duration: 2 * time.Minute},
@@ -230,23 +249,23 @@ func TestAddFlags(t *testing.T) {
 			},
 		},
 		JobController: &JobControllerOptions{
-			&kubectrlmgrconfig.JobControllerConfiguration{
+			&jobconfig.JobControllerConfiguration{
 				ConcurrentJobSyncs: 5,
 			},
 		},
 		NamespaceController: &NamespaceControllerOptions{
-			&kubectrlmgrconfig.NamespaceControllerConfiguration{
+			&namespaceconfig.NamespaceControllerConfiguration{
 				NamespaceSyncPeriod:      metav1.Duration{Duration: 10 * time.Minute},
 				ConcurrentNamespaceSyncs: 20,
 			},
 		},
 		NodeIPAMController: &NodeIPAMControllerOptions{
-			&kubectrlmgrconfig.NodeIPAMControllerConfiguration{
+			&nodeipamconfig.NodeIPAMControllerConfiguration{
 				NodeCIDRMaskSize: 48,
 			},
 		},
 		NodeLifecycleController: &NodeLifecycleControllerOptions{
-			&kubectrlmgrconfig.NodeLifecycleControllerConfiguration{
+			&nodelifecycleconfig.NodeLifecycleControllerConfiguration{
 				EnableTaintManager:        false,
 				NodeEvictionRate:          0.2,
 				SecondaryNodeEvictionRate: 0.05,
@@ -258,13 +277,13 @@ func TestAddFlags(t *testing.T) {
 			},
 		},
 		PersistentVolumeBinderController: &PersistentVolumeBinderControllerOptions{
-			&kubectrlmgrconfig.PersistentVolumeBinderControllerConfiguration{
+			&persistentvolumeconfig.PersistentVolumeBinderControllerConfiguration{
 				PVClaimBinderSyncPeriod: metav1.Duration{Duration: 30 * time.Second},
-				VolumeConfiguration: kubectrlmgrconfig.VolumeConfiguration{
+				VolumeConfiguration: persistentvolumeconfig.VolumeConfiguration{
 					EnableDynamicProvisioning:  false,
 					EnableHostPathProvisioning: true,
 					FlexVolumePluginDir:        "/flex-volume-plugin",
-					PersistentVolumeRecyclerConfiguration: kubectrlmgrconfig.PersistentVolumeRecyclerConfiguration{
+					PersistentVolumeRecyclerConfiguration: persistentvolumeconfig.PersistentVolumeRecyclerConfiguration{
 						MaximumRetry:             3,
 						MinimumTimeoutNFS:        200,
 						IncrementTimeoutNFS:      45,
@@ -275,34 +294,34 @@ func TestAddFlags(t *testing.T) {
 			},
 		},
 		PodGCController: &PodGCControllerOptions{
-			&kubectrlmgrconfig.PodGCControllerConfiguration{
+			&podgcconfig.PodGCControllerConfiguration{
 				TerminatedPodGCThreshold: 12000,
 			},
 		},
 		ReplicaSetController: &ReplicaSetControllerOptions{
-			&kubectrlmgrconfig.ReplicaSetControllerConfiguration{
+			&replicasetconfig.ReplicaSetControllerConfiguration{
 				ConcurrentRSSyncs: 10,
 			},
 		},
 		ReplicationController: &ReplicationControllerOptions{
-			&kubectrlmgrconfig.ReplicationControllerConfiguration{
+			&replicationconfig.ReplicationControllerConfiguration{
 				ConcurrentRCSyncs: 10,
 			},
 		},
 		ResourceQuotaController: &ResourceQuotaControllerOptions{
-			&kubectrlmgrconfig.ResourceQuotaControllerConfiguration{
+			&resourcequotaconfig.ResourceQuotaControllerConfiguration{
 				ResourceQuotaSyncPeriod:      metav1.Duration{Duration: 10 * time.Minute},
 				ConcurrentResourceQuotaSyncs: 10,
 			},
 		},
 		SAController: &SAControllerOptions{
-			&kubectrlmgrconfig.SAControllerConfiguration{
+			&serviceaccountconfig.SAControllerConfiguration{
 				ServiceAccountKeyFile:  "/service-account-private-key",
 				ConcurrentSATokenSyncs: 10,
 			},
 		},
 		TTLAfterFinishedController: &TTLAfterFinishedControllerOptions{
-			&kubectrlmgrconfig.TTLAfterFinishedControllerConfiguration{
+			&ttlafterfinishedconfig.TTLAfterFinishedControllerConfiguration{
 				ConcurrentTTLSyncs: 8,
 			},
 		},
@@ -349,7 +368,7 @@ func TestAddFlags(t *testing.T) {
 	}
 }
 
-type sortedGCIgnoredResources []kubectrlmgrconfig.GroupResource
+type sortedGCIgnoredResources []garbagecollectorconfig.GroupResource
 
 func (r sortedGCIgnoredResources) Len() int {
 	return len(r)

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	persistentvolumeconfig "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/config"
 )
 
 // PersistentVolumeBinderControllerOptions holds the PersistentVolumeBinderController options.
 type PersistentVolumeBinderControllerOptions struct {
-	*kubectrlmgrconfig.PersistentVolumeBinderControllerConfiguration
+	*persistentvolumeconfig.PersistentVolumeBinderControllerConfiguration
 }
 
 // AddFlags adds flags related to PersistentVolumeBinderController for controller manager to the specified FlagSet.
@@ -46,7 +46,7 @@ func (o *PersistentVolumeBinderControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up PersistentVolumeBinderController config with options.
-func (o *PersistentVolumeBinderControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.PersistentVolumeBinderControllerConfiguration) error {
+func (o *PersistentVolumeBinderControllerOptions) ApplyTo(cfg *persistentvolumeconfig.PersistentVolumeBinderControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	podgcconfig "k8s.io/kubernetes/pkg/controller/podgc/config"
 )
 
 // PodGCControllerOptions holds the PodGCController options.
 type PodGCControllerOptions struct {
-	*kubectrlmgrconfig.PodGCControllerConfiguration
+	*podgcconfig.PodGCControllerConfiguration
 }
 
 // AddFlags adds flags related to PodGCController for controller manager to the specified FlagSet.
@@ -37,7 +37,7 @@ func (o *PodGCControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up PodGCController config with options.
-func (o *PodGCControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.PodGCControllerConfiguration) error {
+func (o *PodGCControllerOptions) ApplyTo(cfg *podgcconfig.PodGCControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	replicasetconfig "k8s.io/kubernetes/pkg/controller/replicaset/config"
 )
 
 // ReplicaSetControllerOptions holds the ReplicaSetController options.
 type ReplicaSetControllerOptions struct {
-	*kubectrlmgrconfig.ReplicaSetControllerConfiguration
+	*replicasetconfig.ReplicaSetControllerConfiguration
 }
 
 // AddFlags adds flags related to ReplicaSetController for controller manager to the specified FlagSet.
@@ -37,7 +37,7 @@ func (o *ReplicaSetControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up ReplicaSetController config with options.
-func (o *ReplicaSetControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.ReplicaSetControllerConfiguration) error {
+func (o *ReplicaSetControllerOptions) ApplyTo(cfg *replicasetconfig.ReplicaSetControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	replicationconfig "k8s.io/kubernetes/pkg/controller/replication/config"
 )
 
 // ReplicationControllerOptions holds the ReplicationController options.
 type ReplicationControllerOptions struct {
-	*kubectrlmgrconfig.ReplicationControllerConfiguration
+	*replicationconfig.ReplicationControllerConfiguration
 }
 
 // AddFlags adds flags related to ReplicationController for controller manager to the specified FlagSet.
@@ -37,7 +37,7 @@ func (o *ReplicationControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up ReplicationController config with options.
-func (o *ReplicationControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.ReplicationControllerConfiguration) error {
+func (o *ReplicationControllerOptions) ApplyTo(cfg *replicationconfig.ReplicationControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	resourcequotaconfig "k8s.io/kubernetes/pkg/controller/resourcequota/config"
 )
 
 // ResourceQuotaControllerOptions holds the ResourceQuotaController options.
 type ResourceQuotaControllerOptions struct {
-	*kubectrlmgrconfig.ResourceQuotaControllerConfiguration
+	*resourcequotaconfig.ResourceQuotaControllerConfiguration
 }
 
 // AddFlags adds flags related to ResourceQuotaController for controller manager to the specified FlagSet.
@@ -38,7 +38,7 @@ func (o *ResourceQuotaControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up ResourceQuotaController config with options.
-func (o *ResourceQuotaControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.ResourceQuotaControllerConfiguration) error {
+func (o *ResourceQuotaControllerOptions) ApplyTo(cfg *resourcequotaconfig.ResourceQuotaControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	serviceaccountconfig "k8s.io/kubernetes/pkg/controller/serviceaccount/config"
 )
 
 // SAControllerOptions holds the ServiceAccountController options.
 type SAControllerOptions struct {
-	*kubectrlmgrconfig.SAControllerConfiguration
+	*serviceaccountconfig.SAControllerConfiguration
 }
 
 // AddFlags adds flags related to ServiceAccountController for controller manager to the specified FlagSet
@@ -39,7 +39,7 @@ func (o *SAControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up ServiceAccountController config with options.
-func (o *SAControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.SAControllerConfiguration) error {
+func (o *SAControllerOptions) ApplyTo(cfg *serviceaccountconfig.SAControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -19,12 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"
 
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	ttlafterfinishedconfig "k8s.io/kubernetes/pkg/controller/ttlafterfinished/config"
 )
 
 // TTLAfterFinishedControllerOptions holds the TTLAfterFinishedController options.
 type TTLAfterFinishedControllerOptions struct {
-	*kubectrlmgrconfig.TTLAfterFinishedControllerConfiguration
+	*ttlafterfinishedconfig.TTLAfterFinishedControllerConfiguration
 }
 
 // AddFlags adds flags related to TTLAfterFinishedController for controller manager to the specified FlagSet.
@@ -37,7 +37,7 @@ func (o *TTLAfterFinishedControllerOptions) AddFlags(fs *pflag.FlagSet) {
 }
 
 // ApplyTo fills up TTLAfterFinishedController config with options.
-func (o *TTLAfterFinishedControllerOptions) ApplyTo(cfg *kubectrlmgrconfig.TTLAfterFinishedControllerConfiguration) error {
+func (o *TTLAfterFinishedControllerOptions) ApplyTo(cfg *ttlafterfinishedconfig.TTLAfterFinishedControllerConfiguration) error {
 	if o == nil {
 		return nil
 	}

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

@@ -54,7 +54,7 @@ import (
 	"k8s.io/kubernetes/pkg/volume/vsphere_volume"
 
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
-	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
+	persistentvolumeconfig "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/config"
 	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/utils/exec"
 )
@@ -87,12 +87,12 @@ func ProbeAttachableVolumePlugins() []volume.VolumePlugin {
 // GetDynamicPluginProber gets the probers of dynamically discoverable plugins
 // for the attach/detach controller.
 // Currently only Flexvolume plugins are dynamically discoverable.
-func GetDynamicPluginProber(config kubectrlmgrconfig.VolumeConfiguration) volume.DynamicPluginProber {
+func GetDynamicPluginProber(config persistentvolumeconfig.VolumeConfiguration) volume.DynamicPluginProber {
 	return flexvolume.GetDynamicPluginProber(config.FlexVolumePluginDir, exec.New() /*exec.Interface*/)
 }
 
 // ProbeExpandableVolumePlugins returns volume plugins which are expandable
-func ProbeExpandableVolumePlugins(config kubectrlmgrconfig.VolumeConfiguration) []volume.VolumePlugin {
+func ProbeExpandableVolumePlugins(config persistentvolumeconfig.VolumeConfiguration) []volume.VolumePlugin {
 	allPlugins := []volume.VolumePlugin{}
 
 	allPlugins = append(allPlugins, awsebs.ProbeVolumePlugins()...)
@@ -114,7 +114,7 @@ func ProbeExpandableVolumePlugins(config kubectrlmgrconfig.VolumeConfiguration)
 // ProbeControllerVolumePlugins collects all persistent volume plugins into an
 // easy to use list. Only volume plugins that implement any of
 // provisioner/recycler/deleter interface should be returned.
-func ProbeControllerVolumePlugins(cloud cloudprovider.Interface, config kubectrlmgrconfig.VolumeConfiguration) []volume.VolumePlugin {
+func ProbeControllerVolumePlugins(cloud cloudprovider.Interface, config persistentvolumeconfig.VolumeConfiguration) []volume.VolumePlugin {
 	allPlugins := []volume.VolumePlugin{}
 
 	// The list of plugins to probe is decided by this binary, not

pkg/controller/apis/config/v1alpha1/conversion.go

@@ -48,13 +48,3 @@ func Convert_v1alpha1_KubeCloudSharedConfiguration_To_config_KubeCloudSharedConf
 func Convert_config_KubeCloudSharedConfiguration_To_v1alpha1_KubeCloudSharedConfiguration(in *config.KubeCloudSharedConfiguration, out *v1alpha1.KubeCloudSharedConfiguration, s conversion.Scope) error {
 	return autoConvert_config_KubeCloudSharedConfiguration_To_v1alpha1_KubeCloudSharedConfiguration(in, out, s)
 }
-
-// Convert_v1alpha1_ServiceControllerConfiguration_To_config_ServiceControllerConfiguration is an autogenerated conversion function.
-func Convert_v1alpha1_ServiceControllerConfiguration_To_config_ServiceControllerConfiguration(in *v1alpha1.ServiceControllerConfiguration, out *config.ServiceControllerConfiguration, s conversion.Scope) error {
-	return autoConvert_v1alpha1_ServiceControllerConfiguration_To_config_ServiceControllerConfiguration(in, out, s)
-}
-
-// Convert_config_ServiceControllerConfiguration_To_v1alpha1_ServiceControllerConfiguration is an autogenerated conversion function.
-func Convert_config_ServiceControllerConfiguration_To_v1alpha1_ServiceControllerConfiguration(in *config.ServiceControllerConfiguration, out *v1alpha1.ServiceControllerConfiguration, s conversion.Scope) error {
-	return autoConvert_config_ServiceControllerConfiguration_To_v1alpha1_ServiceControllerConfiguration(in, out, s)
-}

pkg/controller/apis/config/v1alpha1/doc.go

@@ -16,6 +16,26 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/apis/config
+// +k8s:conversion-gen=k8s.io/component-base/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/certificates/signer/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/daemon/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/deployment/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/endpoint/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/garbagecollector/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/job/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/namespace/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/nodeipam/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/nodelifecycle/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/podautoscaler/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/podgc/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/replicaset/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/replication/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/resourcequota/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/service/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/serviceaccount/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/ttlafterfinished/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/volume/attachdetach/config/v1alpha1
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/volume/persistentvolume/config/v1alpha1
 // +k8s:conversion-gen-external-types=k8s.io/kube-controller-manager/config/v1alpha1
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:defaulter-gen-input=../../../../../vendor/k8s.io/kube-controller-manager/config/v1alpha1