Merge pull request #77751 from baasbank/fix-lint-errors-staging/src/k8s.io

Fix lint errors staging/src/k8s.io

Kubernetes-commit: 6a40ed1005f085365ada73ce7c5e00df5046a1ad
This commit is contained in:
Kubernetes Publisher 2019-05-15 07:06:26 -07:00
commit 2407a19d13
5 changed files with 8 additions and 5 deletions

2
Godeps/Godeps.json generated
View File

@ -224,7 +224,7 @@
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "78e94f51a042" "Rev": "7b18d6600f6b"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",

4
go.mod
View File

@ -7,7 +7,7 @@ go 1.12
require ( require (
k8s.io/api v0.0.0-20190515023547-db5a9d1c40eb k8s.io/api v0.0.0-20190515023547-db5a9d1c40eb
k8s.io/apimachinery v0.0.0-20190515023456-b74e4c97951f k8s.io/apimachinery v0.0.0-20190515023456-b74e4c97951f
k8s.io/client-go v0.0.0-20190515023709-78e94f51a042 k8s.io/client-go v0.0.0-20190515063710-7b18d6600f6b
k8s.io/code-generator v0.0.0-20190511023357-639c964206c2 k8s.io/code-generator v0.0.0-20190511023357-639c964206c2
k8s.io/klog v0.3.0 k8s.io/klog v0.3.0
) )
@ -18,7 +18,7 @@ replace (
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/api => k8s.io/api v0.0.0-20190515023547-db5a9d1c40eb k8s.io/api => k8s.io/api v0.0.0-20190515023547-db5a9d1c40eb
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190515023456-b74e4c97951f k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190515023456-b74e4c97951f
k8s.io/client-go => k8s.io/client-go v0.0.0-20190515023709-78e94f51a042 k8s.io/client-go => k8s.io/client-go v0.0.0-20190515063710-7b18d6600f6b
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190511023357-639c964206c2 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190511023357-639c964206c2
) )

2
go.sum
View File

@ -96,7 +96,7 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/api v0.0.0-20190515023547-db5a9d1c40eb/go.mod h1:fbdFiGtx7GQ3+vkBAYto3QsSImiYIJdpH3YfaclST/U= k8s.io/api v0.0.0-20190515023547-db5a9d1c40eb/go.mod h1:fbdFiGtx7GQ3+vkBAYto3QsSImiYIJdpH3YfaclST/U=
k8s.io/apimachinery v0.0.0-20190515023456-b74e4c97951f/go.mod h1:Ew3b/24/JSgJdn4RsnrLskv3LvMZDlZ1Fl1xopsJftY= k8s.io/apimachinery v0.0.0-20190515023456-b74e4c97951f/go.mod h1:Ew3b/24/JSgJdn4RsnrLskv3LvMZDlZ1Fl1xopsJftY=
k8s.io/client-go v0.0.0-20190515023709-78e94f51a042/go.mod h1:Ucfy225uJpWBtWGDwTtqUZmmgR/AzYM0vge2iB/bTQ4= k8s.io/client-go v0.0.0-20190515063710-7b18d6600f6b/go.mod h1:Ucfy225uJpWBtWGDwTtqUZmmgR/AzYM0vge2iB/bTQ4=
k8s.io/code-generator v0.0.0-20190511023357-639c964206c2/go.mod h1:YMQ7Lt97nW/I6nHACDccgS/sPAyrHQNans96RwPaSb8= k8s.io/code-generator v0.0.0-20190511023357-639c964206c2/go.mod h1:YMQ7Lt97nW/I6nHACDccgS/sPAyrHQNans96RwPaSb8=
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk= k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

View File

@ -16,6 +16,7 @@ limitations under the License.
package samplecontroller package samplecontroller
// GroupName is the group name used in this package
const ( const (
GroupName = "samplecontroller.k8s.io" GroupName = "samplecontroller.k8s.io"
) )

View File

@ -38,8 +38,10 @@ func Resource(resource string) schema.GroupResource {
} }
var ( var (
// SchemeBuilder initializes a scheme builder
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
AddToScheme = SchemeBuilder.AddToScheme // AddToScheme is a global function that registers this API group & version to a scheme
AddToScheme = SchemeBuilder.AddToScheme
) )
// Adds the list of known types to Scheme. // Adds the list of known types to Scheme.