Merge remote-tracking branch 'origin/master' into release-1.12

Kubernetes-commit: 30b0b2d36c9719ec02a6a0414db2ddc802b040e7

Godeps/Godeps.json

@@ -60,103 +60,103 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/config",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/config/v1alpha1",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "63dd81ab0848cd58da3257a806f599808708029c"
+			"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/apis/config",
-			"Rev": "1bb6216ca987560c199b0975ff4f4ce07a4abf45"
+			"Rev": "6287f470a5b62c40cf4882df1a8ca148fd687cb3"
 		},
 		{
 			"ImportPath": "k8s.io/apiserver/pkg/apis/config/v1alpha1",
-			"Rev": "1bb6216ca987560c199b0975ff4f4ce07a4abf45"
+			"Rev": "6287f470a5b62c40cf4882df1a8ca148fd687cb3"
 		},
 		{
 			"ImportPath": "k8s.io/utils/pointer",

config/v1alpha1/register.go

@@ -21,20 +21,20 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
-// GroupName is the group name use in this package
+// GroupName is the group name used 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 is the scheme builder with scheme init functions to run for this API package
 	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
-	// AddToScheme applies all the stored functions to the scheme. A non-nil error
+	// AddToScheme is a global function that registers this API group & version to a scheme
-	// indicates that one function failed and the attempt was abandoned.
 	AddToScheme = SchemeBuilder.AddToScheme
 )
 
+// addKnownTypes registers known types to the given scheme
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&KubeControllerManagerConfiguration{},