From 1c6c45563f4fb959de2880cd57e490ba5b921766 Mon Sep 17 00:00:00 2001
From: stewart-yu <yuchuanjian@huawei.com>
Date: Tue, 4 Sep 2018 19:02:08 +0800
Subject: [PATCH] [kube-controller-manager] create package to hold
 kube-controller-manager component api

---
 pkg/controller/apis/config/doc.go             |  19 ++
 pkg/controller/apis/config/register.go        |  43 +++
 pkg/controller/apis/config/scheme/scheme.go   |  44 +++
 pkg/controller/apis/config/types.go           |  33 ++-
 .../apis/config/v1alpha1/conversion.go        |  60 ++++
 .../apis/config/v1alpha1/defaults.go          | 259 +++++++++++-------
 .../apis/config/v1alpha1/defaults_test.go     |  64 +++++
 pkg/controller/apis/config/v1alpha1/doc.go    |  23 ++
 .../apis/config/v1alpha1/register.go          |  40 +++
 .../.github/PULL_REQUEST_TEMPLATE.md          |   2 +
 .../kube-controller-manager/CONTRIBUTING.md   |   7 +
 .../k8s.io/kube-controller-manager/LICENSE    | 202 ++++++++++++++
 .../k8s.io/kube-controller-manager/README.md  |  25 ++
 .../kube-controller-manager/SECURITY_CONTACTS |  17 ++
 .../code-of-conduct.md                        |   3 +
 .../config/v1alpha1/doc.go                    |  21 ++
 .../config/v1alpha1/register.go               |  43 +++
 .../config/v1alpha1/types.go                  |  32 ++-
 18 files changed, 832 insertions(+), 105 deletions(-)
 create mode 100644 pkg/controller/apis/config/doc.go
 create mode 100644 pkg/controller/apis/config/register.go
 create mode 100644 pkg/controller/apis/config/scheme/scheme.go
 create mode 100644 pkg/controller/apis/config/v1alpha1/conversion.go
 create mode 100644 pkg/controller/apis/config/v1alpha1/defaults_test.go
 create mode 100644 pkg/controller/apis/config/v1alpha1/doc.go
 create mode 100644 pkg/controller/apis/config/v1alpha1/register.go
 create mode 100644 staging/src/k8s.io/kube-controller-manager/.github/PULL_REQUEST_TEMPLATE.md
 create mode 100644 staging/src/k8s.io/kube-controller-manager/CONTRIBUTING.md
 create mode 100644 staging/src/k8s.io/kube-controller-manager/LICENSE
 create mode 100644 staging/src/k8s.io/kube-controller-manager/README.md
 create mode 100644 staging/src/k8s.io/kube-controller-manager/SECURITY_CONTACTS
 create mode 100644 staging/src/k8s.io/kube-controller-manager/code-of-conduct.md
 create mode 100644 staging/src/k8s.io/kube-controller-manager/config/v1alpha1/doc.go
 create mode 100644 staging/src/k8s.io/kube-controller-manager/config/v1alpha1/register.go

diff --git a/pkg/controller/apis/config/doc.go b/pkg/controller/apis/config/doc.go
new file mode 100644
index 00000000000..c44cb82e163
--- /dev/null
+++ b/pkg/controller/apis/config/doc.go
@@ -0,0 +1,19 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// +k8s:deepcopy-gen=package
+
+package config // import "k8s.io/kubernetes/pkg/controller/apis/config"
diff --git a/pkg/controller/apis/config/register.go b/pkg/controller/apis/config/register.go
new file mode 100644
index 00000000000..26a1e8f1af9
--- /dev/null
+++ b/pkg/controller/apis/config/register.go
@@ -0,0 +1,43 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package config
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// GroupName is the group name use in this package
+const GroupName = "kubecontrollermanager.config.k8s.io"
+
+// SchemeGroupVersion is group version used to register these objects
+var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: runtime.APIVersionInternal}
+
+var (
+	// SchemeBuilder providers the handle of collects functions that add things to a scheme
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	// AddToScheme applies all the stored functions to the scheme. A non-nil error
+	// indicates that one function failed and the attempt was abandoned.
+	AddToScheme = SchemeBuilder.AddToScheme
+)
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(SchemeGroupVersion,
+		&KubeControllerManagerConfiguration{},
+	)
+	return nil
+}
diff --git a/pkg/controller/apis/config/scheme/scheme.go b/pkg/controller/apis/config/scheme/scheme.go
new file mode 100644
index 00000000000..b1bfc739215
--- /dev/null
+++ b/pkg/controller/apis/config/scheme/scheme.go
@@ -0,0 +1,44 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package scheme
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/kubernetes/pkg/controller/apis/config"
+	"k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1"
+)
+
+var (
+	// Scheme defines methods for serializing and deserializing API objects.
+	Scheme = runtime.NewScheme()
+	// Codecs provides methods for retrieving codecs and serializers for specific
+	// versions and content types.
+	Codecs = serializer.NewCodecFactory(Scheme)
+)
+
+func init() {
+	AddToScheme(Scheme)
+}
+
+// AddToScheme registers the API group and adds types to a scheme
+func AddToScheme(scheme *runtime.Scheme) {
+	utilruntime.Must(config.AddToScheme(scheme))
+	utilruntime.Must(v1alpha1.AddToScheme(scheme))
+	utilruntime.Must(scheme.SetVersionPriority(v1alpha1.SchemeGroupVersion))
+}
diff --git a/pkg/controller/apis/config/types.go b/pkg/controller/apis/config/types.go
index 8421a00bb40..b7abe6b9234 100644
--- a/pkg/controller/apis/config/types.go
+++ b/pkg/controller/apis/config/types.go
@@ -22,6 +22,7 @@ import (
 	apiserverconfig "k8s.io/apiserver/pkg/apis/config"
 )
 
