github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 19:23:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62412 from bhcleek/go1.10

Browse Source 
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`.
```
This commit is contained in:
Kubernetes Submit Queue 2018-04-20 06:22:31 -07:00 committed by GitHub
commit 5dde701b87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 89 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go
View File

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

9
staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned/fake/clientset_generated.go
View File

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

9
staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/clientset_generated.go
View File

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

9
staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/internalclientset/fake/clientset_generated.go
View File

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

9
staging/src/k8s.io/client-go/kubernetes/fake/clientset_generated.go
View File

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

9
staging/src/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/fake/clientset_generated.go
View File

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

9
staging/src/k8s.io/code-generator/_examples/apiserver/clientset/versioned/fake/clientset_generated.go
View File

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

9
staging/src/k8s.io/code-generator/_examples/crd/clientset/versioned/fake/clientset_generated.go
View File

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

22
staging/src/k8s.io/code-generator/cmd/client-gen/args/gvpackages_test.go
View File

@ -45,12 +45,12 @@ func TestGVPackageFlag(t *testing.T) {
args: []string{"foo/bar/v1", "foo/bar/v2", "foo/bar/", "foo/v1"}, args: []string{"foo/bar/v1", "foo/bar/v2", "foo/bar/", "foo/v1"},
expectedGroups: []types.GroupVersions{ expectedGroups: []types.GroupVersions{
{PackageName: "bar", Group: types.Group("bar"), Versions: []types.PackageVersion{ {PackageName: "bar", Group: types.Group("bar"), Versions: []types.PackageVersion{
{"v1", "foo/bar/v1"}, {Version: "v1", Package: "foo/bar/v1"},
{"v2", "foo/bar/v2"}, {Version: "v2", Package: "foo/bar/v2"},
{"", "foo/bar"}, {Version: "", Package: "foo/bar"},
}}, }},
{PackageName: "foo", Group: types.Group("foo"), Versions: []types.PackageVersion{ {PackageName: "foo", Group: types.Group("foo"), Versions: []types.PackageVersion{
{"v1", "foo/v1"}, {Version: "v1", Package: "foo/v1"},
}}, }},
}, },
}, },
@ -59,12 +59,12 @@ func TestGVPackageFlag(t *testing.T) {
def: []string{"foo/bar/v1alpha1", "foo/v1"}, def: []string{"foo/bar/v1alpha1", "foo/v1"},
expectedGroups: []types.GroupVersions{ expectedGroups: []types.GroupVersions{
{PackageName: "bar", Group: types.Group("bar"), Versions: []types.PackageVersion{ {PackageName: "bar", Group: types.Group("bar"), Versions: []types.PackageVersion{
{"v1", "foo/bar/v1"}, {Version: "v1", Package: "foo/bar/v1"},
{"v2", "foo/bar/v2"}, {Version: "v2", Package: "foo/bar/v2"},
{"", "foo/bar"}, {Version: "", Package: "foo/bar"},
}}, }},
{PackageName: "foo", Group: types.Group("foo"), Versions: []types.PackageVersion{ {PackageName: "foo", Group: types.Group("foo"), Versions: []types.PackageVersion{
{"v1", "foo/v1"}, {Version: "v1", Package: "foo/v1"},
}}, }},
}, },
}, },
@ -72,8 +72,8 @@ func TestGVPackageFlag(t *testing.T) {
args: []string{"api/v1", "api"}, args: []string{"api/v1", "api"},
expectedGroups: []types.GroupVersions{ expectedGroups: []types.GroupVersions{
{PackageName: "core", Group: types.Group("api"), Versions: []types.PackageVersion{ {PackageName: "core", Group: types.Group("api"), Versions: []types.PackageVersion{
{"v1", "core/v1"}, {Version: "v1", Package: "core/v1"},
{"", "core"}, {Version: "", Package: "core"},
}}, }},
}, },
}, },
@ -82,7 +82,7 @@ func TestGVPackageFlag(t *testing.T) {
importBasePath: "k8s.io/api", importBasePath: "k8s.io/api",
expectedGroups: []types.GroupVersions{ expectedGroups: []types.GroupVersions{
{PackageName: "foo", Group: types.Group("foo"), Versions: []types.PackageVersion{ {PackageName: "foo", Group: types.Group("foo"), Versions: []types.PackageVersion{
{"v1", "k8s.io/api/foo/v1"}, {Version: "v1", Package: "k8s.io/api/foo/v1"},
}}, }},
}, },
}, },

11
staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
View File

