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 b5c3a6f215
5 changed files with 25 additions and 13 deletions

10
Godeps/Godeps.json generated
View File

@ -58,6 +58,10 @@
"ImportPath": "github.com/google/btree",
"Rev": "7d79101e329e"
},
{
"ImportPath": "github.com/google/go-cmp",
"Rev": "v0.3.0"
},
{
"ImportPath": "github.com/google/gofuzz",
"Rev": "24818f796faf"
@ -212,15 +216,15 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "e63b5755afac"
"Rev": "c7696f7b6340"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "ad85901afca0"
"Rev": "3f1c30e3430c"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "c6f3777976ad"
"Rev": "c42884485225"
},
{
"ImportPath": "k8s.io/code-generator",

19
go.mod
View File

@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.12
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20190516033424-c7696f7b6340
k8s.io/apimachinery v0.0.0-20190528154420-3f1c30e3430c
k8s.io/client-go v0.0.0-20190516033424-c42884485225
k8s.io/code-generator v0.0.0-20190514183436-c86a2ce2ce0f
k8s.io/klog v0.3.0
)
@ -16,9 +16,10 @@ replace (
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20190516033424-c7696f7b6340
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190528154420-3f1c30e3430c
k8s.io/client-go => k8s.io/client-go v0.0.0-20190516033424-c42884485225
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190514183436-c86a2ce2ce0f
)
replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190528155600-c2eda234c182

4
go.sum
View File

@ -94,6 +94,10 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/api v0.0.0-20190516033424-c7696f7b6340/go.mod h1:Pls1dGjjNGqqY+qmUv4GGTbiOPdSenvk4qyxhvxigtc=
k8s.io/apimachinery v0.0.0-20190528154420-3f1c30e3430c/go.mod h1:Ew3b/24/JSgJdn4RsnrLskv3LvMZDlZ1Fl1xopsJftY=
k8s.io/client-go v0.0.0-20190516033424-c42884485225/go.mod h1:B7w0+DWAAOunKsLX8aZwvxkl70NsXT4KBHlgCZntkZw=
k8s.io/code-generator v0.0.0-20190514183436-c86a2ce2ce0f/go.mod h1:YMQ7Lt97nW/I6nHACDccgS/sPAyrHQNans96RwPaSb8=
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/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=

View File

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

View File

@ -38,8 +38,10 @@ func Resource(resource string) schema.GroupResource {
}
var (
// SchemeBuilder initializes a scheme builder
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.