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
This commit is contained in:
Kubernetes Publisher 2019-03-19 20:14:54 -07:00
commit caa074ae28
4 changed files with 61 additions and 55 deletions

104
Godeps/Godeps.json generated
View File

@ -1,7 +1,7 @@
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"GoVersion": "go1.12", "GoVersion": "go1.12",
"GodepVersion": "v80", "GodepVersion": "v80-k8s-r1",
"Packages": [ "Packages": [
"./..." "./..."
], ],
@ -420,207 +420,207 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/equality", "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/errors", "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/cache", "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/clock", "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/naming", "ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/version", "ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "c9defaaddf6f05ecb2dd115c1bed600265501daf" "Rev": "3c12c96769cc4f6df2245f283ee74992c94fa4ee"
}, },
{ {
"ImportPath": "k8s.io/klog", "ImportPath": "k8s.io/klog",

View File

@ -40,7 +40,9 @@ func Resource(resource string) schema.GroupResource {
} }
var ( var (
// SchemeBuilder points to a list of functions added to Scheme.
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
// AddToScheme applies all the stored functions to the scheme.
AddToScheme = SchemeBuilder.AddToScheme AddToScheme = SchemeBuilder.AddToScheme
) )

View File

@ -40,7 +40,9 @@ func Resource(resource string) schema.GroupResource {
} }
var ( var (
// SchemeBuilder points to a list of functions added to Scheme.
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
// AddToScheme applies all the stored functions to the scheme.
AddToScheme = SchemeBuilder.AddToScheme AddToScheme = SchemeBuilder.AddToScheme
) )

View File

@ -39,7 +39,9 @@ func Resource(resource string) schema.GroupResource {
} }
var ( var (
// SchemeBuilder points to a list of functions added to Scheme.
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
// AddToScheme applies all the stored functions to the scheme.
AddToScheme = SchemeBuilder.AddToScheme AddToScheme = SchemeBuilder.AddToScheme
) )