+// GroupResource describes an group resource.
 type GroupResource struct {
 	// group is the group portion of the GroupResource.
 	Group string
@@ -30,13 +31,17 @@ type GroupResource struct {
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// KubeControllerManagerConfiguration contains elements describing kube-controller manager.
 type KubeControllerManagerConfiguration struct {
 	metav1.TypeMeta
+
 	// Generic holds configuration for a generic controller-manager
 	Generic GenericControllerManagerConfiguration
 	// KubeCloudSharedConfiguration holds configuration for shared related features
 	// both in cloud controller manager and kube-controller manager.
 	KubeCloudShared KubeCloudSharedConfiguration
+
 	// AttachDetachControllerConfiguration holds configuration for
 	// AttachDetachController related features.
 	AttachDetachController AttachDetachControllerConfiguration
@@ -93,6 +98,7 @@ type KubeControllerManagerConfiguration struct {
 	ServiceController ServiceControllerConfiguration
 }
 
+// GenericControllerManagerConfiguration holds configuration for a generic controller-manager
 type GenericControllerManagerConfiguration struct {
 	// port is the port that the controller-manager's http service runs on.
 	Port int32
@@ -118,6 +124,8 @@ type GenericControllerManagerConfiguration struct {
 	Debugging apiserverconfig.DebuggingConfiguration
 }
 
+// KubeCloudSharedConfiguration contains elements shared by both kube-controller manager
+// and cloud-controller manager, but not genericconfig.
 type KubeCloudSharedConfiguration struct {
 	// CloudProviderConfiguration holds configuration for CloudProvider related features.
 	CloudProvider CloudProviderConfiguration
@@ -150,6 +158,8 @@ type KubeCloudSharedConfiguration struct {
 	// of new nodes to cluster.
 	NodeSyncPeriod metav1.Duration
 }
+
+// AttachDetachControllerConfiguration contains elements describing AttachDetachController.
 type AttachDetachControllerConfiguration struct {
 	// Reconciler runs a periodic loop to reconcile the desired state of the with
 	// the actual state of the world by triggering attach detach operations.
@@ -160,6 +170,7 @@ type AttachDetachControllerConfiguration struct {
 	ReconcilerSyncLoopPeriod metav1.Duration
 }
 
+// CloudProviderConfiguration contains basically elements about cloud provider.
 type CloudProviderConfiguration struct {
 	// Name is the provider for cloud services.
 	Name string
@@ -167,6 +178,7 @@ type CloudProviderConfiguration struct {
 	CloudConfigFile string
 }
 
+// CSRSigningControllerConfiguration contains elements describing CSRSigningController.
 type CSRSigningControllerConfiguration struct {
 	// clusterSigningCertFile is the filename containing a PEM-encoded
 	// X509 CA certificate used to issue cluster-scoped certificates
@@ -179,6 +191,7 @@ type CSRSigningControllerConfiguration struct {
 	ClusterSigningDuration metav1.Duration
 }
 
+// DaemonSetControllerConfiguration contains elements describing DaemonSetController.
 type DaemonSetControllerConfiguration struct {
 	// concurrentDaemonSetSyncs is the number of daemonset objects that are
 	// allowed to sync concurrently. Larger number = more responsive daemonset,
@@ -186,6 +199,7 @@ type DaemonSetControllerConfiguration struct {
 	ConcurrentDaemonSetSyncs int32
 }
 
+// DeploymentControllerConfiguration contains elements describing DeploymentController.
 type DeploymentControllerConfiguration struct {
 	// concurrentDeploymentSyncs is the number of deployment objects that are
 	// allowed to sync concurrently. Larger number = more responsive deployments,
@@ -195,10 +209,11 @@ type DeploymentControllerConfiguration struct {
 	DeploymentControllerSyncPeriod metav1.Duration
 }
 
+// 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
+	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
@@ -207,6 +222,7 @@ type DeprecatedControllerConfiguration struct {
 	RegisterRetryCount int32
 }
 
+// EndpointControllerConfiguration contains elements describing EndpointController.
 type EndpointControllerConfiguration struct {
 	// concurrentEndpointSyncs is the number of endpoint syncing operations
 	// that will be done concurrently. Larger number = faster endpoint updating,
@@ -214,6 +230,7 @@ type EndpointControllerConfiguration struct {
 	ConcurrentEndpointSyncs int32
 }
 
+// GarbageCollectorControllerConfiguration contains elements describing GarbageCollectorController.
 type GarbageCollectorControllerConfiguration struct {
 	// enables the generic garbage collector. MUST be synced with the
 	// corresponding flag of the kube-apiserver. WARNING: the generic garbage
@@ -226,6 +243,7 @@ type GarbageCollectorControllerConfiguration struct {
 	GCIgnoredResources []GroupResource
 }
 
+// HPAControllerConfiguration contains elements describing HPAController.
 type HPAControllerConfiguration struct {
 	// horizontalPodAutoscalerSyncPeriod is the period for syncing the number of
 	// pods in horizontal pod autoscaler.
@@ -254,6 +272,7 @@ type HPAControllerConfiguration struct {
 	HorizontalPodAutoscalerInitialReadinessDelay metav1.Duration
 }
 
+// JobControllerConfiguration contains elements describing JobController.
 type JobControllerConfiguration struct {
 	// concurrentJobSyncs is the number of job objects that are
 	// allowed to sync concurrently. Larger number = more responsive jobs,
@@ -261,6 +280,7 @@ type JobControllerConfiguration struct {
 	ConcurrentJobSyncs int32
 }
 
+// NamespaceControllerConfiguration contains elements describing NamespaceController.
 type NamespaceControllerConfiguration struct {
 	// namespaceSyncPeriod is the period for syncing namespace life-cycle
 	// updates.
@@ -270,6 +290,7 @@ type NamespaceControllerConfiguration struct {
 	ConcurrentNamespaceSyncs int32
 }
 
+// NodeIPAMControllerConfiguration contains elements describing NodeIPAMController.
 type NodeIPAMControllerConfiguration struct {
 	// serviceCIDR is CIDR Range for Services in cluster.
 	ServiceCIDR string
@@ -277,6 +298,7 @@ type NodeIPAMControllerConfiguration struct {
 	NodeCIDRMaskSize int32
 }
 
+// NodeLifecycleControllerConfiguration contains elements describing NodeLifecycleController.
 type NodeLifecycleControllerConfiguration struct {
 	// If set to true enables NoExecute Taints and will evict all not-tolerating
 	// Pod running on Nodes tainted with this kind of Taints.
@@ -302,6 +324,8 @@ type NodeLifecycleControllerConfiguration struct {
 	UnhealthyZoneThreshold float32
 }
 
+// PersistentVolumeBinderControllerConfiguration contains elements describing
+// PersistentVolumeBinderController.
 type PersistentVolumeBinderControllerConfiguration struct {
 	// pvClaimBinderSyncPeriod is the period for syncing persistent volumes
 	// and persistent volume claims.
@@ -310,6 +334,7 @@ type PersistentVolumeBinderControllerConfiguration struct {
 	VolumeConfiguration VolumeConfiguration
 }
 
+// PodGCControllerConfiguration contains elements describing PodGCController.
 type PodGCControllerConfiguration struct {
 	// terminatedPodGCThreshold is the number of terminated pods that can exist
 	// before the terminated pod garbage collector starts deleting terminated pods.
@@ -317,6 +342,7 @@ type PodGCControllerConfiguration struct {
 	TerminatedPodGCThreshold int32
 }
 
+// ReplicaSetControllerConfiguration contains elements describing ReplicaSetController.
 type ReplicaSetControllerConfiguration struct {
 	// concurrentRSSyncs is the number of replica sets that are  allowed to sync
 	// concurrently. Larger number = more responsive replica  management, but more
@@ -324,6 +350,7 @@ type ReplicaSetControllerConfiguration struct {
 	ConcurrentRSSyncs int32
 }
 
+// ReplicationControllerConfiguration contains elements describing ReplicationController.
 type ReplicationControllerConfiguration struct {
 	// concurrentRCSyncs is the number of replication controllers that are
 	// allowed to sync concurrently. Larger number = more responsive replica
@@ -331,6 +358,7 @@ type ReplicationControllerConfiguration struct {
 	ConcurrentRCSyncs int32
 }
 
+// ResourceQuotaControllerConfiguration contains elements describing ResourceQuotaController.
 type ResourceQuotaControllerConfiguration struct {
 	// resourceQuotaSyncPeriod is the period for syncing quota usage status
 	// in the system.
@@ -341,6 +369,7 @@ type ResourceQuotaControllerConfiguration struct {
 	ConcurrentResourceQuotaSyncs int32
 }
 
+// SAControllerConfiguration contains elements describing ServiceAccountController.
 type SAControllerConfiguration struct {
 	// serviceAccountKeyFile is the filename containing a PEM-encoded private RSA key
 	// used to sign service account tokens.
@@ -353,6 +382,7 @@ type SAControllerConfiguration struct {
 	RootCAFile string
 }
 
+// ServiceControllerConfiguration contains elements describing ServiceController.
 type ServiceControllerConfiguration struct {
 	// concurrentServiceSyncs is the number of services that are
 	// allowed to sync concurrently. Larger number = more responsive service
@@ -381,6 +411,7 @@ type VolumeConfiguration struct {
 	FlexVolumePluginDir string
 }
 
+// PersistentVolumeRecyclerConfiguration contains elements describing persistent volume plugins.
 type PersistentVolumeRecyclerConfiguration struct {
 	// maximumRetry is number of retries the PV recycler will execute on failure to recycle
 	// PV.
diff --git a/pkg/controller/apis/config/v1alpha1/conversion.go b/pkg/controller/apis/config/v1alpha1/conversion.go
new file mode 100644
index 00000000000..1bdcdb44a13
--- /dev/null
+++ b/pkg/controller/apis/config/v1alpha1/conversion.go
@@ -0,0 +1,60 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/conversion"
+	"k8s.io/kube-controller-manager/config/v1alpha1"
+	"k8s.io/kubernetes/pkg/controller/apis/config"
+)
+
+// Important! The public back-and-forth conversion functions for the types in this generic
+// package with ComponentConfig types need to be manually exposed like this in order for
+// other packages that reference this package to be able to call these conversion functions
+// in an autogenerated manner.
+// TODO: Fix the bug in conversion-gen so it automatically discovers these Convert_* functions
+// in autogenerated code as well.
+
+// Convert_v1alpha1_GenericControllerManagerConfiguration_To_config_GenericControllerManagerConfiguration is an autogenerated conversion function.
+func Convert_v1alpha1_GenericControllerManagerConfiguration_To_config_GenericControllerManagerConfiguration(in *v1alpha1.GenericControllerManagerConfiguration, out *config.GenericControllerManagerConfiguration, s conversion.Scope) error {
+	return autoConvert_v1alpha1_GenericControllerManagerConfiguration_To_config_GenericControllerManagerConfiguration(in, out, s)
+}
+
+// Convert_config_GenericControllerManagerConfiguration_To_v1alpha1_GenericControllerManagerConfiguration is an autogenerated conversion function.
+func Convert_config_GenericControllerManagerConfiguration_To_v1alpha1_GenericControllerManagerConfiguration(in *config.GenericControllerManagerConfiguration, out *v1alpha1.GenericControllerManagerConfiguration, s conversion.Scope) error {
+	return autoConvert_config_GenericControllerManagerConfiguration_To_v1alpha1_GenericControllerManagerConfiguration(in, out, s)
+}
+
+// Convert_v1alpha1_KubeCloudSharedConfiguration_To_config_KubeCloudSharedConfiguration is an autogenerated conversion function.
+func Convert_v1alpha1_KubeCloudSharedConfiguration_To_config_KubeCloudSharedConfiguration(in *v1alpha1.KubeCloudSharedConfiguration, out *config.KubeCloudSharedConfiguration, s conversion.Scope) error {
+	return autoConvert_v1alpha1_KubeCloudSharedConfiguration_To_config_KubeCloudSharedConfiguration(in, out, s)
+}
+
+// Convert_config_KubeCloudSharedConfiguration_To_v1alpha1_KubeCloudSharedConfiguration is an autogenerated conversion function.
+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)
+}
diff --git a/pkg/controller/apis/config/v1alpha1/defaults.go b/pkg/controller/apis/config/v1alpha1/defaults.go
index 5537b5a3ece..6e51aa964d2 100644
--- a/pkg/controller/apis/config/v1alpha1/defaults.go
+++ b/pkg/controller/apis/config/v1alpha1/defaults.go
@@ -31,124 +31,38 @@ func addDefaultingFuncs(scheme *kruntime.Scheme) error {
 	return RegisterDefaults(scheme)
 }
 
-func SetDefaults_KubeControllerManagerConfiguration(obj *KubeControllerManagerConfiguration) {
+func SetDefaults_KubeControllerManagerConfiguration(obj *kubectrlmgrconfigv1alpha1.KubeControllerManagerConfiguration) {
 	zero := metav1.Duration{}
-	if obj.EndpointController.ConcurrentEndpointSyncs == 0 {
-		obj.EndpointController.ConcurrentEndpointSyncs = 5
-	}
-	if obj.ServiceController.ConcurrentServiceSyncs == 0 {
-		obj.ServiceController.ConcurrentServiceSyncs = 1
-	}
-	if obj.ReplicationController.ConcurrentRCSyncs == 0 {
-		obj.ReplicationController.ConcurrentRCSyncs = 5
-	}
-	if obj.ReplicaSetController.ConcurrentRSSyncs == 0 {
-		obj.ReplicaSetController.ConcurrentRSSyncs = 5
-	}
-	if obj.DaemonSetController.ConcurrentDaemonSetSyncs == 0 {
-		obj.DaemonSetController.ConcurrentDaemonSetSyncs = 2
-	}
-	if obj.JobController.ConcurrentJobSyncs == 0 {
-		obj.JobController.ConcurrentJobSyncs = 5
-	}
-	if obj.ResourceQuotaController.ConcurrentResourceQuotaSyncs == 0 {
-		obj.ResourceQuotaController.ConcurrentResourceQuotaSyncs = 5
-	}
-	if obj.DeploymentController.ConcurrentDeploymentSyncs == 0 {
-		obj.DeploymentController.ConcurrentDeploymentSyncs = 5
-	}
-	if obj.NamespaceController.ConcurrentNamespaceSyncs == 0 {
-		obj.NamespaceController.ConcurrentNamespaceSyncs = 10
-	}
-	if obj.SAController.ConcurrentSATokenSyncs == 0 {
-		obj.SAController.ConcurrentSATokenSyncs = 5
-	}
-	if obj.ResourceQuotaController.ResourceQuotaSyncPeriod == zero {
-		obj.ResourceQuotaController.ResourceQuotaSyncPeriod = metav1.Duration{Duration: 5 * time.Minute}
-	}
-	if obj.NamespaceController.NamespaceSyncPeriod == zero {
-		obj.NamespaceController.NamespaceSyncPeriod = metav1.Duration{Duration: 5 * time.Minute}
-	}
-	if obj.PersistentVolumeBinderController.PVClaimBinderSyncPeriod == zero {
-		obj.PersistentVolumeBinderController.PVClaimBinderSyncPeriod = metav1.Duration{Duration: 15 * time.Second}
-	}
-	if obj.HPAController.HorizontalPodAutoscalerSyncPeriod == zero {
-		obj.HPAController.HorizontalPodAutoscalerSyncPeriod = metav1.Duration{Duration: 15 * time.Second}
-	}
-	if obj.HPAController.HorizontalPodAutoscalerUpscaleForbiddenWindow == zero {
-		obj.HPAController.HorizontalPodAutoscalerUpscaleForbiddenWindow = metav1.Duration{Duration: 3 * time.Minute}
-	}
-	if obj.HPAController.HorizontalPodAutoscalerDownscaleStabilizationWindow == zero {
-		obj.HPAController.HorizontalPodAutoscalerDownscaleStabilizationWindow = metav1.Duration{Duration: 5 * time.Minute}
-	}
-	if obj.HPAController.HorizontalPodAutoscalerCPUInitializationPeriod == zero {
-		obj.HPAController.HorizontalPodAutoscalerCPUInitializationPeriod = metav1.Duration{Duration: 5 * time.Minute}
-	}
-	if obj.HPAController.HorizontalPodAutoscalerInitialReadinessDelay == zero {
-		obj.HPAController.HorizontalPodAutoscalerInitialReadinessDelay = metav1.Duration{Duration: 30 * time.Second}
-	}
-	if obj.HPAController.HorizontalPodAutoscalerDownscaleForbiddenWindow == zero {
-		obj.HPAController.HorizontalPodAutoscalerDownscaleForbiddenWindow = metav1.Duration{Duration: 5 * time.Minute}
-	}
-	if obj.HPAController.HorizontalPodAutoscalerTolerance == 0 {
-		obj.HPAController.HorizontalPodAutoscalerTolerance = 0.1
-	}
-	if obj.DeploymentController.DeploymentControllerSyncPeriod == zero {
-		obj.DeploymentController.DeploymentControllerSyncPeriod = metav1.Duration{Duration: 30 * time.Second}
+	if obj.AttachDetachController.ReconcilerSyncLoopPeriod == zero {
+		obj.AttachDetachController.ReconcilerSyncLoopPeriod = metav1.Duration{Duration: 60 * time.Second}
 	}
 	if obj.DeprecatedController.RegisterRetryCount == 0 {
 		obj.DeprecatedController.RegisterRetryCount = 10
 	}
-	if obj.NodeLifecycleController.PodEvictionTimeout == zero {
-		obj.NodeLifecycleController.PodEvictionTimeout = metav1.Duration{Duration: 5 * time.Minute}
-	}
-	if obj.NodeLifecycleController.NodeMonitorGracePeriod == zero {
-		obj.NodeLifecycleController.NodeMonitorGracePeriod = metav1.Duration{Duration: 40 * time.Second}
-	}
-	if obj.NodeLifecycleController.NodeStartupGracePeriod == zero {
-		obj.NodeLifecycleController.NodeStartupGracePeriod = metav1.Duration{Duration: 60 * time.Second}
-	}
 	if obj.NodeIPAMController.NodeCIDRMaskSize == 0 {
 		obj.NodeIPAMController.NodeCIDRMaskSize = 24
 	}
-	if obj.PodGCController.TerminatedPodGCThreshold == 0 {
-		obj.PodGCController.TerminatedPodGCThreshold = 12500
+	if obj.PersistentVolumeBinderController.PVClaimBinderSyncPeriod == zero {
+		obj.PersistentVolumeBinderController.PVClaimBinderSyncPeriod = metav1.Duration{Duration: 15 * time.Second}
 	}
-	if obj.GarbageCollectorController.EnableGarbageCollector == nil {
-		obj.GarbageCollectorController.EnableGarbageCollector = utilpointer.BoolPtr(true)
-	}
-	if obj.GarbageCollectorController.ConcurrentGCSyncs == 0 {
-		obj.GarbageCollectorController.ConcurrentGCSyncs = 20
-	}
-	if obj.CSRSigningController.ClusterSigningCertFile == "" {
-		obj.CSRSigningController.ClusterSigningCertFile = "/etc/kubernetes/ca/ca.pem"
-	}
-	if obj.CSRSigningController.ClusterSigningKeyFile == "" {
-		obj.CSRSigningController.ClusterSigningKeyFile = "/etc/kubernetes/ca/ca.key"
-	}
-	if obj.CSRSigningController.ClusterSigningDuration == zero {
-		obj.CSRSigningController.ClusterSigningDuration = metav1.Duration{Duration: 365 * 24 * time.Hour}
-	}
-	if obj.AttachDetachController.ReconcilerSyncLoopPeriod == zero {
-		obj.AttachDetachController.ReconcilerSyncLoopPeriod = metav1.Duration{Duration: 60 * time.Second}
-	}
-	if obj.NodeLifecycleController.EnableTaintManager == nil {
-		obj.NodeLifecycleController.EnableTaintManager = utilpointer.BoolPtr(true)
-	}
-	if obj.HPAController.HorizontalPodAutoscalerUseRESTClients == nil {
-		obj.HPAController.HorizontalPodAutoscalerUseRESTClients = utilpointer.BoolPtr(true)
+	if obj.SAController.ConcurrentSATokenSyncs == 0 {
+		obj.SAController.ConcurrentSATokenSyncs = 5
 	}
+
 	// These defaults override the recommended defaults from the apimachineryconfigv1alpha1 package that are applied automatically
 	// These client-connection defaults are specific to the kube-controller-manager
 	if obj.Generic.ClientConnection.QPS == 0.0 {
-		obj.Generic.ClientConnection.QPS = 50.0
+		obj.Generic.ClientConnection.QPS = 20.0
 	}
 	if obj.Generic.ClientConnection.Burst == 0 {
-		obj.Generic.ClientConnection.Burst = 100
+		obj.Generic.ClientConnection.Burst = 30
 	}
+
+	// Use the default RecommendedDefaultGenericControllerManagerConfiguration options
+	RecommendedDefaultGenericControllerManagerConfiguration(&obj.Generic)
 }
 
-func SetDefaults_GenericControllerManagerConfiguration(obj *GenericControllerManagerConfiguration) {
+func RecommendedDefaultGenericControllerManagerConfiguration(obj *kubectrlmgrconfigv1alpha1.GenericControllerManagerConfiguration) {
 	zero := metav1.Duration{}
 	if obj.Address == "" {
 		obj.Address = "0.0.0.0"
@@ -162,12 +76,13 @@ func SetDefaults_GenericControllerManagerConfiguration(obj *GenericControllerMan
 	if len(obj.Controllers) == 0 {
 		obj.Controllers = []string{"*"}
 	}
+
 	// Use the default ClientConnectionConfiguration and LeaderElectionConfiguration options
 	apimachineryconfigv1alpha1.RecommendedDefaultClientConnectionConfiguration(&obj.ClientConnection)
 	apiserverconfigv1alpha1.RecommendedDefaultLeaderElectionConfiguration(&obj.LeaderElection)
 }
 
-func SetDefaults_KubeCloudSharedConfiguration(obj *KubeCloudSharedConfiguration) {
+func SetDefaults_KubeCloudSharedConfiguration(obj *kubectrlmgrconfigv1alpha1.KubeCloudSharedConfiguration) {
 	zero := metav1.Duration{}
 	if obj.NodeMonitorPeriod == zero {
 		obj.NodeMonitorPeriod = metav1.Duration{Duration: 5 * time.Second}
@@ -183,7 +98,145 @@ func SetDefaults_KubeCloudSharedConfiguration(obj *KubeCloudSharedConfiguration)
 	}
 }
 
-func SetDefaults_PersistentVolumeRecyclerConfiguration(obj *PersistentVolumeRecyclerConfiguration) {
+func SetDefaults_ServiceControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.ServiceControllerConfiguration) {
+	if obj.ConcurrentServiceSyncs == 0 {
+		obj.ConcurrentServiceSyncs = 1
+	}
+}
+
+func SetDefaults_CSRSigningControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.CSRSigningControllerConfiguration) {
+	zero := metav1.Duration{}
+	if obj.ClusterSigningCertFile == "" {
+		obj.ClusterSigningCertFile = "/etc/kubernetes/ca/ca.pem"
+	}
+	if obj.ClusterSigningKeyFile == "" {
+		obj.ClusterSigningKeyFile = "/etc/kubernetes/ca/ca.key"
+	}
+	if obj.ClusterSigningDuration == zero {
+		obj.ClusterSigningDuration = metav1.Duration{Duration: 365 * 24 * time.Hour}
+	}
+}
+
+func SetDefaults_DeploymentControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.DeploymentControllerConfiguration) {
+	zero := metav1.Duration{}
+	if obj.ConcurrentDeploymentSyncs == 0 {
+		obj.ConcurrentDeploymentSyncs = 5
+	}
+	if obj.DeploymentControllerSyncPeriod == zero {
+		obj.DeploymentControllerSyncPeriod = metav1.Duration{Duration: 30 * time.Second}
+	}
+}
+
+func SetDefaults_DaemonSetControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.DaemonSetControllerConfiguration) {
+	if obj.ConcurrentDaemonSetSyncs == 0 {
+		obj.ConcurrentDaemonSetSyncs = 2
+	}
+}
+
+func SetDefaults_EndpointControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.EndpointControllerConfiguration) {
+	if obj.ConcurrentEndpointSyncs == 0 {
+		obj.ConcurrentEndpointSyncs = 5
+	}
+}
+
+func SetDefaults_GarbageCollectorControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.GarbageCollectorControllerConfiguration) {
+	if obj.EnableGarbageCollector == nil {
+		obj.EnableGarbageCollector = utilpointer.BoolPtr(true)
+	}
+	if obj.ConcurrentGCSyncs == 0 {
+		obj.ConcurrentGCSyncs = 20
+	}
+}
+
+func SetDefaults_HPAControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.HPAControllerConfiguration) {
+	zero := metav1.Duration{}
+	if obj.HorizontalPodAutoscalerUseRESTClients == nil {
+		obj.HorizontalPodAutoscalerUseRESTClients = utilpointer.BoolPtr(true)
+	}
+	if obj.HorizontalPodAutoscalerSyncPeriod == zero {
+		obj.HorizontalPodAutoscalerSyncPeriod = metav1.Duration{Duration: 15 * time.Second}
+	}
+	if obj.HorizontalPodAutoscalerUpscaleForbiddenWindow == zero {
+		obj.HorizontalPodAutoscalerUpscaleForbiddenWindow = metav1.Duration{Duration: 3 * time.Minute}
+	}
+	if obj.HorizontalPodAutoscalerDownscaleStabilizationWindow == zero {
+		obj.HorizontalPodAutoscalerDownscaleStabilizationWindow = metav1.Duration{Duration: 5 * time.Minute}
+	}
+	if obj.HorizontalPodAutoscalerCPUInitializationPeriod == zero {
+		obj.HorizontalPodAutoscalerCPUInitializationPeriod = metav1.Duration{Duration: 5 * time.Minute}
+	}
+	if obj.HorizontalPodAutoscalerInitialReadinessDelay == zero {
+		obj.HorizontalPodAutoscalerInitialReadinessDelay = metav1.Duration{Duration: 30 * time.Second}
+	}
+	if obj.HorizontalPodAutoscalerDownscaleForbiddenWindow == zero {
+		obj.HorizontalPodAutoscalerDownscaleForbiddenWindow = metav1.Duration{Duration: 5 * time.Minute}
+	}
+	if obj.HorizontalPodAutoscalerTolerance == 0 {
+		obj.HorizontalPodAutoscalerTolerance = 0.1
+	}
+}
+
+func SetDefaults_JobControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.JobControllerConfiguration) {
+	if obj.ConcurrentJobSyncs == 0 {
+		obj.ConcurrentJobSyncs = 5
+	}
+}
+
+func SetDefaults_NamespaceControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.NamespaceControllerConfiguration) {
+	zero := metav1.Duration{}
+	if obj.ConcurrentNamespaceSyncs == 0 {
+		obj.ConcurrentNamespaceSyncs = 10
+	}
+	if obj.NamespaceSyncPeriod == zero {
+		obj.NamespaceSyncPeriod = metav1.Duration{Duration: 5 * time.Minute}
+	}
+}
+
+func SetDefaults_NodeLifecycleControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.NodeLifecycleControllerConfiguration) {
+	zero := metav1.Duration{}
+	if obj.PodEvictionTimeout == zero {
+		obj.PodEvictionTimeout = metav1.Duration{Duration: 5 * time.Minute}
+	}
+	if obj.NodeMonitorGracePeriod == zero {
+		obj.NodeMonitorGracePeriod = metav1.Duration{Duration: 40 * time.Second}
+	}
+	if obj.NodeStartupGracePeriod == zero {
+		obj.NodeStartupGracePeriod = metav1.Duration{Duration: 60 * time.Second}
+	}
+	if obj.EnableTaintManager == nil {
+		obj.EnableTaintManager = utilpointer.BoolPtr(true)
+	}
+}
+
+func SetDefaults_PodGCControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.PodGCControllerConfiguration) {
+	if obj.TerminatedPodGCThreshold == 0 {
+		obj.TerminatedPodGCThreshold = 12500
+	}
+}
+
+func SetDefaults_ReplicaSetControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.ReplicaSetControllerConfiguration) {
+	if obj.ConcurrentRSSyncs == 0 {
+		obj.ConcurrentRSSyncs = 5
+	}
+}
+
+func SetDefaults_ReplicationControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.ReplicationControllerConfiguration) {
+	if obj.ConcurrentRCSyncs == 0 {
+		obj.ConcurrentRCSyncs = 5
+	}
+}
+
+func SetDefaults_ResourceQuotaControllerConfiguration(obj *kubectrlmgrconfigv1alpha1.ResourceQuotaControllerConfiguration) {
+	zero := metav1.Duration{}
+	if obj.ConcurrentResourceQuotaSyncs == 0 {
+		obj.ConcurrentResourceQuotaSyncs = 5
+	}
+	if obj.ResourceQuotaSyncPeriod == zero {
+		obj.ResourceQuotaSyncPeriod = metav1.Duration{Duration: 5 * time.Minute}
+	}
+}
+
+func SetDefaults_PersistentVolumeRecyclerConfiguration(obj *kubectrlmgrconfigv1alpha1.PersistentVolumeRecyclerConfiguration) {
 	if obj.MaximumRetry == 0 {
 		obj.MaximumRetry = 3
 	}
@@ -201,7 +254,7 @@ func SetDefaults_PersistentVolumeRecyclerConfiguration(obj *PersistentVolumeRecy
 	}
 }
 
-func SetDefaults_VolumeConfiguration(obj *VolumeConfiguration) {
+func SetDefaults_VolumeConfiguration(obj *kubectrlmgrconfigv1alpha1.VolumeConfiguration) {
 	if obj.EnableHostPathProvisioning == nil {
 		obj.EnableHostPathProvisioning = utilpointer.BoolPtr(false)
 	}
diff --git a/pkg/controller/apis/config/v1alpha1/defaults_test.go b/pkg/controller/apis/config/v1alpha1/defaults_test.go
new file mode 100644
index 00000000000..f14c5de34e6
--- /dev/null
+++ b/pkg/controller/apis/config/v1alpha1/defaults_test.go
@@ -0,0 +1,64 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"encoding/json"
+	"reflect"
+	"testing"
+
+	"k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	kubectrlmgrconfigv1alpha1 "k8s.io/kube-controller-manager/config/v1alpha1"
+)
+
+func TestKubeControllerDefaultsRoundTrip(t *testing.T) {
+	ks1 := &kubectrlmgrconfigv1alpha1.KubeControllerManagerConfiguration{}
+	SetDefaults_KubeControllerManagerConfiguration(ks1)
+	cm, err := convertObjToConfigMap("KubeControllerManagerConfiguration", ks1)
+	if err != nil {
+		t.Errorf("unexpected ConvertObjToConfigMap error %v", err)
+	}
+
+	ks2 := &kubectrlmgrconfigv1alpha1.KubeControllerManagerConfiguration{}
+	if err = json.Unmarshal([]byte(cm.Data["KubeControllerManagerConfiguration"]), ks2); err != nil {
+		t.Errorf("unexpected error unserializing controller manager config %v", err)
+	}
+
+	if !reflect.DeepEqual(ks2, ks1) {
+		t.Errorf("Expected:\n%#v\n\nGot:\n%#v", ks1, ks2)
+	}
+}
+
+// convertObjToConfigMap converts an object to a ConfigMap.
+// This is specifically meant for ComponentConfigs.
+func convertObjToConfigMap(name string, obj runtime.Object) (*v1.ConfigMap, error) {
+	eJSONBytes, err := json.Marshal(obj)
+	if err != nil {
+		return nil, err
+	}
+	cm := &v1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: name,
+		},
+		Data: map[string]string{
+			name: string(eJSONBytes[:]),
+		},
+	}
+	return cm, nil
+}
diff --git a/pkg/controller/apis/config/v1alpha1/doc.go b/pkg/controller/apis/config/v1alpha1/doc.go
new file mode 100644
index 00000000000..fe43aa23302
--- /dev/null
+++ b/pkg/controller/apis/config/v1alpha1/doc.go
@@ -0,0 +1,23 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/controller/apis/config
+// +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
+// +groupName=kubecontrollermanager.config.k8s.io
+
+package v1alpha1 // import "k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1"
diff --git a/pkg/controller/apis/config/v1alpha1/register.go b/pkg/controller/apis/config/v1alpha1/register.go
new file mode 100644
index 00000000000..23057ab1663
--- /dev/null
+++ b/pkg/controller/apis/config/v1alpha1/register.go
@@ -0,0 +1,40 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	kubectrlmgrconfigv1alpha1 "k8s.io/kube-controller-manager/config/v1alpha1"
+)
+
+// GroupName is the group name use in this package
+const GroupName = "kubecontrollermanager.config.k8s.io"
+
+// SchemeGroupVersion is group version used to register these objects
+var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}
+
+var (
+	localSchemeBuilder = &kubectrlmgrconfigv1alpha1.SchemeBuilder
+	AddToScheme        = localSchemeBuilder.AddToScheme
+)
+
+func init() {
+	// We only register manually written functions here. The registration of the
+	// generated functions takes place in the generated files. The separation
+	// makes the code compile even when the generated files are missing.
+	localSchemeBuilder.Register(addDefaultingFuncs)
+}
diff --git a/staging/src/k8s.io/kube-controller-manager/.github/PULL_REQUEST_TEMPLATE.md b/staging/src/k8s.io/kube-controller-manager/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000000..e559c074bb5
--- /dev/null
+++ b/staging/src/k8s.io/kube-controller-manager/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,2 @@
+Sorry, we do not accept changes directly against this repository. Please see 
+CONTRIBUTING.md for information on where and how to contribute instead.
diff --git a/staging/src/k8s.io/kube-controller-manager/CONTRIBUTING.md b/staging/src/k8s.io/kube-controller-manager/CONTRIBUTING.md
new file mode 100644
index 00000000000..12511d88107
--- /dev/null
+++ b/staging/src/k8s.io/kube-controller-manager/CONTRIBUTING.md
@@ -0,0 +1,7 @@
+# Contributing guidelines
+
+Do not open pull requests directly against this repository, they will be ignored. Instead, please open pull requests against [kubernetes/kubernetes](https://git.k8s.io/kubernetes/).  Please follow the same [contributing guide](https://git.k8s.io/kubernetes/CONTRIBUTING.md) you would follow for any other pull request made to kubernetes/kubernetes.
+
+This repository is published from [kubernetes/kubernetes/staging/src/k8s.io/kube-controller-manager](https://git.k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager) by the [kubernetes publishing-bot](https://git.k8s.io/publishing-bot).
+
+Please see [Staging Directory and Publishing](https://git.k8s.io/community/contributors/devel/staging.md) for more information
diff --git a/staging/src/k8s.io/kube-controller-manager/LICENSE b/staging/src/k8s.io/kube-controller-manager/LICENSE
new file mode 100644
index 00000000000..d6456956733
--- /dev/null
+++ b/staging/src/k8s.io/kube-controller-manager/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/staging/src/k8s.io/kube-controller-manager/README.md b/staging/src/k8s.io/kube-controller-manager/README.md
new file mode 100644
index 00000000000..a1e8b89a827
--- /dev/null
+++ b/staging/src/k8s.io/kube-controller-manager/README.md
@@ -0,0 +1,25 @@
+# Kube-controller-manager
+
+## Purpose
+
+This library contains code to expose kube-controller-manager API.
+
+
+## Compatibility
+
+There are *NO compatibility guarantees* for this repository, yet.  It is in direct support of Kubernetes, so branches
+will track Kubernetes and be compatible with that repo.  As we more cleanly separate the layers, we will review the
+compatibility guarantee. We have a goal to make this easier to use in the future.
+
+
+## Where does it come from?
+
+`kube-controller-manager` is synced from https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/kube-controller-manager.
+Code changes are made in that location, merged into `k8s.io/kubernetes` and later synced here.
+
+
+## Things you should *NOT* do
+
+ 1. Directly modify any files under `pkg` in this repo.  Those are driven from `k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager`.
+ 2. Expect compatibility.  This repo is changing quickly in direct support of
+    Kubernetes and the kube-controller-manager API.
diff --git a/staging/src/k8s.io/kube-controller-manager/SECURITY_CONTACTS b/staging/src/k8s.io/kube-controller-manager/SECURITY_CONTACTS
new file mode 100644
index 00000000000..69eea9ee8eb
--- /dev/null
+++ b/staging/src/k8s.io/kube-controller-manager/SECURITY_CONTACTS
@@ -0,0 +1,17 @@
+# Defined below are the security contacts for this repo.
+#
+# They are the contact point for the Product Security Team to reach out
+# to for triaging and handling of incoming issues.
+#
+# The below names agree to abide by the
+# [Embargo Policy](https://github.com/kubernetes/sig-release/blob/master/security-release-process-documentation/security-release-process.md#embargo-policy)
+# and will be removed and replaced if they violate that agreement.
+#
+# DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE
+# INSTRUCTIONS AT https://kubernetes.io/security/
+
+cjcullen
+liggitt
+luxas
+sttts
+tallclair
diff --git a/staging/src/k8s.io/kube-controller-manager/code-of-conduct.md b/staging/src/k8s.io/kube-controller-manager/code-of-conduct.md
new file mode 100644
index 00000000000..0d15c00cf32
--- /dev/null
+++ b/staging/src/k8s.io/kube-controller-manager/code-of-conduct.md
@@ -0,0 +1,3 @@
+# Kubernetes Community Code of Conduct
+
+Please refer to our [Kubernetes Community Code of Conduct](https://git.k8s.io/community/code-of-conduct.md)
diff --git a/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/doc.go b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/doc.go
new file mode 100644
index 00000000000..1631186e50f
--- /dev/null
+++ b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/doc.go
@@ -0,0 +1,21 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+// +groupName=kubecontrollermanager.config.k8s.io
+
+package v1alpha1 // import "k8s.io/kube-controller-manager/config/v1alpha1"
diff --git a/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/register.go b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/register.go
new file mode 100644
index 00000000000..94710dd6e11
--- /dev/null
+++ b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/register.go
@@ -0,0 +1,43 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// GroupName is the group name use in this package
+const GroupName = "kubecontrollermanager.config.k8s.io"
+
+// SchemeGroupVersion is group version used to register these objects
+var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}
+
+var (
+	// SchemeBuilder providers the handle of collects functions that add things to a scheme.
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	// AddToScheme applies all the stored functions to the scheme. A non-nil error
+	// indicates that one function failed and the attempt was abandoned.
+	AddToScheme = SchemeBuilder.AddToScheme
+)
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(SchemeGroupVersion,
+		&KubeControllerManagerConfiguration{},
+	)
+	return nil
+}
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 d831a88c852..5bcfadea6f5 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
@@ -22,6 +22,7 @@ import (
 	apiserverconfigv1alpha1 "k8s.io/apiserver/pkg/apis/config/v1alpha1"
 )
 
+// PersistentVolumeRecyclerConfiguration contains elements describing persistent volume plugins.
 type PersistentVolumeRecyclerConfiguration struct {
 	// maximumRetry is number of retries the PV recycler will execute on failure to recycle
 	// PV.
@@ -70,6 +71,7 @@ type VolumeConfiguration struct {
 	FlexVolumePluginDir string
 }
 
+// GroupResource describes an group resource.
 type GroupResource struct {
 	// group is the group portion of the GroupResource.
 	Group string
@@ -78,13 +80,17 @@ type GroupResource struct {
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// KubeControllerManagerConfiguration contains elements describing kube-controller manager.
 type KubeControllerManagerConfiguration struct {
 	metav1.TypeMeta `json:",inline"`
+
 	// Generic holds configuration for a generic controller-manager
 	Generic GenericControllerManagerConfiguration
 	// KubeCloudSharedConfiguration holds configuration for shared related features
 	// both in cloud controller manager and kube-controller manager.
 	KubeCloudShared KubeCloudSharedConfiguration
+
 	// AttachDetachControllerConfiguration holds configuration for
 	// AttachDetachController related features.
 	AttachDetachController AttachDetachControllerConfiguration
@@ -141,6 +147,7 @@ type KubeControllerManagerConfiguration struct {
 	ServiceController ServiceControllerConfiguration
 }
 
+// GenericControllerManagerConfiguration holds configuration for a generic controller-manager.
 type GenericControllerManagerConfiguration struct {
 	// port is the port that the controller-manager's http service runs on.
 	Port int32
@@ -166,6 +173,8 @@ type GenericControllerManagerConfiguration struct {
 	Debugging apiserverconfigv1alpha1.DebuggingConfiguration
 }
 
+// KubeCloudSharedConfiguration contains elements shared by both kube-controller manager
+// and cloud-controller manager, but not genericconfig.
 type KubeCloudSharedConfiguration struct {
 	// CloudProviderConfiguration holds configuration for CloudProvider related features.
 	CloudProvider CloudProviderConfiguration
@@ -199,6 +208,7 @@ type KubeCloudSharedConfiguration struct {
 	NodeSyncPeriod metav1.Duration
 }
 
+// AttachDetachControllerConfiguration contains elements describing AttachDetachController.
 type AttachDetachControllerConfiguration struct {
 	// Reconciler runs a periodic loop to reconcile the desired state of the with
 	// the actual state of the world by triggering attach detach operations.
@@ -209,6 +219,7 @@ type AttachDetachControllerConfiguration struct {
 	ReconcilerSyncLoopPeriod metav1.Duration
 }
 
+// CloudProviderConfiguration contains basically elements about cloud provider.
 type CloudProviderConfiguration struct {
 	// Name is the provider for cloud services.
 	Name string
@@ -216,6 +227,7 @@ type CloudProviderConfiguration struct {
 	CloudConfigFile string
 }
 
+// CSRSigningControllerConfiguration contains elements describing CSRSigningController.
 type CSRSigningControllerConfiguration struct {
 	// clusterSigningCertFile is the filename containing a PEM-encoded
 	// X509 CA certificate used to issue cluster-scoped certificates
@@ -228,6 +240,7 @@ type CSRSigningControllerConfiguration struct {
 	ClusterSigningDuration metav1.Duration
 }
 
+// DaemonSetControllerConfiguration contains elements describing DaemonSetController.
 type DaemonSetControllerConfiguration struct {
 	// concurrentDaemonSetSyncs is the number of daemonset objects that are
 	// allowed to sync concurrently. Larger number = more responsive daemonset,
@@ -235,6 +248,7 @@ type DaemonSetControllerConfiguration struct {
 	ConcurrentDaemonSetSyncs int32
 }
 
+// DeploymentControllerConfiguration contains elements describing DeploymentController.
 type DeploymentControllerConfiguration struct {
 	// concurrentDeploymentSyncs is the number of deployment objects that are
 	// allowed to sync concurrently. Larger number = more responsive deployments,
@@ -244,10 +258,11 @@ type DeploymentControllerConfiguration struct {
 	DeploymentControllerSyncPeriod metav1.Duration
 }
 
+// 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
+	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
@@ -256,6 +271,7 @@ type DeprecatedControllerConfiguration struct {
 	RegisterRetryCount int32
 }
 
+// EndpointControllerConfiguration contains elements describing EndpointController.
 type EndpointControllerConfiguration struct {
 	// concurrentEndpointSyncs is the number of endpoint syncing operations
 	// that will be done concurrently. Larger number = faster endpoint updating,
@@ -263,6 +279,7 @@ type EndpointControllerConfiguration struct {
 	ConcurrentEndpointSyncs int32
 }
 
+// GarbageCollectorControllerConfiguration contains elements describing GarbageCollectorController.
 type GarbageCollectorControllerConfiguration struct {
 	// enables the generic garbage collector. MUST be synced with the
 	// corresponding flag of the kube-apiserver. WARNING: the generic garbage
@@ -275,6 +292,7 @@ type GarbageCollectorControllerConfiguration struct {
 	GCIgnoredResources []GroupResource
 }
 
+// HPAControllerConfiguration contains elements describing HPAController.
 type HPAControllerConfiguration struct {
 	// HorizontalPodAutoscalerSyncPeriod is the period for syncing the number of
 	// pods in horizontal pod autoscaler.
@@ -303,6 +321,7 @@ type HPAControllerConfiguration struct {
 	HorizontalPodAutoscalerInitialReadinessDelay metav1.Duration
 }
 
+// JobControllerConfiguration contains elements describing JobController.
 type JobControllerConfiguration struct {
 	// concurrentJobSyncs is the number of job objects that are
 	// allowed to sync concurrently. Larger number = more responsive jobs,
@@ -310,6 +329,7 @@ type JobControllerConfiguration struct {
 	ConcurrentJobSyncs int32
 }
 
+// NamespaceControllerConfiguration contains elements describing NamespaceController.
 type NamespaceControllerConfiguration struct {
 	// namespaceSyncPeriod is the period for syncing namespace life-cycle
 	// updates.
@@ -319,6 +339,7 @@ type NamespaceControllerConfiguration struct {
 	ConcurrentNamespaceSyncs int32
 }
 
+// NodeIPAMControllerConfiguration contains elements describing NodeIpamController.
 type NodeIPAMControllerConfiguration struct {
 	// serviceCIDR is CIDR Range for Services in cluster.
 	ServiceCIDR string
@@ -326,6 +347,7 @@ type NodeIPAMControllerConfiguration struct {
 	NodeCIDRMaskSize int32
 }
 
+// NodeLifecycleControllerConfiguration contains elements describing NodeLifecycleController.
 type NodeLifecycleControllerConfiguration struct {
 	// If set to true enables NoExecute Taints and will evict all not-tolerating
 	// Pod running on Nodes tainted with this kind of Taints.
@@ -351,6 +373,8 @@ type NodeLifecycleControllerConfiguration struct {
 	UnhealthyZoneThreshold float32
 }
 
+// PersistentVolumeBinderControllerConfiguration contains elements describing
+// PersistentVolumeBinderController.
 type PersistentVolumeBinderControllerConfiguration struct {
 	// pvClaimBinderSyncPeriod is the period for syncing persistent volumes
 	// and persistent volume claims.
@@ -359,6 +383,7 @@ type PersistentVolumeBinderControllerConfiguration struct {
 	VolumeConfiguration VolumeConfiguration
 }
 
+// PodGCControllerConfiguration contains elements describing PodGCController.
 type PodGCControllerConfiguration struct {
 	// terminatedPodGCThreshold is the number of terminated pods that can exist
 	// before the terminated pod garbage collector starts deleting terminated pods.
@@ -366,6 +391,7 @@ type PodGCControllerConfiguration struct {
 	TerminatedPodGCThreshold int32
 }
 
+// ReplicaSetControllerConfiguration contains elements describing ReplicaSetController.
 type ReplicaSetControllerConfiguration struct {
 	// concurrentRSSyncs is the number of replica sets that are  allowed to sync
 	// concurrently. Larger number = more responsive replica  management, but more
@@ -373,6 +399,7 @@ type ReplicaSetControllerConfiguration struct {
 	ConcurrentRSSyncs int32
 }
 
+// ReplicationControllerConfiguration contains elements describing ReplicationController.
 type ReplicationControllerConfiguration struct {
 	// concurrentRCSyncs is the number of replication controllers that are
 	// allowed to sync concurrently. Larger number = more responsive replica
@@ -380,6 +407,7 @@ type ReplicationControllerConfiguration struct {
 	ConcurrentRCSyncs int32
 }
 
+// ResourceQuotaControllerConfiguration contains elements describing ResourceQuotaController.
 type ResourceQuotaControllerConfiguration struct {
 	// resourceQuotaSyncPeriod is the period for syncing quota usage status
 	// in the system.
@@ -390,6 +418,7 @@ type ResourceQuotaControllerConfiguration struct {
 	ConcurrentResourceQuotaSyncs int32
 }
 
+// SAControllerConfiguration contains elements describing ServiceAccountController.
 type SAControllerConfiguration struct {
 	// serviceAccountKeyFile is the filename containing a PEM-encoded private RSA key
 	// used to sign service account tokens.
@@ -402,6 +431,7 @@ type SAControllerConfiguration struct {
 	RootCAFile string
 }
 
+// ServiceControllerConfiguration contains elements describing ServiceController.
 type ServiceControllerConfiguration struct {
 	// concurrentServiceSyncs is the number of services that are
 	// allowed to sync concurrently. Larger number = more responsive service