Merge pull request #74642 from SataQiu/fix-golint-20190227

Fix golint failures in client-go/scale/scheme/appsint, client-go/scale/scheme/extensionsint, client-go/scale/scheme Kubernetes-commit: 6a2936dcbff9cb9592627c15172a1934af1c28bf
2025-08-27 19:28:58 +00:00 · 2019-03-19 20:14:54 -07:00 · 2019-03-19 20:14:54 -07:00 · caa074ae28
commit caa074ae28
parent 4837605491 151868784d
4 changed files with 61 additions and 55 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@ -1,7 +1,7 @@
 {
 	"ImportPath": "k8s.io/client-go",
 	"GoVersion": "go1.12",
-	"GodepVersion": "v80",
+	"GodepVersion": "v80-k8s-r1",
 	"Packages": [
 		"./..."
 	],
@ -420,207 +420,207 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf"
+			"Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
 		},
 		{
 			"ImportPath": "k8s.io/klog",
--- a/scale/scheme/appsint/register.go
+++ b/scale/scheme/appsint/register.go
@ -40,8 +40,10 @@ func Resource(resource string) schema.GroupResource {
 }

 var (
+	// SchemeBuilder points to a list of functions added to Scheme.
 	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
-	AddToScheme   = SchemeBuilder.AddToScheme
+	// AddToScheme applies all the stored functions to the scheme.
+	AddToScheme = SchemeBuilder.AddToScheme
 )

 // Adds the list of known types to api.Scheme.
--- a/scale/scheme/extensionsint/register.go
+++ b/scale/scheme/extensionsint/register.go
@ -40,8 +40,10 @@ func Resource(resource string) schema.GroupResource {
 }

 var (
+	// SchemeBuilder points to a list of functions added to Scheme.
 	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
-	AddToScheme   = SchemeBuilder.AddToScheme
+	// AddToScheme applies all the stored functions to the scheme.
+	AddToScheme = SchemeBuilder.AddToScheme
 )

 // Adds the list of known types to api.Scheme.
--- a/scale/scheme/register.go
+++ b/scale/scheme/register.go
@ -39,8 +39,10 @@ func Resource(resource string) schema.GroupResource {
 }

 var (
+	// SchemeBuilder points to a list of functions added to Scheme.
 	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
-	AddToScheme   = SchemeBuilder.AddToScheme
+	// AddToScheme applies all the stored functions to the scheme.
+	AddToScheme = SchemeBuilder.AddToScheme
 )

 // Adds the list of known types to api.Scheme.