Merge pull request #62412 from bhcleek/go1.10

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

generated code should pass go vet for go1.10

**What this PR does / why we need it**:

Update code generator and the code it generates to pass `go vet`.

go1.10 runs `go vet` whenever `go test` is run. Because of this, generated code for CRDs needs to pass `go vet`.

**Release note**:

```release-note
Code generated for CRDs now passes `go vet`.
```

Kubernetes-commit: 5dde701b876d1d0915314c3ed146e986c4327f7e
This commit is contained in:
Kubernetes Publisher 2018-04-20 06:22:31 -07:00
commit 467c17c87a
2 changed files with 87 additions and 86 deletions

164
Godeps/Godeps.json generated
View File

@ -244,331 +244,331 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "2b3d59d4ec5c6eb1bd9be0fcff89b84251fd6b6c"
"Rev": "1c973d529bdf4c4f349357ca665fb8e1d13e2d0d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "7aca740ef0e77e3f1a67966fa89d4ff3bb1764bd"
"Rev": "73aa818bbacf185a03468ddc170fb275763dec3d"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@ -95,9 +95,10 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
}
}
fakePtr := testing.Fake{}
fakePtr.AddReactor("*", "*", testing.ObjectReaction(o))
fakePtr.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) {
cs := &Clientset{}
cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake}
cs.AddReactor("*", "*", testing.ObjectReaction(o))
cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) {
gvr := action.GetResource()
ns := action.GetNamespace()
watch, err := o.Watch(gvr, ns)
@ -107,7 +108,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
return true, watch, nil
})
return &Clientset{fakePtr, &fakediscovery.FakeDiscovery{Fake: &fakePtr}}
return cs
}
// Clientset implements clientset.Interface. Meant to be embedded into a