@ -63,7 +63,7 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) {
groupClientPackage := filepath.Join(g.fakeClientsetPackage, "typed", group.PackageName, version.NonEmpty()) groupClientPackage := filepath.Join(g.fakeClientsetPackage, "typed", group.PackageName, version.NonEmpty())
fakeGroupClientPackage := filepath.Join(groupClientPackage, "fake") fakeGroupClientPackage := filepath.Join(groupClientPackage, "fake")
groupAlias := strings.ToLower(g.groupGoNames[clientgentypes.GroupVersion{group.Group, version.Version}]) groupAlias := strings.ToLower(g.groupGoNames[clientgentypes.GroupVersion{Group: group.Group, Version: version.Version}])
imports = append(imports, strings.ToLower(fmt.Sprintf("%s%s \"%s\"", groupAlias, version.NonEmpty(), groupClientPackage))) imports = append(imports, strings.ToLower(fmt.Sprintf("%s%s \"%s\"", groupAlias, version.NonEmpty(), groupClientPackage)))
imports = append(imports, strings.ToLower(fmt.Sprintf("fake%s%s \"%s\"", groupAlias, version.NonEmpty(), fakeGroupClientPackage))) imports = append(imports, strings.ToLower(fmt.Sprintf("fake%s%s \"%s\"", groupAlias, version.NonEmpty(), fakeGroupClientPackage)))
} }
@ -125,9 +125,10 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
} }
} }
fakePtr := testing.Fake{} cs := &Clientset{}
fakePtr.AddReactor("*", "*", testing.ObjectReaction(o)) cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake}
fakePtr.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) { cs.AddReactor("*", "*", testing.ObjectReaction(o))
cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) {
gvr := action.GetResource() gvr := action.GetResource()
ns := action.GetNamespace() ns := action.GetNamespace()
watch, err := o.Watch(gvr, ns) watch, err := o.Watch(gvr, ns)
@ -137,7 +138,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
return true, watch, nil return true, watch, nil
}) })
return &Clientset{fakePtr, &fakediscovery.FakeDiscovery{Fake: &fakePtr}} return cs
} }
// Clientset implements clientset.Interface. Meant to be embedded into a // Clientset implements clientset.Interface. Meant to be embedded into a

2
staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_clientset.go
View File

@ -59,7 +59,7 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) {
for _, group := range g.groups { for _, group := range g.groups {
for _, version := range group.Versions { for _, version := range group.Versions {
typedClientPath := filepath.Join(g.clientsetPackage, "typed", group.PackageName, version.NonEmpty()) typedClientPath := filepath.Join(g.clientsetPackage, "typed", group.PackageName, version.NonEmpty())
groupAlias := strings.ToLower(g.groupGoNames[clientgentypes.GroupVersion{group.Group, version.Version}]) groupAlias := strings.ToLower(g.groupGoNames[clientgentypes.GroupVersion{Group: group.Group, Version: version.Version}])
imports = append(imports, strings.ToLower(fmt.Sprintf("%s%s \"%s\"", groupAlias, version.NonEmpty(), typedClientPath))) imports = append(imports, strings.ToLower(fmt.Sprintf("%s%s \"%s\"", groupAlias, version.NonEmpty(), typedClientPath)))
} }
} }

2
staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go
View File

@ -62,7 +62,7 @@ func (g *GenScheme) Imports(c *generator.Context) (imports []string) {
for _, group := range g.Groups { for _, group := range g.Groups {
for _, version := range group.Versions { for _, version := range group.Versions {
packagePath := g.InputPackages[clientgentypes.GroupVersion{Group: group.Group, Version: version.Version}] packagePath := g.InputPackages[clientgentypes.GroupVersion{Group: group.Group, Version: version.Version}]
groupAlias := strings.ToLower(g.GroupGoNames[clientgentypes.GroupVersion{group.Group, version.Version}]) groupAlias := strings.ToLower(g.GroupGoNames[clientgentypes.GroupVersion{Group: group.Group, Version: version.Version}])
if g.CreateRegistry { if g.CreateRegistry {
// import the install package for internal clientsets instead of the type package with register.go // import the install package for internal clientsets instead of the type package with register.go
if version.Version != "" { if version.Version != "" {

9
staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go
View File

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

9
staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go
View File

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

9
staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset/fake/clientset_generated.go
View File

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

9
staging/src/k8s.io/sample-apiserver/pkg/client/clientset/internalversion/fake/clientset_generated.go
View File

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

9
staging/src/k8s.io/sample-apiserver/pkg/client/clientset/versioned/fake/clientset_generated.go
View File

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

9
staging/src/k8s.io/sample-controller/pkg/client/clientset/versioned/fake/clientset_generated.go
View File

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