diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD index acdc721b5c8..95b19cb751a 100644 --- a/cmd/kube-controller-manager/app/BUILD +++ b/cmd/kube-controller-manager/app/BUILD @@ -25,7 +25,7 @@ go_library( "//pkg/apis/batch:go_default_library", "//pkg/apis/componentconfig:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/leaderelection:go_default_library", "//pkg/client/leaderelection/resourcelock:go_default_library", "//pkg/client/record:go_default_library", diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 3537d4824c7..fe7d7b6f674 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/batch" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/leaderelection" "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" "k8s.io/kubernetes/pkg/client/record" diff --git a/cmd/kube-proxy/app/BUILD b/cmd/kube-proxy/app/BUILD index 2924b9c71c1..f2e6b2f1789 100644 --- a/cmd/kube-proxy/app/BUILD +++ b/cmd/kube-proxy/app/BUILD @@ -21,7 +21,7 @@ go_library( "//cmd/kube-proxy/app/options:go_default_library", "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/client/unversioned/clientcmd/api:go_default_library", diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index bf257a4ac04..7997c361fff 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/cmd/kube-proxy/app/options" "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" diff --git a/cmd/kubeadm/app/node/BUILD b/cmd/kubeadm/app/node/BUILD index ef047fe705b..d0f47aab7c5 100644 --- a/cmd/kubeadm/app/node/BUILD +++ b/cmd/kubeadm/app/node/BUILD @@ -23,7 +23,7 @@ go_library( "//cmd/kubeadm/app/util:go_default_library", "//pkg/apis/certificates:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/client/unversioned/clientcmd/api:go_default_library", "//pkg/kubelet/util/csr:go_default_library", diff --git a/cmd/kubeadm/app/node/bootstrap.go b/cmd/kubeadm/app/node/bootstrap.go index a18eb0c9626..6af284c3efa 100644 --- a/cmd/kubeadm/app/node/bootstrap.go +++ b/cmd/kubeadm/app/node/bootstrap.go @@ -26,7 +26,7 @@ import ( kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" "k8s.io/kubernetes/pkg/apis/certificates" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - certclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned" + certclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/wait" diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD index f86fd98480b..650a3fd4c50 100644 --- a/cmd/kubelet/app/BUILD +++ b/cmd/kubelet/app/BUILD @@ -32,10 +32,10 @@ go_library( "//pkg/capabilities:go_default_library", "//pkg/client/chaosclient:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/auth:go_default_library", diff --git a/cmd/kubelet/app/auth.go b/cmd/kubelet/app/auth.go index ea7b58900a0..53100c9aa15 100644 --- a/cmd/kubelet/app/auth.go +++ b/cmd/kubelet/app/auth.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/group" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - authenticationclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned" - authorizationclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned" + authenticationclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion" + authorizationclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion" alwaysallowauthorizer "k8s.io/kubernetes/pkg/genericapiserver/authorizer" "k8s.io/kubernetes/pkg/kubelet/server" "k8s.io/kubernetes/pkg/types" diff --git a/cmd/kubelet/app/bootstrap.go b/cmd/kubelet/app/bootstrap.go index b0b5b4ecefe..e1d1593e207 100644 --- a/cmd/kubelet/app/bootstrap.go +++ b/cmd/kubelet/app/bootstrap.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" - unversionedcertificates "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned" + unversionedcertificates "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 5cc89b0c6a5..506bd0344df 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -43,7 +43,7 @@ import ( "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/client/chaosclient" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/restclient" clientauth "k8s.io/kubernetes/pkg/client/unversioned/auth" diff --git a/cmd/libs/go2idl/client-gen/BUILD b/cmd/libs/go2idl/client-gen/BUILD index 537716c3298..d6e7dcd4f60 100644 --- a/cmd/libs/go2idl/client-gen/BUILD +++ b/cmd/libs/go2idl/client-gen/BUILD @@ -17,7 +17,7 @@ go_binary( deps = [ "//cmd/libs/go2idl/client-gen/args:go_default_library", "//cmd/libs/go2idl/client-gen/generators:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//cmd/libs/go2idl/client-gen/types:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/spf13/pflag", "//vendor:k8s.io/gengo/args", diff --git a/cmd/libs/go2idl/client-gen/args/BUILD b/cmd/libs/go2idl/client-gen/args/BUILD index aec5989b75f..5fc2bab1657 100644 --- a/cmd/libs/go2idl/client-gen/args/BUILD +++ b/cmd/libs/go2idl/client-gen/args/BUILD @@ -14,5 +14,5 @@ go_library( name = "go_default_library", srcs = ["args.go"], tags = ["automanaged"], - deps = ["//pkg/api/unversioned:go_default_library"], + deps = ["//cmd/libs/go2idl/client-gen/types:go_default_library"], ) diff --git a/cmd/libs/go2idl/client-gen/args/args.go b/cmd/libs/go2idl/client-gen/args/args.go index 81530fb3fe6..80de8f72281 100644 --- a/cmd/libs/go2idl/client-gen/args/args.go +++ b/cmd/libs/go2idl/client-gen/args/args.go @@ -16,22 +16,19 @@ limitations under the License. package args -import "k8s.io/kubernetes/pkg/api/unversioned" +import "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types" // ClientGenArgs is a wrapper for arguments to client-gen. type Args struct { - // TODO: we should make another type declaration of GroupVersion out of the - // unversioned package, which is part of our API. Tools like client-gen - // shouldn't depend on an API. - GroupVersions []unversioned.GroupVersion + Groups []types.GroupVersions // GroupVersionToInputPath is a map between GroupVersion and the path to // the respective types.go. We still need GroupVersions in the struct because // we need an order. - GroupVersionToInputPath map[unversioned.GroupVersion]string + GroupVersionToInputPath map[types.GroupVersion]string // Overrides for which types should be included in the client. - IncludedTypesOverrides map[unversioned.GroupVersion][]string + IncludedTypesOverrides map[types.GroupVersion][]string // ClientsetName is the name of the clientset to be generated. It's // populated from command-line arguments. diff --git a/cmd/libs/go2idl/client-gen/generators/BUILD b/cmd/libs/go2idl/client-gen/generators/BUILD index 120e1e8b758..c59f0ceb611 100644 --- a/cmd/libs/go2idl/client-gen/generators/BUILD +++ b/cmd/libs/go2idl/client-gen/generators/BUILD @@ -24,8 +24,7 @@ go_library( deps = [ "//cmd/libs/go2idl/client-gen/args:go_default_library", "//cmd/libs/go2idl/client-gen/generators/fake:go_default_library", - "//cmd/libs/go2idl/client-gen/generators/normalization:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//cmd/libs/go2idl/client-gen/types:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/gengo/args", "//vendor:k8s.io/gengo/generator", diff --git a/cmd/libs/go2idl/client-gen/generators/client_generator.go b/cmd/libs/go2idl/client-gen/generators/client_generator.go index b5e17db28ed..a18092698c7 100644 --- a/cmd/libs/go2idl/client-gen/generators/client_generator.go +++ b/cmd/libs/go2idl/client-gen/generators/client_generator.go @@ -28,8 +28,7 @@ import ( "k8s.io/gengo/types" clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/fake" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" - "k8s.io/kubernetes/pkg/api/unversioned" + clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types" "github.com/golang/glog" ) @@ -62,10 +61,10 @@ func generatedBy(customArgs clientgenargs.Args) string { return fmt.Sprintf("\n// This package is generated by client-gen with the default arguments.\n\n") } -func packageForGroup(gv unversioned.GroupVersion, typeList []*types.Type, packageBasePath string, apiPath string, srcTreePath string, inputPath string, boilerplate []byte, generatedBy string) generator.Package { - outputPackagePath := filepath.Join(packageBasePath, gv.Group, gv.Version) +func packageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, packageBasePath string, apiPath string, srcTreePath string, inputPath string, boilerplate []byte, generatedBy string) generator.Package { + outputPackagePath := strings.ToLower(filepath.Join(packageBasePath, gv.Group.NonEmpty(), gv.Version.NonEmpty())) return &generator.DefaultPackage{ - PackageName: gv.Version, + PackageName: strings.ToLower(gv.Version.NonEmpty()), PackagePath: outputPackagePath, HeaderText: boilerplate, PackageDocumentation: []byte( @@ -87,8 +86,8 @@ func packageForGroup(gv unversioned.GroupVersion, typeList []*types.Type, packag OptionalName: strings.ToLower(c.Namers["private"].Name(t)), }, outputPackage: outputPackagePath, - group: normalization.BeforeFirstDot(gv.Group), - version: gv.Version, + group: gv.Group.NonEmpty(), + version: gv.Version.String(), typeToMatch: t, imports: generator.NewImportTracker(), }) @@ -96,12 +95,12 @@ func packageForGroup(gv unversioned.GroupVersion, typeList []*types.Type, packag generators = append(generators, &genGroup{ DefaultGen: generator.DefaultGen{ - OptionalName: normalization.BeforeFirstDot(gv.Group) + "_client", + OptionalName: gv.Group.NonEmpty() + "_client", }, outputPackage: outputPackagePath, inputPacakge: inputPath, - group: gv.Group, - version: gv.Version, + group: gv.Group.NonEmpty(), + version: gv.Version.String(), apiPath: apiPath, types: typeList, imports: generator.NewImportTracker(), @@ -144,7 +143,7 @@ func packageForClientset(customArgs clientgenargs.Args, typedClientBasePath stri DefaultGen: generator.DefaultGen{ OptionalName: "clientset", }, - groupVersions: customArgs.GroupVersions, + groups: customArgs.Groups, typedClientPath: typedClientBasePath, outputPackage: customArgs.ClientsetName, imports: generator.NewImportTracker(), @@ -170,7 +169,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat generatedBy := generatedBy(customArgs) - gvToTypes := map[unversioned.GroupVersion][]*types.Type{} + gvToTypes := map[clientgentypes.GroupVersion][]*types.Type{} for gv, inputDir := range customArgs.GroupVersionToInputPath { p := context.Universe.Package(inputDir) for n, t := range p.Types { @@ -215,12 +214,15 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat } orderer := namer.Orderer{Namer: namer.NewPrivateNamer(0)} - for _, gv := range customArgs.GroupVersions { - types := gvToTypes[gv] - inputPath := customArgs.GroupVersionToInputPath[gv] - packageList = append(packageList, packageForGroup(normalization.GroupVersion(gv), orderer.OrderTypes(types), typedClientBasePath, customArgs.ClientsetAPIPath, arguments.OutputBase, inputPath, boilerplate, generatedBy)) - if customArgs.FakeClient { - packageList = append(packageList, fake.PackageForGroup(normalization.GroupVersion(gv), orderer.OrderTypes(types), typedClientBasePath, arguments.OutputBase, inputPath, boilerplate, generatedBy)) + for _, group := range customArgs.Groups { + for _, version := range group.Versions { + gv := clientgentypes.GroupVersion{Group: group.Group, Version: version} + types := gvToTypes[gv] + inputPath := customArgs.GroupVersionToInputPath[gv] + packageList = append(packageList, packageForGroup(gv, orderer.OrderTypes(types), typedClientBasePath, customArgs.ClientsetAPIPath, arguments.OutputBase, inputPath, boilerplate, generatedBy)) + if customArgs.FakeClient { + packageList = append(packageList, fake.PackageForGroup(gv, orderer.OrderTypes(types), typedClientBasePath, arguments.OutputBase, inputPath, boilerplate, generatedBy)) + } } } diff --git a/cmd/libs/go2idl/client-gen/generators/fake/BUILD b/cmd/libs/go2idl/client-gen/generators/fake/BUILD index 0f94af6673d..744361a41df 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/BUILD +++ b/cmd/libs/go2idl/client-gen/generators/fake/BUILD @@ -21,8 +21,7 @@ go_library( tags = ["automanaged"], deps = [ "//cmd/libs/go2idl/client-gen/args:go_default_library", - "//cmd/libs/go2idl/client-gen/generators/normalization:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//cmd/libs/go2idl/client-gen/types:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/gengo/generator", "//vendor:k8s.io/gengo/namer", diff --git a/cmd/libs/go2idl/client-gen/generators/fake/fake_client_generator.go b/cmd/libs/go2idl/client-gen/generators/fake/fake_client_generator.go index 9d698db7e6e..8decba1e434 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/fake_client_generator.go +++ b/cmd/libs/go2idl/client-gen/generators/fake/fake_client_generator.go @@ -25,14 +25,13 @@ import ( "k8s.io/gengo/generator" "k8s.io/gengo/types" clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" - "k8s.io/kubernetes/pkg/api/unversioned" + clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types" ) -func PackageForGroup(gv unversioned.GroupVersion, typeList []*types.Type, packageBasePath string, srcTreePath string, inputPath string, boilerplate []byte, generatedBy string) generator.Package { - outputPackagePath := filepath.Join(packageBasePath, gv.Group, gv.Version, "fake") +func PackageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, packageBasePath string, srcTreePath string, inputPath string, boilerplate []byte, generatedBy string) generator.Package { + outputPackagePath := strings.ToLower(filepath.Join(packageBasePath, gv.Group.NonEmpty(), gv.Version.NonEmpty(), "fake")) // TODO: should make this a function, called by here and in client-generator.go - realClientPath := filepath.Join(packageBasePath, gv.Group, gv.Version) + realClientPath := filepath.Join(packageBasePath, gv.Group.NonEmpty(), gv.Version.NonEmpty()) return &generator.DefaultPackage{ PackageName: "fake", PackagePath: outputPackagePath, @@ -56,9 +55,9 @@ func PackageForGroup(gv unversioned.GroupVersion, typeList []*types.Type, packag OptionalName: "fake_" + strings.ToLower(c.Namers["private"].Name(t)), }, outputPackage: outputPackagePath, - group: normalization.BeforeFirstDot(gv.Group), + group: gv.Group.NonEmpty(), + version: gv.Version.String(), inputPackage: inputPath, - version: gv.Version, typeToMatch: t, imports: generator.NewImportTracker(), }) @@ -66,11 +65,12 @@ func PackageForGroup(gv unversioned.GroupVersion, typeList []*types.Type, packag generators = append(generators, &genFakeForGroup{ DefaultGen: generator.DefaultGen{ - OptionalName: "fake_" + normalization.BeforeFirstDot(gv.Group) + "_client", + OptionalName: "fake_" + gv.Group.NonEmpty() + "_client", }, outputPackage: outputPackagePath, realClientPath: realClientPath, - group: normalization.BeforeFirstDot(gv.Group), + group: gv.Group.NonEmpty(), + version: gv.Version.String(), types: typeList, imports: generator.NewImportTracker(), }) @@ -112,7 +112,7 @@ func PackageForClientset(customArgs clientgenargs.Args, typedClientBasePath stri DefaultGen: generator.DefaultGen{ OptionalName: "clientset_generated", }, - groupVersions: customArgs.GroupVersions, + groups: customArgs.Groups, typedClientPath: typedClientBasePath, outputPackage: "fake", imports: generator.NewImportTracker(), diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go index b964f3edc8e..dd16c10e603 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go +++ b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_clientset.go @@ -20,18 +20,18 @@ import ( "fmt" "io" "path/filepath" + "strings" "k8s.io/gengo/generator" "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" - "k8s.io/kubernetes/pkg/api/unversioned" + clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types" ) // genClientset generates a package for a clientset. type genClientset struct { generator.DefaultGen - groupVersions []unversioned.GroupVersion + groups []clientgentypes.GroupVersions typedClientPath string outputPackage string imports namer.ImportTracker @@ -57,14 +57,13 @@ func (g *genClientset) Filter(c *generator.Context, t *types.Type) bool { func (g *genClientset) Imports(c *generator.Context) (imports []string) { imports = append(imports, g.imports.ImportLines()...) - for _, gv := range g.groupVersions { - group := normalization.Group(gv.Group) - version := normalization.Version(gv.Version) - undotted_group := normalization.BeforeFirstDot(group) - typedClientPath := filepath.Join(g.typedClientPath, group, version) - imports = append(imports, fmt.Sprintf("%s%s \"%s\"", version, undotted_group, typedClientPath)) - fakeTypedClientPath := filepath.Join(typedClientPath, "fake") - imports = append(imports, fmt.Sprintf("fake%s%s \"%s\"", version, undotted_group, fakeTypedClientPath)) + for _, group := range g.groups { + for _, version := range group.Versions { + typedClientPath := filepath.Join(g.typedClientPath, group.Group.NonEmpty(), version.NonEmpty()) + imports = append(imports, strings.ToLower(fmt.Sprintf("%s%s \"%s\"", version.NonEmpty(), group.Group.NonEmpty(), typedClientPath))) + fakeTypedClientPath := filepath.Join(typedClientPath, "fake") + imports = append(imports, strings.ToLower(fmt.Sprintf("fake%s%s \"%s\"", version.NonEmpty(), group.Group.NonEmpty(), fakeTypedClientPath))) + } } // the package that has the clientset Interface imports = append(imports, fmt.Sprintf("clientset \"%s\"", g.clientsetPath)) @@ -91,19 +90,14 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr sw.Do(checkImpl, nil) - type arg struct { - Group string - PackageName string - } - allGroups := []arg{} - for _, gv := range g.groupVersions { - group := normalization.BeforeFirstDot(normalization.Group(gv.Group)) - version := normalization.Version(gv.Version) - allGroups = append(allGroups, arg{namer.IC(group), version + group}) - } + allGroups := clientgentypes.ToGroupVersionPackages(g.groups) for _, g := range allGroups { sw.Do(clientsetInterfaceImplTemplate, g) + // don't generated the default method if generating internalversion clientset + if g.IsDefaultVersion && g.Version != "" { + sw.Do(clientsetInterfaceDefaultVersionImpl, g) + } } return sw.Error() @@ -148,8 +142,15 @@ var _ clientset.Interface = &Clientset{} ` var clientsetInterfaceImplTemplate = ` -// $.Group$ retrieves the $.Group$Client -func (c *Clientset) $.Group$() $.PackageName$.$.Group$Interface { - return &fake$.PackageName$.Fake$.Group${Fake: &c.Fake} +// $.GroupVersion$ retrieves the $.GroupVersion$Client +func (c *Clientset) $.GroupVersion$() $.PackageName$.$.GroupVersion$Interface { + return &fake$.PackageName$.Fake$.GroupVersion${Fake: &c.Fake} +} +` + +var clientsetInterfaceDefaultVersionImpl = ` +// $.Group$ retrieves the $.GroupVersion$Client +func (c *Clientset) $.Group$() $.PackageName$.$.GroupVersion$Interface { + return &fake$.PackageName$.Fake$.GroupVersion${Fake: &c.Fake} } ` diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go index 98fa195e722..fdd4f2daa7b 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go +++ b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_group.go @@ -20,6 +20,7 @@ import ( "fmt" "io" "path/filepath" + "strings" "k8s.io/gengo/generator" "k8s.io/gengo/namer" @@ -32,6 +33,7 @@ type genFakeForGroup struct { outputPackage string realClientPath string group string + version string // types in this group types []*types.Type imports namer.ImportTracker @@ -51,7 +53,7 @@ func (g *genFakeForGroup) Namers(c *generator.Context) namer.NameSystems { } func (g *genFakeForGroup) Imports(c *generator.Context) (imports []string) { - imports = append(g.imports.ImportLines(), fmt.Sprintf("%s \"%s\"", filepath.Base(g.realClientPath), g.realClientPath)) + imports = append(g.imports.ImportLines(), strings.ToLower(fmt.Sprintf("%s \"%s\"", filepath.Base(g.realClientPath), g.realClientPath))) return imports } @@ -61,7 +63,7 @@ func (g *genFakeForGroup) GenerateType(c *generator.Context, t *types.Type, w io const pkgRESTClient = "k8s.io/kubernetes/pkg/client/restclient" m := map[string]interface{}{ "group": g.group, - "Group": namer.IC(g.group), + "GroupVersion": namer.IC(g.group) + namer.IC(g.version), "Fake": c.Universe.Type(types.Name{Package: pkgTestingCore, Name: "Fake"}), "RESTClientInterface": c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "Interface"}), "RESTClient": c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "RESTClient"}), @@ -70,8 +72,8 @@ func (g *genFakeForGroup) GenerateType(c *generator.Context, t *types.Type, w io for _, t := range g.types { wrapper := map[string]interface{}{ "type": t, - "Group": namer.IC(g.group), - "realClientPackage": filepath.Base(g.realClientPath), + "GroupVersion": namer.IC(g.group) + namer.IC(g.version), + "realClientPackage": strings.ToLower(filepath.Base(g.realClientPath)), } namespaced := !extractBoolTagOrDie("nonNamespaced", t.SecondClosestCommentLines) if namespaced { @@ -86,19 +88,19 @@ func (g *genFakeForGroup) GenerateType(c *generator.Context, t *types.Type, w io } var groupClientTemplate = ` -type Fake$.Group$ struct { +type Fake$.GroupVersion$ struct { *$.Fake|raw$ } ` var getterImplNamespaced = ` -func (c *Fake$.Group$) $.type|publicPlural$(namespace string) $.realClientPackage$.$.type|public$Interface { +func (c *Fake$.GroupVersion$) $.type|publicPlural$(namespace string) $.realClientPackage$.$.type|public$Interface { return &Fake$.type|publicPlural${c, namespace} } ` var getterImplNonNamespaced = ` -func (c *Fake$.Group$) $.type|publicPlural$() $.realClientPackage$.$.type|public$Interface { +func (c *Fake$.GroupVersion$) $.type|publicPlural$() $.realClientPackage$.$.type|public$Interface { return &Fake$.type|publicPlural${c} } ` @@ -106,7 +108,7 @@ func (c *Fake$.Group$) $.type|publicPlural$() $.realClientPackage$.$.type|public var getRESTClient = ` // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *Fake$.Group$) RESTClient() $.RESTClientInterface|raw$ { +func (c *Fake$.GroupVersion$) RESTClient() $.RESTClientInterface|raw$ { var ret *$.RESTClient|raw$ return ret } diff --git a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go index 93a1e964def..eac63b355ce 100644 --- a/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go +++ b/cmd/libs/go2idl/client-gen/generators/fake/generator_fake_for_type.go @@ -31,8 +31,8 @@ type genFakeForType struct { generator.DefaultGen outputPackage string group string - inputPackage string version string + inputPackage string typeToMatch *types.Type imports namer.ImportTracker } @@ -84,10 +84,6 @@ func (g *genFakeForType) GenerateType(c *generator.Context, t *types.Type, w io. if canonicalGroup == "core" { canonicalGroup = "" } - canonicalVersion := g.version - if canonicalVersion == "unversioned" { - canonicalVersion = "" - } groupName := g.group if g.group == "core" { @@ -106,9 +102,10 @@ func (g *genFakeForType) GenerateType(c *generator.Context, t *types.Type, w io. "Package": namer.IC(pkg), "namespaced": namespaced, "Group": namer.IC(g.group), + "GroupVersion": namer.IC(g.group) + namer.IC(g.version), "group": canonicalGroup, "groupName": groupName, - "version": canonicalVersion, + "version": g.version, "watchInterface": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/watch", Name: "Interface"}), "GroupVersionResource": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/unversioned", Name: "GroupVersionResource"}), "PatchType": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "PatchType"}), @@ -137,7 +134,7 @@ func (g *genFakeForType) GenerateType(c *generator.Context, t *types.Type, w io. "ExtractFromListOptions": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "ExtractFromListOptions"}), } - if g.version == "unversioned" { + if g.version == "" { m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "DeleteOptions"}) m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "ListOptions"}) } else { @@ -180,7 +177,7 @@ func (g *genFakeForType) GenerateType(c *generator.Context, t *types.Type, w io. var structNamespaced = ` // Fake$.type|publicPlural$ implements $.type|public$Interface type Fake$.type|publicPlural$ struct { - Fake *Fake$.Group$ + Fake *Fake$.GroupVersion$ ns string } ` @@ -189,7 +186,7 @@ type Fake$.type|publicPlural$ struct { var structNonNamespaced = ` // Fake$.type|publicPlural$ implements $.type|public$Interface type Fake$.type|publicPlural$ struct { - Fake *Fake$.Group$ + Fake *Fake$.GroupVersion$ } ` diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go index 56571a3882d..16684f14738 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go @@ -20,18 +20,18 @@ import ( "fmt" "io" "path/filepath" + "strings" "k8s.io/gengo/generator" "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" - "k8s.io/kubernetes/pkg/api/unversioned" + clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types" ) // genClientset generates a package for a clientset. type genClientset struct { generator.DefaultGen - groupVersions []unversioned.GroupVersion + groups []clientgentypes.GroupVersions typedClientPath string outputPackage string imports namer.ImportTracker @@ -55,12 +55,11 @@ func (g *genClientset) Filter(c *generator.Context, t *types.Type) bool { func (g *genClientset) Imports(c *generator.Context) (imports []string) { imports = append(imports, g.imports.ImportLines()...) - for _, gv := range g.groupVersions { - group := normalization.Group(gv.Group) - version := normalization.Version(gv.Version) - typedClientPath := filepath.Join(g.typedClientPath, group, version) - group = normalization.BeforeFirstDot(group) - imports = append(imports, fmt.Sprintf("%s%s \"%s\"", version, group, typedClientPath)) + for _, group := range g.groups { + for _, version := range group.Versions { + typedClientPath := filepath.Join(g.typedClientPath, group.Group.NonEmpty(), version.NonEmpty()) + imports = append(imports, strings.ToLower(fmt.Sprintf("%s%s \"%s\"", version.NonEmpty(), group.Group.NonEmpty(), typedClientPath))) + } } imports = append(imports, "github.com/golang/glog") imports = append(imports, "k8s.io/kubernetes/pkg/util/flowcontrol") @@ -76,17 +75,7 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr const pkgDiscovery = "k8s.io/kubernetes/pkg/client/typed/discovery" const pkgRESTClient = "k8s.io/kubernetes/pkg/client/restclient" - type arg struct { - Group string - PackageName string - } - - allGroups := []arg{} - for _, gv := range g.groupVersions { - group := normalization.BeforeFirstDot(normalization.Group(gv.Group)) - version := normalization.Version(gv.Version) - allGroups = append(allGroups, arg{namer.IC(group), version + group}) - } + allGroups := clientgentypes.ToGroupVersionPackages(g.groups) m := map[string]interface{}{ "allGroups": allGroups, @@ -99,10 +88,14 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr "NewDiscoveryClientForConfigOrDie": c.Universe.Function(types.Name{Package: pkgDiscovery, Name: "NewDiscoveryClientForConfigOrDie"}), "NewDiscoveryClient": c.Universe.Function(types.Name{Package: pkgDiscovery, Name: "NewDiscoveryClient"}), } - sw.Do(clientsetInterfaceTemplate, m) + sw.Do(clientsetInterface, m) sw.Do(clientsetTemplate, m) for _, g := range allGroups { sw.Do(clientsetInterfaceImplTemplate, g) + // don't generated the default method if generating internalversion clientset + if g.IsDefaultVersion && g.Version != "" { + sw.Do(clientsetInterfaceDefaultVersionImpl, g) + } } sw.Do(getDiscoveryTemplate, m) sw.Do(newClientsetForConfigTemplate, m) @@ -112,10 +105,12 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr return sw.Error() } -var clientsetInterfaceTemplate = ` +var clientsetInterface = ` type Interface interface { Discovery() $.DiscoveryInterface|raw$ - $range .allGroups$$.Group$() $.PackageName$.$.Group$Interface + $range .allGroups$$.GroupVersion$() $.PackageName$.$.GroupVersion$Interface + $if .IsDefaultVersion$// Deprecated: please explicitly pick a version if possible. + $.Group$() $.PackageName$.$.GroupVersion$Interface$end$ $end$ } ` @@ -125,20 +120,32 @@ var clientsetTemplate = ` // version included in a Clientset. type Clientset struct { *$.DiscoveryClient|raw$ - $range .allGroups$*$.PackageName$.$.Group$Client + $range .allGroups$*$.PackageName$.$.GroupVersion$Client $end$ } ` var clientsetInterfaceImplTemplate = ` -// $.Group$ retrieves the $.Group$Client -func (c *Clientset) $.Group$() $.PackageName$.$.Group$Interface { +// $.GroupVersion$ retrieves the $.GroupVersion$Client +func (c *Clientset) $.GroupVersion$() $.PackageName$.$.GroupVersion$Interface { if c == nil { return nil } - return c.$.Group$Client + return c.$.GroupVersion$Client } ` + +var clientsetInterfaceDefaultVersionImpl = ` +// Deprecated: $.Group$ retrieves the default version of $.Group$Client. +// Please explicitly pick a version. +func (c *Clientset) $.Group$() $.PackageName$.$.GroupVersion$Interface { + if c == nil { + return nil + } + return c.$.GroupVersion$Client +} +` + var getDiscoveryTemplate = ` // Discovery retrieves the DiscoveryClient func (c *Clientset) Discovery() $.DiscoveryInterface|raw$ { @@ -155,7 +162,7 @@ func NewForConfig(c *$.Config|raw$) (*Clientset, error) { } var clientset Clientset var err error -$range .allGroups$ clientset.$.Group$Client, err =$.PackageName$.NewForConfig(&configShallowCopy) +$range .allGroups$ clientset.$.GroupVersion$Client, err =$.PackageName$.NewForConfig(&configShallowCopy) if err!=nil { return nil, err } @@ -174,7 +181,7 @@ var newClientsetForConfigOrDieTemplate = ` // panics if there is an error in the config. func NewForConfigOrDie(c *$.Config|raw$) *Clientset { var clientset Clientset -$range .allGroups$ clientset.$.Group$Client =$.PackageName$.NewForConfigOrDie(c) +$range .allGroups$ clientset.$.GroupVersion$Client =$.PackageName$.NewForConfigOrDie(c) $end$ clientset.DiscoveryClient = $.NewDiscoveryClientForConfigOrDie|raw$(c) return &clientset @@ -185,7 +192,7 @@ var newClientsetForRESTClientTemplate = ` // New creates a new Clientset for the given RESTClient. func New(c $.RESTClientInterface|raw$) *Clientset { var clientset Clientset -$range .allGroups$ clientset.$.Group$Client =$.PackageName$.New(c) +$range .allGroups$ clientset.$.GroupVersion$Client =$.PackageName$.New(c) $end$ clientset.DiscoveryClient = $.NewDiscoveryClient|raw$(c) return &clientset diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_group.go b/cmd/libs/go2idl/client-gen/generators/generator_for_group.go index 5d642e888e2..857b13599d7 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_group.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_group.go @@ -22,7 +22,6 @@ import ( "k8s.io/gengo/generator" "k8s.io/gengo/namer" "k8s.io/gengo/types" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators/normalization" ) // genGroup produces a file for a group client, e.g. ExtensionsClient for the extension group. @@ -62,6 +61,8 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer const pkgRegistered = "k8s.io/kubernetes/pkg/apimachinery/registered" const pkgAPI = "k8s.io/kubernetes/pkg/api" const pkgSerializer = "k8s.io/kubernetes/pkg/runtime/serializer" + const pkgUnversioned = "k8s.io/kubernetes/pkg/api/unversioned" + apiPath := func(group string) string { if len(g.apiPath) > 0 { return `"` + g.apiPath + `"` @@ -83,16 +84,19 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer } m := map[string]interface{}{ - "group": normalization.BeforeFirstDot(g.group), - "Group": namer.IC(normalization.BeforeFirstDot(g.group)), + "group": g.group, + "version": g.version, + "GroupVersion": namer.IC(g.group) + namer.IC(g.version), "groupName": groupName, "types": g.types, "Config": c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "Config"}), "DefaultKubernetesUserAgent": c.Universe.Function(types.Name{Package: pkgRESTClient, Name: "DefaultKubernetesUserAgent"}), "RESTClientInterface": c.Universe.Type(types.Name{Package: pkgRESTClient, Name: "Interface"}), "RESTClientFor": c.Universe.Function(types.Name{Package: pkgRESTClient, Name: "RESTClientFor"}), - "latestGroup": c.Universe.Variable(types.Name{Package: pkgRegistered, Name: "Group"}), + "Group": c.Universe.Variable(types.Name{Package: pkgRegistered, Name: "Group"}), "GroupOrDie": c.Universe.Variable(types.Name{Package: pkgRegistered, Name: "GroupOrDie"}), + "IsEnabledVersion": c.Universe.Variable(types.Name{Package: pkgRegistered, Name: "IsEnabledVersion"}), + "ParseGroupVersion": c.Universe.Function(types.Name{Package: pkgUnversioned, Name: "ParseGroupVersion"}), "apiPath": apiPath(g.group), "codecs": c.Universe.Variable(types.Name{Package: pkgAPI, Name: "Codecs"}), "directCodecFactory": c.Universe.Variable(types.Name{Package: pkgSerializer, Name: "DirectCodecFactory"}), @@ -102,8 +106,8 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer sw.Do(groupClientTemplate, m) for _, t := range g.types { wrapper := map[string]interface{}{ - "type": t, - "Group": namer.IC(normalization.BeforeFirstDot(g.group)), + "type": t, + "GroupVersion": namer.IC(g.group) + namer.IC(g.version), } namespaced := !extractBoolTagOrDie("nonNamespaced", t.SecondClosestCommentLines) if namespaced { @@ -116,7 +120,7 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer sw.Do(newClientForConfigTemplate, m) sw.Do(newClientForConfigOrDieTemplate, m) sw.Do(newClientForRESTClientTemplate, m) - if g.version == "unversioned" { + if g.version == "" { sw.Do(setInternalVersionClientDefaultsTemplate, m) } else { sw.Do(setClientDefaultsTemplate, m) @@ -127,7 +131,7 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer } var groupInterfaceTemplate = ` -type $.Group$Interface interface { +type $.GroupVersion$Interface interface { RESTClient() $.RESTClientInterface|raw$ $range .types$ $.|publicPlural$Getter $end$ @@ -135,27 +139,27 @@ type $.Group$Interface interface { ` var groupClientTemplate = ` -// $.Group$Client is used to interact with features provided by the $.Group$ group. -type $.Group$Client struct { +// $.GroupVersion$Client is used to interact with features provided by the $.Group$ group. +type $.GroupVersion$Client struct { restClient $.RESTClientInterface|raw$ } ` var getterImplNamespaced = ` -func (c *$.Group$Client) $.type|publicPlural$(namespace string) $.type|public$Interface { +func (c *$.GroupVersion$Client) $.type|publicPlural$(namespace string) $.type|public$Interface { return new$.type|publicPlural$(c, namespace) } ` var getterImplNonNamespaced = ` -func (c *$.Group$Client) $.type|publicPlural$() $.type|public$Interface { +func (c *$.GroupVersion$Client) $.type|publicPlural$() $.type|public$Interface { return new$.type|publicPlural$(c) } ` var newClientForConfigTemplate = ` -// NewForConfig creates a new $.Group$Client for the given config. -func NewForConfig(c *$.Config|raw$) (*$.Group$Client, error) { +// NewForConfig creates a new $.GroupVersion$Client for the given config. +func NewForConfig(c *$.Config|raw$) (*$.GroupVersion$Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -164,14 +168,14 @@ func NewForConfig(c *$.Config|raw$) (*$.Group$Client, error) { if err != nil { return nil, err } - return &$.Group$Client{client}, nil + return &$.GroupVersion$Client{client}, nil } ` var newClientForConfigOrDieTemplate = ` -// NewForConfigOrDie creates a new $.Group$Client for the given config and +// NewForConfigOrDie creates a new $.GroupVersion$Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *$.Config|raw$) *$.Group$Client { +func NewForConfigOrDie(c *$.Config|raw$) *$.GroupVersion$Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -183,7 +187,7 @@ func NewForConfigOrDie(c *$.Config|raw$) *$.Group$Client { var getRESTClient = ` // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *$.Group$Client) RESTClient() $.RESTClientInterface|raw$ { +func (c *$.GroupVersion$Client) RESTClient() $.RESTClientInterface|raw$ { if c == nil { return nil } @@ -192,15 +196,15 @@ func (c *$.Group$Client) RESTClient() $.RESTClientInterface|raw$ { ` var newClientForRESTClientTemplate = ` -// New creates a new $.Group$Client for the given RESTClient. -func New(c $.RESTClientInterface|raw$) *$.Group$Client { - return &$.Group$Client{c} +// New creates a new $.GroupVersion$Client for the given RESTClient. +func New(c $.RESTClientInterface|raw$) *$.GroupVersion$Client { + return &$.GroupVersion$Client{c} } ` var setInternalVersionClientDefaultsTemplate = ` func setConfigDefaults(config *$.Config|raw$) error { // if $.group$ group is not registered, return an error - g, err := $.latestGroup|raw$("$.groupName$") + g, err := $.Group|raw$("$.groupName$") if err != nil { return err } @@ -226,20 +230,20 @@ func setConfigDefaults(config *$.Config|raw$) error { var setClientDefaultsTemplate = ` func setConfigDefaults(config *$.Config|raw$) error { - // if $.group$ group is not registered, return an error - g, err := $.latestGroup|raw$("$.groupName$") + gv, err := $.ParseGroupVersion|raw$("$.groupName$/$.version$") if err != nil { return err } + // if $.groupName$/$.version$ is not enabled, return an error + if ! $.IsEnabledVersion|raw$(gv) { + return $.Errorf|raw$("$.groupName$/$.version$ is not enabled") + } config.APIPath = $.apiPath$ if config.UserAgent == "" { config.UserAgent = $.DefaultKubernetesUserAgent|raw$() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = $.directCodecFactory|raw${CodecFactory: $.codecs|raw$} diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_type.go b/cmd/libs/go2idl/client-gen/generators/generator_for_type.go index 94971a47c0d..d17580dd990 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_type.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_type.go @@ -73,6 +73,7 @@ func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w i "package": pkg, "Package": namer.IC(pkg), "Group": namer.IC(g.group), + "GroupVersion": namer.IC(g.group) + namer.IC(g.version), "watchInterface": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/watch", Name: "Interface"}), "RESTClientInterface": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/client/restclient", Name: "Interface"}), "apiParameterCodec": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "ParameterCodec"}), @@ -80,7 +81,7 @@ func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w i "namespaced": namespaced, } - if g.version == "unversioned" { + if g.version == "" { m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "DeleteOptions"}) m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "ListOptions"}) } else { @@ -195,7 +196,7 @@ type $.type|privatePlural$ struct { var newStructNamespaced = ` // new$.type|publicPlural$ returns a $.type|publicPlural$ -func new$.type|publicPlural$(c *$.Group$Client, namespace string) *$.type|privatePlural$ { +func new$.type|publicPlural$(c *$.GroupVersion$Client, namespace string) *$.type|privatePlural$ { return &$.type|privatePlural${ client: c.RESTClient(), ns: namespace, @@ -205,7 +206,7 @@ func new$.type|publicPlural$(c *$.Group$Client, namespace string) *$.type|privat var newStructNonNamespaced = ` // new$.type|publicPlural$ returns a $.type|publicPlural$ -func new$.type|publicPlural$(c *$.Group$Client) *$.type|privatePlural$ { +func new$.type|publicPlural$(c *$.GroupVersion$Client) *$.type|privatePlural$ { return &$.type|privatePlural${ client: c.RESTClient(), } diff --git a/cmd/libs/go2idl/client-gen/generators/normalization/normalization.go b/cmd/libs/go2idl/client-gen/generators/normalization/normalization.go deleted file mode 100644 index 7946c624d4a..00000000000 --- a/cmd/libs/go2idl/client-gen/generators/normalization/normalization.go +++ /dev/null @@ -1,45 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package normalization - -import ( - "strings" - - "k8s.io/kubernetes/pkg/api/unversioned" -) - -func Group(group string) string { - if group == "api" { - return "core" - } - return group -} - -func Version(version string) string { - if version == "" { - return "unversioned" - } - return version -} - -func GroupVersion(gv unversioned.GroupVersion) unversioned.GroupVersion { - return unversioned.GroupVersion{Group: Group(gv.Group), Version: Version(gv.Version)} -} - -func BeforeFirstDot(dotted string) string { - return strings.Split(dotted, ".")[0] -} diff --git a/cmd/libs/go2idl/client-gen/main.go b/cmd/libs/go2idl/client-gen/main.go index c25c1476386..de157773cbd 100644 --- a/cmd/libs/go2idl/client-gen/main.go +++ b/cmd/libs/go2idl/client-gen/main.go @@ -20,12 +20,13 @@ package main import ( "fmt" "path/filepath" + "sort" "strings" "k8s.io/gengo/args" clientgenargs "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/args" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/generators" - "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types" "github.com/golang/glog" flag "github.com/spf13/pflag" @@ -91,36 +92,48 @@ func parsePathGroupVersion(pgvString string) (gvPath string, gvString string) { } } -func parseInputVersions() (paths []string, groupVersions []unversioned.GroupVersion, gvToPath map[unversioned.GroupVersion]string, err error) { - var visitedGroups = make(map[string]struct{}) - gvToPath = make(map[unversioned.GroupVersion]string) +func parseInputVersions() (paths []string, groups []types.GroupVersions, gvToPath map[types.GroupVersion]string, err error) { + var seenGroups = make(map[types.Group]*types.GroupVersions) + gvToPath = make(map[types.GroupVersion]string) for _, input := range *inputVersions { gvPath, gvString := parsePathGroupVersion(input) - gv, err := unversioned.ParseGroupVersion(gvString) + gv, err := types.ToGroupVersion(gvString) if err != nil { return nil, nil, nil, err } - - if _, found := visitedGroups[gv.Group]; found { - return nil, nil, nil, fmt.Errorf("group %q appeared more than once in the input. At most one version is allowed for each group.", gv.Group) + if group, ok := seenGroups[gv.Group]; ok { + (*seenGroups[gv.Group]).Versions = append(group.Versions, gv.Version) + } else { + seenGroups[gv.Group] = &types.GroupVersions{ + Group: gv.Group, + Versions: []types.Version{gv.Version}, + } } - visitedGroups[gv.Group] = struct{}{} - groupVersions = append(groupVersions, gv) - path := versionToPath(gvPath, gv.Group, gv.Version) + + path := versionToPath(gvPath, gv.Group.String(), gv.Version.String()) paths = append(paths, path) gvToPath[gv] = path } - return paths, groupVersions, gvToPath, nil + var groupNames []string + for groupName := range seenGroups { + groupNames = append(groupNames, groupName.String()) + } + sort.Strings(groupNames) + for _, groupName := range groupNames { + groups = append(groups, *seenGroups[types.Group(groupName)]) + } + + return paths, groups, gvToPath, nil } -func parseIncludedTypesOverrides() (map[unversioned.GroupVersion][]string, error) { - overrides := make(map[unversioned.GroupVersion][]string) +func parseIncludedTypesOverrides() (map[types.GroupVersion][]string, error) { + overrides := make(map[types.GroupVersion][]string) for _, input := range *includedTypesOverrides { gvString, typeStr, err := parseGroupVersionType(input) if err != nil { return nil, err } - gv, err := unversioned.ParseGroupVersion(gvString) + gv, err := types.ToGroupVersion(gvString) if err != nil { return nil, err } @@ -155,12 +168,12 @@ func main() { if *test { arguments.InputDirs = append(dependencies, []string{ - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io", + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup", }...) arguments.CustomArgs = clientgenargs.Args{ - GroupVersions: []unversioned.GroupVersion{{Group: "testgroup.k8s.io", Version: ""}}, - GroupVersionToInputPath: map[unversioned.GroupVersion]string{ - unversioned.GroupVersion{Group: "testgroup.k8s.io", Version: ""}: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io", + Groups: []types.GroupVersions{{Group: "testgroup", Versions: []types.Version{""}}}, + GroupVersionToInputPath: map[types.GroupVersion]string{ + types.GroupVersion{Group: "testgroup", Version: ""}: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup", }, ClientsetName: "test_internalclientset", ClientsetOutputPath: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/", @@ -169,7 +182,7 @@ func main() { CmdArgs: cmdArgs, } } else { - inputPath, groupVersions, gvToPath, err := parseInputVersions() + inputPath, groups, gvToPath, err := parseInputVersions() if err != nil { glog.Fatalf("Error: %v", err) } @@ -181,7 +194,7 @@ func main() { arguments.InputDirs = append(inputPath, dependencies...) arguments.CustomArgs = clientgenargs.Args{ - GroupVersions: groupVersions, + Groups: groups, GroupVersionToInputPath: gvToPath, ClientsetName: *clientsetName, ClientsetAPIPath: *clientsetAPIPath, diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/BUILD b/cmd/libs/go2idl/client-gen/test_apis/testgroup/BUILD similarity index 100% rename from cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/BUILD rename to cmd/libs/go2idl/client-gen/test_apis/testgroup/BUILD diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/doc.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/doc.go similarity index 94% rename from cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/doc.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup/doc.go index 0b57778ec5b..e2083788712 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/doc.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // +groupName=testgroup.k8s.io -package testgroup // import "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" +package testgroup // import "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup" diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/BUILD b/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/BUILD similarity index 79% rename from cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/BUILD rename to cmd/libs/go2idl/client-gen/test_apis/testgroup/install/BUILD index 0c467b225e1..64e23b2de3c 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/BUILD +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/BUILD @@ -15,8 +15,8 @@ go_library( srcs = ["install.go"], tags = ["automanaged"], deps = [ - "//cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io:go_default_library", - "//cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1:go_default_library", + "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library", + "//cmd/libs/go2idl/client-gen/test_apis/testgroup/v1:go_default_library", "//pkg/api:go_default_library", "//pkg/api/meta:go_default_library", "//pkg/api/unversioned:go_default_library", diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/install.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/install.go similarity index 98% rename from cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/install.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup/install/install.go index 0addd14182b..03a02423ad6 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/install.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/install.go @@ -23,8 +23,8 @@ import ( "github.com/golang/glog" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1" + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup" + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/unversioned" @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/util/sets" ) -const importPrefix = "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" +const importPrefix = "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup" var accessor = meta.NewAccessor() diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/register.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go similarity index 100% rename from cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/register.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/types.generated.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go similarity index 100% rename from cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/types.generated.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/types.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go similarity index 100% rename from cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/types.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/BUILD b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/BUILD similarity index 100% rename from cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/BUILD rename to cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/BUILD diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/doc.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/doc.go similarity index 95% rename from cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/doc.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/doc.go index 1d860307451..f6ab83e2111 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/doc.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/doc.go @@ -15,4 +15,5 @@ limitations under the License. */ // +k8s:openapi-gen=true +// +groupName=testgroup.k8s.io package v1 diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/register.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go similarity index 100% rename from cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/register.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/types.generated.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go similarity index 100% rename from cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/types.generated.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/types.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.go similarity index 100% rename from cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1/types.go rename to cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.go diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD index 5a40d73de1c..9b7384a2ef0 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/BUILD @@ -18,7 +18,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned:go_default_library", + "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/util/flowcontrol:go_default_library", diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go index fec63bcc24f..b9869d3573c 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go @@ -18,7 +18,7 @@ package test_internalclientset import ( "github.com/golang/glog" - unversionedtestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned" + internalversiontestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" "k8s.io/kubernetes/pkg/util/flowcontrol" @@ -27,18 +27,18 @@ import ( type Interface interface { Discovery() discovery.DiscoveryInterface - Testgroup() unversionedtestgroup.TestgroupInterface + Testgroup() internalversiontestgroup.TestgroupInterface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *unversionedtestgroup.TestgroupClient + *internalversiontestgroup.TestgroupClient } // Testgroup retrieves the TestgroupClient -func (c *Clientset) Testgroup() unversionedtestgroup.TestgroupInterface { +func (c *Clientset) Testgroup() internalversiontestgroup.TestgroupInterface { if c == nil { return nil } @@ -58,7 +58,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { } var clientset Clientset var err error - clientset.TestgroupClient, err = unversionedtestgroup.NewForConfig(&configShallowCopy) + clientset.TestgroupClient, err = internalversiontestgroup.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -75,7 +75,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *restclient.Config) *Clientset { var clientset Clientset - clientset.TestgroupClient = unversionedtestgroup.NewForConfigOrDie(c) + clientset.TestgroupClient = internalversiontestgroup.NewForConfigOrDie(c) clientset.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &clientset @@ -84,7 +84,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c restclient.Interface) *Clientset { var clientset Clientset - clientset.TestgroupClient = unversionedtestgroup.New(c) + clientset.TestgroupClient = internalversiontestgroup.New(c) clientset.DiscoveryClient = discovery.NewDiscoveryClient(c) return &clientset diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD index 758c3d3a5ff..a9c1c527279 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/BUILD @@ -19,8 +19,8 @@ go_library( tags = ["automanaged"], deps = [ "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset:go_default_library", - "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned:go_default_library", - "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake:go_default_library", + "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library", + "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake:go_default_library", "//pkg/api:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go index e8f28aa9fd1..8c0f3039146 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake/clientset_generated.go @@ -18,8 +18,8 @@ package fake import ( clientset "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset" - unversionedtestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned" - fakeunversionedtestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake" + internalversiontestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" + fakeinternalversiontestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/testing/core" @@ -63,6 +63,6 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} // Testgroup retrieves the TestgroupClient -func (c *Clientset) Testgroup() unversionedtestgroup.TestgroupInterface { - return &fakeunversionedtestgroup.FakeTestgroup{Fake: &c.Fake} +func (c *Clientset) Testgroup() internalversiontestgroup.TestgroupInterface { + return &fakeinternalversiontestgroup.FakeTestgroup{Fake: &c.Fake} } diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/BUILD deleted file mode 100644 index 9e93f8101c6..00000000000 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/BUILD +++ /dev/null @@ -1,48 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_binary", - "go_library", - "go_test", - "cgo_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "generated_expansion.go", - "testgroup_client.go", - "testtype.go", - "testtype_expansion.go", - ], - tags = ["automanaged"], - deps = [ - "//cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io:go_default_library", - "//pkg/api:go_default_library", - "//pkg/apimachinery/registered:go_default_library", - "//pkg/client/restclient:go_default_library", - "//pkg/watch:go_default_library", - ], -) - -go_test( - name = "go_default_xtest", - srcs = ["testgroup_test.go"], - tags = ["automanaged"], - deps = [ - "//cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io:go_default_library", - "//cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install:go_default_library", - "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned:go_default_library", - "//pkg/api:go_default_library", - "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", - "//pkg/apimachinery/registered:go_default_library", - "//pkg/client/restclient:go_default_library", - "//pkg/client/unversioned/testclient/simple:go_default_library", - "//pkg/labels:go_default_library", - ], -) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_test.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_test.go deleted file mode 100644 index 530f3c5b5b6..00000000000 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_test.go +++ /dev/null @@ -1,293 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package unversioned_test - -import ( - "net/http" - "net/url" - "testing" - - testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" - _ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install" - . "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned" - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/apimachinery/registered" - "k8s.io/kubernetes/pkg/client/restclient" - "k8s.io/kubernetes/pkg/client/unversioned/testclient/simple" - "k8s.io/kubernetes/pkg/labels" -) - -var testHelper testapi.TestGroup - -func init() { - if _, found := testapi.Groups[testgroup.SchemeGroupVersion.Group]; found { - return - } - externalGroupVersion := registered.GroupOrDie(testgroup.SchemeGroupVersion.Group).GroupVersion - testapi.Groups[testgroup.SchemeGroupVersion.Group] = testapi.NewTestGroup( - externalGroupVersion, - testgroup.SchemeGroupVersion, - api.Scheme.KnownTypes(testgroup.SchemeGroupVersion), - api.Scheme.KnownTypes(externalGroupVersion)) - testHelper = testapi.Groups[testgroup.SchemeGroupVersion.Group] -} - -type DecoratedSimpleClient struct { - *TestgroupClient - simpleClient simple.Client -} - -func (c *DecoratedSimpleClient) Setup(t *testing.T) *DecoratedSimpleClient { - c.simpleClient.Setup(t) - url := c.simpleClient.ServerURL() - c.TestgroupClient = NewForConfigOrDie(&restclient.Config{ - Host: url, - }) - return c -} - -func TestCreateTestTypes(t *testing.T) { - ns := api.NamespaceDefault - requestTestType := &testgroup.TestType{} - c := DecoratedSimpleClient{ - simpleClient: simple.Client{ - Request: simple.Request{Method: "POST", Path: testHelper.ResourcePath("testtypes", ns, ""), Query: simple.BuildQueryValues(nil), Body: requestTestType}, - Response: simple.Response{ - StatusCode: http.StatusOK, - Body: requestTestType, - }, - }, - } - receivedTestType, err := c.Setup(t).TestTypes(ns).Create(requestTestType) - c.simpleClient.Validate(t, receivedTestType, err) -} - -func TestUpdateTestType(t *testing.T) { - ns := api.NamespaceDefault - requestTestType := &testgroup.TestType{ - ObjectMeta: api.ObjectMeta{ - Name: "foo", - ResourceVersion: "1", - Labels: map[string]string{ - "foo": "bar", - "name": "baz", - }, - }, - } - c := DecoratedSimpleClient{ - simpleClient: simple.Client{ - Request: simple.Request{Method: "PUT", Path: testHelper.ResourcePath("testtypes", ns, "foo"), Query: simple.BuildQueryValues(nil)}, - Response: simple.Response{StatusCode: http.StatusOK, Body: requestTestType}, - }, - } - receivedTestType, err := c.Setup(t).TestTypes(ns).Update(requestTestType) - c.simpleClient.Validate(t, receivedTestType, err) -} - -func TestUpdateStatusTestType(t *testing.T) { - ns := api.NamespaceDefault - requestTestType := &testgroup.TestType{ - ObjectMeta: api.ObjectMeta{ - Name: "foo", - ResourceVersion: "1", - Labels: map[string]string{ - "foo": "bar", - "name": "baz", - }, - }, - Status: testgroup.TestTypeStatus{Blah: "I'm in good status"}, - } - c := DecoratedSimpleClient{ - simpleClient: simple.Client{ - Request: simple.Request{Method: "PUT", Path: testHelper.ResourcePath("testtypes", ns, "foo"), Query: simple.BuildQueryValues(nil)}, - Response: simple.Response{StatusCode: http.StatusOK, Body: requestTestType}, - }, - } - receivedTestType, err := c.Setup(t).TestTypes(ns).Update(requestTestType) - c.simpleClient.Validate(t, receivedTestType, err) -} - -func TestDeleteTestType(t *testing.T) { - ns := api.NamespaceDefault - c := DecoratedSimpleClient{ - simpleClient: simple.Client{ - Request: simple.Request{Method: "DELETE", Path: testHelper.ResourcePath("testtypes", ns, "foo"), Query: simple.BuildQueryValues(nil)}, - Response: simple.Response{StatusCode: http.StatusOK}, - }, - } - err := c.Setup(t).TestTypes(ns).Delete("foo", nil) - c.simpleClient.Validate(t, nil, err) -} - -func TestGetTestType(t *testing.T) { - ns := api.NamespaceDefault - c := DecoratedSimpleClient{ - simpleClient: simple.Client{ - Request: simple.Request{Method: "GET", Path: testHelper.ResourcePath("testtypes", ns, "foo"), Query: simple.BuildQueryValues(nil)}, - Response: simple.Response{ - StatusCode: http.StatusOK, - Body: &testgroup.TestType{ - ObjectMeta: api.ObjectMeta{ - Labels: map[string]string{ - "foo": "bar", - "name": "baz", - }, - }, - }, - }, - }, - } - receivedTestType, err := c.Setup(t).TestTypes(ns).Get("foo") - c.simpleClient.Validate(t, receivedTestType, err) -} - -func TestGetTestTypeWithNoName(t *testing.T) { - ns := api.NamespaceDefault - c := DecoratedSimpleClient{ - simpleClient: simple.Client{Error: true}, - } - receivedTestType, err := c.Setup(t).TestTypes(ns).Get("") - if (err != nil) && (err.Error() != simple.NameRequiredError) { - t.Errorf("Expected error: %v, but got %v", simple.NameRequiredError, err) - } - - c.simpleClient.Validate(t, receivedTestType, err) -} - -func TestListEmptyTestTypes(t *testing.T) { - ns := api.NamespaceDefault - c := DecoratedSimpleClient{ - simpleClient: simple.Client{ - Request: simple.Request{Method: "GET", Path: testHelper.ResourcePath("testtypes", ns, ""), Query: simple.BuildQueryValues(nil)}, - Response: simple.Response{StatusCode: http.StatusOK, Body: &testgroup.TestTypeList{}}, - }, - } - podList, err := c.Setup(t).TestTypes(ns).List(api.ListOptions{}) - c.simpleClient.Validate(t, podList, err) -} - -func TestListTestTypes(t *testing.T) { - ns := api.NamespaceDefault - c := DecoratedSimpleClient{ - simpleClient: simple.Client{ - Request: simple.Request{Method: "GET", Path: testHelper.ResourcePath("testtypes", ns, ""), Query: simple.BuildQueryValues(nil)}, - Response: simple.Response{StatusCode: http.StatusOK, - Body: &testgroup.TestTypeList{ - Items: []testgroup.TestType{ - { - ObjectMeta: api.ObjectMeta{ - Labels: map[string]string{ - "foo": "bar", - "name": "baz", - }, - }, - }, - }, - }, - }, - }, - } - receivedTestTypeList, err := c.Setup(t).TestTypes(ns).List(api.ListOptions{}) - c.simpleClient.Validate(t, receivedTestTypeList, err) -} - -func TestListTestTypesLabels(t *testing.T) { - ns := api.NamespaceDefault - labelSelectorQueryParamName := unversioned.LabelSelectorQueryParam(testHelper.GroupVersion().String()) - c := DecoratedSimpleClient{ - simpleClient: simple.Client{ - Request: simple.Request{ - Method: "GET", - Path: testHelper.ResourcePath("testtypes", ns, ""), - Query: simple.BuildQueryValues(url.Values{labelSelectorQueryParamName: []string{"foo=bar,name=baz"}})}, - Response: simple.Response{ - StatusCode: http.StatusOK, - Body: &testgroup.TestTypeList{ - Items: []testgroup.TestType{ - { - ObjectMeta: api.ObjectMeta{ - Labels: map[string]string{ - "foo": "bar", - "name": "baz", - }, - }, - }, - }, - }, - }, - }, - } - c.Setup(t) - c.simpleClient.QueryValidator[labelSelectorQueryParamName] = simple.ValidateLabels - selector := labels.Set{"foo": "bar", "name": "baz"}.AsSelector() - options := api.ListOptions{LabelSelector: selector} - receivedTestTypeList, err := c.TestTypes(ns).List(options) - c.simpleClient.Validate(t, receivedTestTypeList, err) -} - -func TestExpansionInterface(t *testing.T) { - c := New(nil) - if e, a := "hello!", c.TestTypes("").Hello(); e != a { - t.Errorf("expansion failed") - } -} - -func TestPatchTestType(t *testing.T) { - ns := api.NamespaceDefault - requestTestType := &testgroup.TestType{ - ObjectMeta: api.ObjectMeta{ - Name: "foo", - ResourceVersion: "1", - Labels: map[string]string{ - "foo": "bar", - "name": "baz", - }, - }, - } - c := DecoratedSimpleClient{ - simpleClient: simple.Client{ - Request: simple.Request{Method: "PATCH", Path: testHelper.ResourcePath("testtypes", ns, "foo"), Query: simple.BuildQueryValues(nil)}, - Response: simple.Response{StatusCode: http.StatusOK, Body: requestTestType}, - }, - } - receivedTestType, err := c.Setup(t).TestTypes(ns).Patch(requestTestType.Name, api.StrategicMergePatchType, []byte{}) - c.simpleClient.Validate(t, receivedTestType, err) -} - -func TestPatchSubresourcesTestType(t *testing.T) { - ns := api.NamespaceDefault - requestTestType := &testgroup.TestType{ - ObjectMeta: api.ObjectMeta{ - Name: "foo", - ResourceVersion: "1", - Labels: map[string]string{ - "foo": "bar", - "name": "baz", - }, - }, - } - c := DecoratedSimpleClient{ - simpleClient: simple.Client{ - Request: simple.Request{Method: "PATCH", Path: testHelper.ResourcePath("testtypes", ns, "foo/status"), Query: simple.BuildQueryValues(nil)}, - Response: simple.Response{StatusCode: http.StatusOK, Body: requestTestType}, - }, - } - receivedTestType, err := c.Setup(t).TestTypes(ns).Patch(requestTestType.Name, api.StrategicMergePatchType, []byte{}, "status") - c.simpleClient.Validate(t, receivedTestType, err) -} diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD new file mode 100644 index 00000000000..7970847ef82 --- /dev/null +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/BUILD @@ -0,0 +1,29 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_binary", + "go_library", + "go_test", + "cgo_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "doc.go", + "generated_expansion.go", + "testgroup_client.go", + "testtype.go", + ], + tags = ["automanaged"], + deps = [ + "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library", + "//pkg/api:go_default_library", + "//pkg/apimachinery/registered:go_default_library", + "//pkg/client/restclient:go_default_library", + "//pkg/watch:go_default_library", + ], +) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/doc.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/doc.go similarity index 96% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/doc.go rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/doc.go index fa31a07643d..f2cc39227d5 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/doc.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/doc.go @@ -17,4 +17,4 @@ limitations under the License. // This package is generated by client-gen with arguments: --test=true // This package has the automatically generated typed clients. -package unversioned +package internalversion diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD similarity index 78% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/BUILD rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD index 55c92a1bf34..30bb9aed755 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/BUILD +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/BUILD @@ -16,12 +16,11 @@ go_library( "doc.go", "fake_testgroup_client.go", "fake_testtype.go", - "fake_testtype_expansion.go", ], tags = ["automanaged"], deps = [ - "//cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io:go_default_library", - "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned:go_default_library", + "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library", + "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:go_default_library", "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/client/restclient:go_default_library", diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/doc.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/doc.go similarity index 100% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/doc.go rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/doc.go diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testgroup_client.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go similarity index 80% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testgroup_client.go rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go index 308537d6123..4634db69ff1 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testgroup_client.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testgroup_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned" + internalversion "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,7 +26,7 @@ type FakeTestgroup struct { *core.Fake } -func (c *FakeTestgroup) TestTypes(namespace string) unversioned.TestTypeInterface { +func (c *FakeTestgroup) TestTypes(namespace string) internalversion.TestTypeInterface { return &FakeTestTypes{c, namespace} } diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testtype.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go similarity index 68% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testtype.go rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go index c70b9837610..c4ded1eb013 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testtype.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake/fake_testtype.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - testgroup_k8s_io "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" + testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup" api "k8s.io/kubernetes/pkg/api" unversioned "k8s.io/kubernetes/pkg/api/unversioned" core "k8s.io/kubernetes/pkg/client/testing/core" @@ -33,39 +33,39 @@ type FakeTestTypes struct { var testtypesResource = unversioned.GroupVersionResource{Group: "testgroup.k8s.io", Version: "", Resource: "testtypes"} -func (c *FakeTestTypes) Create(testType *testgroup_k8s_io.TestType) (result *testgroup_k8s_io.TestType, err error) { +func (c *FakeTestTypes) Create(testType *testgroup.TestType) (result *testgroup.TestType, err error) { obj, err := c.Fake. - Invokes(core.NewCreateAction(testtypesResource, c.ns, testType), &testgroup_k8s_io.TestType{}) + Invokes(core.NewCreateAction(testtypesResource, c.ns, testType), &testgroup.TestType{}) if obj == nil { return nil, err } - return obj.(*testgroup_k8s_io.TestType), err + return obj.(*testgroup.TestType), err } -func (c *FakeTestTypes) Update(testType *testgroup_k8s_io.TestType) (result *testgroup_k8s_io.TestType, err error) { +func (c *FakeTestTypes) Update(testType *testgroup.TestType) (result *testgroup.TestType, err error) { obj, err := c.Fake. - Invokes(core.NewUpdateAction(testtypesResource, c.ns, testType), &testgroup_k8s_io.TestType{}) + Invokes(core.NewUpdateAction(testtypesResource, c.ns, testType), &testgroup.TestType{}) if obj == nil { return nil, err } - return obj.(*testgroup_k8s_io.TestType), err + return obj.(*testgroup.TestType), err } -func (c *FakeTestTypes) UpdateStatus(testType *testgroup_k8s_io.TestType) (*testgroup_k8s_io.TestType, error) { +func (c *FakeTestTypes) UpdateStatus(testType *testgroup.TestType) (*testgroup.TestType, error) { obj, err := c.Fake. - Invokes(core.NewUpdateSubresourceAction(testtypesResource, "status", c.ns, testType), &testgroup_k8s_io.TestType{}) + Invokes(core.NewUpdateSubresourceAction(testtypesResource, "status", c.ns, testType), &testgroup.TestType{}) if obj == nil { return nil, err } - return obj.(*testgroup_k8s_io.TestType), err + return obj.(*testgroup.TestType), err } func (c *FakeTestTypes) Delete(name string, options *api.DeleteOptions) error { _, err := c.Fake. - Invokes(core.NewDeleteAction(testtypesResource, c.ns, name), &testgroup_k8s_io.TestType{}) + Invokes(core.NewDeleteAction(testtypesResource, c.ns, name), &testgroup.TestType{}) return err } @@ -73,23 +73,23 @@ func (c *FakeTestTypes) Delete(name string, options *api.DeleteOptions) error { func (c *FakeTestTypes) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { action := core.NewDeleteCollectionAction(testtypesResource, c.ns, listOptions) - _, err := c.Fake.Invokes(action, &testgroup_k8s_io.TestTypeList{}) + _, err := c.Fake.Invokes(action, &testgroup.TestTypeList{}) return err } -func (c *FakeTestTypes) Get(name string) (result *testgroup_k8s_io.TestType, err error) { +func (c *FakeTestTypes) Get(name string) (result *testgroup.TestType, err error) { obj, err := c.Fake. - Invokes(core.NewGetAction(testtypesResource, c.ns, name), &testgroup_k8s_io.TestType{}) + Invokes(core.NewGetAction(testtypesResource, c.ns, name), &testgroup.TestType{}) if obj == nil { return nil, err } - return obj.(*testgroup_k8s_io.TestType), err + return obj.(*testgroup.TestType), err } -func (c *FakeTestTypes) List(opts api.ListOptions) (result *testgroup_k8s_io.TestTypeList, err error) { +func (c *FakeTestTypes) List(opts api.ListOptions) (result *testgroup.TestTypeList, err error) { obj, err := c.Fake. - Invokes(core.NewListAction(testtypesResource, c.ns, opts), &testgroup_k8s_io.TestTypeList{}) + Invokes(core.NewListAction(testtypesResource, c.ns, opts), &testgroup.TestTypeList{}) if obj == nil { return nil, err @@ -99,8 +99,8 @@ func (c *FakeTestTypes) List(opts api.ListOptions) (result *testgroup_k8s_io.Tes if label == nil { label = labels.Everything() } - list := &testgroup_k8s_io.TestTypeList{} - for _, item := range obj.(*testgroup_k8s_io.TestTypeList).Items { + list := &testgroup.TestTypeList{} + for _, item := range obj.(*testgroup.TestTypeList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -116,12 +116,12 @@ func (c *FakeTestTypes) Watch(opts api.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched testType. -func (c *FakeTestTypes) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *testgroup_k8s_io.TestType, err error) { +func (c *FakeTestTypes) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *testgroup.TestType, err error) { obj, err := c.Fake. - Invokes(core.NewPatchSubresourceAction(testtypesResource, c.ns, name, data, subresources...), &testgroup_k8s_io.TestType{}) + Invokes(core.NewPatchSubresourceAction(testtypesResource, c.ns, name, data, subresources...), &testgroup.TestType{}) if obj == nil { return nil, err } - return obj.(*testgroup_k8s_io.TestType), err + return obj.(*testgroup.TestType), err } diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/generated_expansion.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/generated_expansion.go new file mode 100644 index 00000000000..3087c4e366a --- /dev/null +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/generated_expansion.go @@ -0,0 +1,19 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package internalversion + +type TestTypeExpansion interface{} diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go similarity index 96% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go index 6891ce825b2..acace10fc92 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -27,7 +27,7 @@ type TestgroupInterface interface { TestTypesGetter } -// TestgroupClient is used to interact with features provided by the Testgroup group. +// TestgroupClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type TestgroupClient struct { restClient restclient.Interface } diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go similarity index 75% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go index 857d3c1ec6c..e5aa89fb5f5 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( - testgroup_k8s_io "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" + testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup" api "k8s.io/kubernetes/pkg/api" restclient "k8s.io/kubernetes/pkg/client/restclient" watch "k8s.io/kubernetes/pkg/watch" @@ -31,15 +31,15 @@ type TestTypesGetter interface { // TestTypeInterface has methods to work with TestType resources. type TestTypeInterface interface { - Create(*testgroup_k8s_io.TestType) (*testgroup_k8s_io.TestType, error) - Update(*testgroup_k8s_io.TestType) (*testgroup_k8s_io.TestType, error) - UpdateStatus(*testgroup_k8s_io.TestType) (*testgroup_k8s_io.TestType, error) + Create(*testgroup.TestType) (*testgroup.TestType, error) + Update(*testgroup.TestType) (*testgroup.TestType, error) + UpdateStatus(*testgroup.TestType) (*testgroup.TestType, error) Delete(name string, options *api.DeleteOptions) error DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error - Get(name string) (*testgroup_k8s_io.TestType, error) - List(opts api.ListOptions) (*testgroup_k8s_io.TestTypeList, error) + Get(name string) (*testgroup.TestType, error) + List(opts api.ListOptions) (*testgroup.TestTypeList, error) Watch(opts api.ListOptions) (watch.Interface, error) - Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *testgroup_k8s_io.TestType, err error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *testgroup.TestType, err error) TestTypeExpansion } @@ -58,8 +58,8 @@ func newTestTypes(c *TestgroupClient, namespace string) *testTypes { } // Create takes the representation of a testType and creates it. Returns the server's representation of the testType, and an error, if there is any. -func (c *testTypes) Create(testType *testgroup_k8s_io.TestType) (result *testgroup_k8s_io.TestType, err error) { - result = &testgroup_k8s_io.TestType{} +func (c *testTypes) Create(testType *testgroup.TestType) (result *testgroup.TestType, err error) { + result = &testgroup.TestType{} err = c.client.Post(). Namespace(c.ns). Resource("testtypes"). @@ -70,8 +70,8 @@ func (c *testTypes) Create(testType *testgroup_k8s_io.TestType) (result *testgro } // Update takes the representation of a testType and updates it. Returns the server's representation of the testType, and an error, if there is any. -func (c *testTypes) Update(testType *testgroup_k8s_io.TestType) (result *testgroup_k8s_io.TestType, err error) { - result = &testgroup_k8s_io.TestType{} +func (c *testTypes) Update(testType *testgroup.TestType) (result *testgroup.TestType, err error) { + result = &testgroup.TestType{} err = c.client.Put(). Namespace(c.ns). Resource("testtypes"). @@ -82,8 +82,8 @@ func (c *testTypes) Update(testType *testgroup_k8s_io.TestType) (result *testgro return } -func (c *testTypes) UpdateStatus(testType *testgroup_k8s_io.TestType) (result *testgroup_k8s_io.TestType, err error) { - result = &testgroup_k8s_io.TestType{} +func (c *testTypes) UpdateStatus(testType *testgroup.TestType) (result *testgroup.TestType, err error) { + result = &testgroup.TestType{} err = c.client.Put(). Namespace(c.ns). Resource("testtypes"). @@ -118,8 +118,8 @@ func (c *testTypes) DeleteCollection(options *api.DeleteOptions, listOptions api } // Get takes name of the testType, and returns the corresponding testType object, and an error if there is any. -func (c *testTypes) Get(name string) (result *testgroup_k8s_io.TestType, err error) { - result = &testgroup_k8s_io.TestType{} +func (c *testTypes) Get(name string) (result *testgroup.TestType, err error) { + result = &testgroup.TestType{} err = c.client.Get(). Namespace(c.ns). Resource("testtypes"). @@ -130,8 +130,8 @@ func (c *testTypes) Get(name string) (result *testgroup_k8s_io.TestType, err err } // List takes label and field selectors, and returns the list of TestTypes that match those selectors. -func (c *testTypes) List(opts api.ListOptions) (result *testgroup_k8s_io.TestTypeList, err error) { - result = &testgroup_k8s_io.TestTypeList{} +func (c *testTypes) List(opts api.ListOptions) (result *testgroup.TestTypeList, err error) { + result = &testgroup.TestTypeList{} err = c.client.Get(). Namespace(c.ns). Resource("testtypes"). @@ -152,8 +152,8 @@ func (c *testTypes) Watch(opts api.ListOptions) (watch.Interface, error) { } // Patch applies the patch and returns the patched testType. -func (c *testTypes) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *testgroup_k8s_io.TestType, err error) { - result = &testgroup_k8s_io.TestType{} +func (c *testTypes) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *testgroup.TestType, err error) { + result = &testgroup.TestType{} err = c.client.Patch(pt). Namespace(c.ns). Resource("testtypes"). diff --git a/cmd/libs/go2idl/client-gen/generators/normalization/BUILD b/cmd/libs/go2idl/client-gen/types/BUILD similarity index 50% rename from cmd/libs/go2idl/client-gen/generators/normalization/BUILD rename to cmd/libs/go2idl/client-gen/types/BUILD index 8012dca8097..c9fba4492e9 100644 --- a/cmd/libs/go2idl/client-gen/generators/normalization/BUILD +++ b/cmd/libs/go2idl/client-gen/types/BUILD @@ -12,7 +12,18 @@ load( go_library( name = "go_default_library", - srcs = ["normalization.go"], + srcs = [ + "helpers.go", + "types.go", + ], tags = ["automanaged"], - deps = ["//pkg/api/unversioned:go_default_library"], + deps = ["//vendor:k8s.io/gengo/namer"], +) + +go_test( + name = "go_default_test", + srcs = ["helpers_test.go"], + library = "go_default_library", + tags = ["automanaged"], + deps = [], ) diff --git a/cmd/libs/go2idl/client-gen/types/helpers.go b/cmd/libs/go2idl/client-gen/types/helpers.go new file mode 100644 index 00000000000..641026470c4 --- /dev/null +++ b/cmd/libs/go2idl/client-gen/types/helpers.go @@ -0,0 +1,108 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package types + +import ( + "fmt" + "regexp" + "sort" + "strings" + + "k8s.io/gengo/namer" +) + +// ToGroupVersion turns "group/version" string into a GroupVersion struct. It reports error +// if it cannot parse the string. +func ToGroupVersion(gv string) (GroupVersion, error) { + // this can be the internal version for the legacy kube types + // TODO once we've cleared the last uses as strings, this special case should be removed. + if (len(gv) == 0) || (gv == "/") { + return GroupVersion{}, nil + } + + switch strings.Count(gv, "/") { + case 0: + return GroupVersion{"", Version(gv)}, nil + case 1: + i := strings.Index(gv, "/") + return GroupVersion{Group(gv[:i]), Version(gv[i+1:])}, nil + default: + return GroupVersion{}, fmt.Errorf("unexpected GroupVersion string: %v", gv) + } +} + +type sortableSliceOfVersions []string + +func (a sortableSliceOfVersions) Len() int { return len(a) } +func (a sortableSliceOfVersions) Swap(i, j int) { a[i], a[j] = a[j], a[i] } +func (a sortableSliceOfVersions) Less(i, j int) bool { + vi, vj := strings.TrimLeft(a[i], "v"), strings.TrimLeft(a[j], "v") + major := regexp.MustCompile("^[0-9]+") + viMajor, vjMajor := major.FindString(vi), major.FindString(vj) + viRemaining, vjRemaining := strings.TrimLeft(vi, viMajor), strings.TrimLeft(vj, vjMajor) + switch { + case len(viRemaining) == 0 && len(vjRemaining) == 0: + return viMajor < vjMajor + case len(viRemaining) == 0 && len(vjRemaining) != 0: + // stable version is greater than unstable version + return false + case len(viRemaining) != 0 && len(vjRemaining) == 0: + // stable version is greater than unstable version + return true + } + // neither are stable versions + if viMajor != vjMajor { + return viMajor < vjMajor + } + // assuming at most we have one alpha or one beta version, so if vi contains "alpha", it's the lesser one. + return strings.Contains(viRemaining, "alpha") +} + +// Determine the default version among versions. If a user calls a group client +// without specifying the version (e.g., c.Core(), instead of c.CoreV1()), the +// default version will be returned. +func defaultVersion(versions []Version) Version { + var versionStrings []string + for _, version := range versions { + versionStrings = append(versionStrings, string(version)) + } + sort.Sort(sortableSliceOfVersions(versionStrings)) + return Version(versionStrings[len(versionStrings)-1]) +} + +// ToGroupVersionPackages is a helper function used by generators for groups. +func ToGroupVersionPackages(groups []GroupVersions) []GroupVersionPackage { + var groupVersionPackages []GroupVersionPackage + for _, group := range groups { + defaultVersion := defaultVersion(group.Versions) + for _, version := range group.Versions { + groupVersionPackages = append(groupVersionPackages, GroupVersionPackage{ + Group: Group(namer.IC(group.Group.NonEmpty())), + Version: Version(namer.IC(version.String())), + GroupVersion: namer.IC(group.Group.NonEmpty()) + namer.IC(version.String()), + PackageName: strings.ToLower(version.NonEmpty() + group.Group.NonEmpty()), + IsDefaultVersion: version == defaultVersion && version != "", + }) + } + } + return groupVersionPackages +} + +// NormalizeGroupVersion calls normalizes the GroupVersion. +//func NormalizeGroupVersion(gv GroupVersion) GroupVersion { +// return GroupVersion{Group: gv.Group.NonEmpty(), Version: gv.Version, NonEmptyVersion: normalization.Version(gv.Version)} +//} diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype_expansion.go b/cmd/libs/go2idl/client-gen/types/helpers_test.go similarity index 58% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype_expansion.go rename to cmd/libs/go2idl/client-gen/types/helpers_test.go index 5991c0a617b..dec62dff21d 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testtype_expansion.go +++ b/cmd/libs/go2idl/client-gen/types/helpers_test.go @@ -14,12 +14,19 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package types -type TestTypeExpansion interface { - Hello() string -} +import ( + "reflect" + "sort" + "testing" +) -func (c *testTypes) Hello() string { - return "hello!" +func TestVersionSort(t *testing.T) { + unsortedVersions := []string{"v4beta1", "v2beta1", "v2alpha1", "v3", "v1"} + expected := []string{"v2alpha1", "v2beta1", "v4beta1", "v1", "v3"} + sort.Sort(sortableSliceOfVersions(unsortedVersions)) + if !reflect.DeepEqual(unsortedVersions, expected) { + t.Errorf("expected %#v\ngot %#v", expected, unsortedVersions) + } } diff --git a/cmd/libs/go2idl/client-gen/types/types.go b/cmd/libs/go2idl/client-gen/types/types.go new file mode 100644 index 00000000000..5c515bbd5d4 --- /dev/null +++ b/cmd/libs/go2idl/client-gen/types/types.go @@ -0,0 +1,64 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package types + +type Version string + +func (v Version) String() string { + return string(v) +} + +func (v Version) NonEmpty() string { + if v == "" { + return "internalVersion" + } + return v.String() +} + +type Group string + +func (g Group) String() string { + return string(g) +} + +func (g Group) NonEmpty() string { + if g == "api" { + return "core" + } + return string(g) +} + +type GroupVersion struct { + Group Group + Version Version +} + +type GroupVersions struct { + Group Group + Versions []Version +} + +// GroupVersionPackage contains group name, version name, and the package name client-gen will generate for this group version. +type GroupVersionPackage struct { + Group Group + Version Version + // If a user calls a group client without specifying the version (e.g., + // c.Core(), instead of c.CoreV1()), the default version will be returned. + IsDefaultVersion bool + GroupVersion string + PackageName string +} diff --git a/examples/apiserver/apiserver.go b/examples/apiserver/apiserver.go index 2c6ce7ac3ac..d1ff0d80b7b 100644 --- a/examples/apiserver/apiserver.go +++ b/examples/apiserver/apiserver.go @@ -20,7 +20,7 @@ import ( "fmt" "net" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1" + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1" testgroupetcd "k8s.io/kubernetes/examples/apiserver/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/storage/storagebackend" // Install the testgroup API - _ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install" + _ "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/install" ) const ( diff --git a/examples/apiserver/rest/reststorage.go b/examples/apiserver/rest/reststorage.go index 1809fc91c4a..f2a7bd855bd 100644 --- a/examples/apiserver/rest/reststorage.go +++ b/examples/apiserver/rest/reststorage.go @@ -19,7 +19,7 @@ package rest import ( "fmt" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io" + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/federation/client/clientset_generated/federation_internalclientset/BUILD b/federation/client/clientset_generated/federation_internalclientset/BUILD index d5321fba27a..8134f2827e4 100644 --- a/federation/client/clientset_generated/federation_internalclientset/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/BUILD @@ -20,9 +20,9 @@ go_library( tags = ["automanaged"], deps = [ "//federation/apis/federation/install:go_default_library", - "//federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned:go_default_library", - "//federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned:go_default_library", - "//federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/util/flowcontrol:go_default_library", diff --git a/federation/client/clientset_generated/federation_internalclientset/clientset.go b/federation/client/clientset_generated/federation_internalclientset/clientset.go index f33fd27741f..021501d7c40 100644 --- a/federation/client/clientset_generated/federation_internalclientset/clientset.go +++ b/federation/client/clientset_generated/federation_internalclientset/clientset.go @@ -18,9 +18,9 @@ package federation_internalclientset import ( "github.com/golang/glog" - unversionedcore "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned" - unversionedextensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned" - unversionedfederation "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned" + internalversioncore "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion" + internalversionextensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion" + internalversionfederation "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" "k8s.io/kubernetes/pkg/util/flowcontrol" @@ -29,30 +29,24 @@ import ( type Interface interface { Discovery() discovery.DiscoveryInterface - Federation() unversionedfederation.FederationInterface - Core() unversionedcore.CoreInterface - Extensions() unversionedextensions.ExtensionsInterface + Core() internalversioncore.CoreInterface + + Extensions() internalversionextensions.ExtensionsInterface + + Federation() internalversionfederation.FederationInterface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *unversionedfederation.FederationClient - *unversionedcore.CoreClient - *unversionedextensions.ExtensionsClient -} - -// Federation retrieves the FederationClient -func (c *Clientset) Federation() unversionedfederation.FederationInterface { - if c == nil { - return nil - } - return c.FederationClient + *internalversioncore.CoreClient + *internalversionextensions.ExtensionsClient + *internalversionfederation.FederationClient } // Core retrieves the CoreClient -func (c *Clientset) Core() unversionedcore.CoreInterface { +func (c *Clientset) Core() internalversioncore.CoreInterface { if c == nil { return nil } @@ -60,13 +54,21 @@ func (c *Clientset) Core() unversionedcore.CoreInterface { } // Extensions retrieves the ExtensionsClient -func (c *Clientset) Extensions() unversionedextensions.ExtensionsInterface { +func (c *Clientset) Extensions() internalversionextensions.ExtensionsInterface { if c == nil { return nil } return c.ExtensionsClient } +// Federation retrieves the FederationClient +func (c *Clientset) Federation() internalversionfederation.FederationInterface { + if c == nil { + return nil + } + return c.FederationClient +} + // Discovery retrieves the DiscoveryClient func (c *Clientset) Discovery() discovery.DiscoveryInterface { return c.DiscoveryClient @@ -80,15 +82,15 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { } var clientset Clientset var err error - clientset.FederationClient, err = unversionedfederation.NewForConfig(&configShallowCopy) + clientset.CoreClient, err = internalversioncore.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.CoreClient, err = unversionedcore.NewForConfig(&configShallowCopy) + clientset.ExtensionsClient, err = internalversionextensions.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.ExtensionsClient, err = unversionedextensions.NewForConfig(&configShallowCopy) + clientset.FederationClient, err = internalversionfederation.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -105,9 +107,9 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *restclient.Config) *Clientset { var clientset Clientset - clientset.FederationClient = unversionedfederation.NewForConfigOrDie(c) - clientset.CoreClient = unversionedcore.NewForConfigOrDie(c) - clientset.ExtensionsClient = unversionedextensions.NewForConfigOrDie(c) + clientset.CoreClient = internalversioncore.NewForConfigOrDie(c) + clientset.ExtensionsClient = internalversionextensions.NewForConfigOrDie(c) + clientset.FederationClient = internalversionfederation.NewForConfigOrDie(c) clientset.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &clientset @@ -116,9 +118,9 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c restclient.Interface) *Clientset { var clientset Clientset - clientset.FederationClient = unversionedfederation.New(c) - clientset.CoreClient = unversionedcore.New(c) - clientset.ExtensionsClient = unversionedextensions.New(c) + clientset.CoreClient = internalversioncore.New(c) + clientset.ExtensionsClient = internalversionextensions.New(c) + clientset.FederationClient = internalversionfederation.New(c) clientset.DiscoveryClient = discovery.NewDiscoveryClient(c) return &clientset diff --git a/federation/client/clientset_generated/federation_internalclientset/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/fake/BUILD index 9828b4d073c..38291541cdf 100644 --- a/federation/client/clientset_generated/federation_internalclientset/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/fake/BUILD @@ -19,12 +19,12 @@ go_library( tags = ["automanaged"], deps = [ "//federation/client/clientset_generated/federation_internalclientset:go_default_library", - "//federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned:go_default_library", - "//federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake:go_default_library", - "//federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned:go_default_library", - "//federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake:go_default_library", - "//federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned:go_default_library", - "//federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake:go_default_library", "//pkg/api:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go b/federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go index 3f5aebc3e9a..110fd4e55a6 100644 --- a/federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go +++ b/federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go @@ -18,12 +18,12 @@ package fake import ( clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset" - unversionedcore "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned" - fakeunversionedcore "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake" - unversionedextensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned" - fakeunversionedextensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake" - unversionedfederation "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned" - fakeunversionedfederation "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake" + internalversioncore "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion" + fakeinternalversioncore "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake" + internalversionextensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion" + fakeinternalversionextensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake" + internalversionfederation "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion" + fakeinternalversionfederation "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/testing/core" @@ -66,17 +66,17 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} -// Federation retrieves the FederationClient -func (c *Clientset) Federation() unversionedfederation.FederationInterface { - return &fakeunversionedfederation.FakeFederation{Fake: &c.Fake} -} - // Core retrieves the CoreClient -func (c *Clientset) Core() unversionedcore.CoreInterface { - return &fakeunversionedcore.FakeCore{Fake: &c.Fake} +func (c *Clientset) Core() internalversioncore.CoreInterface { + return &fakeinternalversioncore.FakeCore{Fake: &c.Fake} } // Extensions retrieves the ExtensionsClient -func (c *Clientset) Extensions() unversionedextensions.ExtensionsInterface { - return &fakeunversionedextensions.FakeExtensions{Fake: &c.Fake} +func (c *Clientset) Extensions() internalversionextensions.ExtensionsInterface { + return &fakeinternalversionextensions.FakeExtensions{Fake: &c.Fake} +} + +// Federation retrieves the FederationClient +func (c *Clientset) Federation() internalversionfederation.FederationInterface { + return &fakeinternalversionfederation.FakeFederation{Fake: &c.Fake} } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/BUILD rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/configmap.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go similarity index 99% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/configmap.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go index 0f8352b5c90..0956777bb7a 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/configmap.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/core_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go similarity index 97% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/core_client.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go index 37e4fe7e577..d5c79fe56a4 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/core_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -31,7 +31,7 @@ type CoreInterface interface { ServicesGetter } -// CoreClient is used to interact with features provided by the Core group. +// CoreClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type CoreClient struct { restClient restclient.Interface } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/doc.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/doc.go similarity index 97% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/doc.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/doc.go index 239d79b62aa..26c978f7d5d 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/doc.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/doc.go @@ -17,4 +17,4 @@ limitations under the License. // This package is generated by client-gen with arguments: --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/Service,api/Namespace,extensions/ReplicaSet,api/Secret,extensions/Ingress,extensions/Deployment,extensions/DaemonSet,api/ConfigMap,api/Event] --input=[../../federation/apis/federation/,api/,extensions/] // This package has the automatically generated typed clients. -package unversioned +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/event.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/event.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go index dbf92eec99f..8667ac4688b 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/event.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/BUILD similarity index 93% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/BUILD rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/BUILD index a93365f9120..8c43a6f50e7 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/BUILD @@ -24,7 +24,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion:go_default_library", "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/client/restclient:go_default_library", diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/doc.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/doc.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/doc.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/doc.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_configmap.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_configmap.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_configmap.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_configmap.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_core_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_core_client.go similarity index 68% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_core_client.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_core_client.go index cceb505a831..5ac975a8e95 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_core_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_core_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned" + internalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,23 +26,23 @@ type FakeCore struct { *core.Fake } -func (c *FakeCore) ConfigMaps(namespace string) unversioned.ConfigMapInterface { +func (c *FakeCore) ConfigMaps(namespace string) internalversion.ConfigMapInterface { return &FakeConfigMaps{c, namespace} } -func (c *FakeCore) Events(namespace string) unversioned.EventInterface { +func (c *FakeCore) Events(namespace string) internalversion.EventInterface { return &FakeEvents{c, namespace} } -func (c *FakeCore) Namespaces() unversioned.NamespaceInterface { +func (c *FakeCore) Namespaces() internalversion.NamespaceInterface { return &FakeNamespaces{c} } -func (c *FakeCore) Secrets(namespace string) unversioned.SecretInterface { +func (c *FakeCore) Secrets(namespace string) internalversion.SecretInterface { return &FakeSecrets{c, namespace} } -func (c *FakeCore) Services(namespace string) unversioned.ServiceInterface { +func (c *FakeCore) Services(namespace string) internalversion.ServiceInterface { return &FakeServices{c, namespace} } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_event.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_event.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_event.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_event.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_namespace.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_namespace.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_namespace_expansion.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace_expansion.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_namespace_expansion.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_namespace_expansion.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_secret.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_secret.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_secret.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_secret.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_service.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_service.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/fake/fake_service.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake/fake_service.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/generated_expansion.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/generated_expansion.go similarity index 96% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/generated_expansion.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/generated_expansion.go index ba35b5d6286..335a9f8a4be 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/generated_expansion.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/generated_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion type ConfigMapExpansion interface{} diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/namespace.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go similarity index 99% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/namespace.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go index fb75e5e7b2d..b94a2aa27f3 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/namespace.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/namespace_expansion.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace_expansion.go similarity index 98% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/namespace_expansion.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace_expansion.go index 15049da11fa..456de1cdfcd 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/namespace_expansion.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/secret.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/secret.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go index a937f8f4b75..6fb40f5a6ed 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/secret.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/service.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go similarity index 99% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/service.go rename to federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go index 97680b33202..2e912e4b1d7 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/service.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/BUILD rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/daemonset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/daemonset.go rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go index 75ba112abbe..c219deddb97 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/daemonset.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/deployment.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/deployment.go rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go index f008b338011..7da091b6c24 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/deployment.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/doc.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/doc.go similarity index 97% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/doc.go rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/doc.go index 239d79b62aa..26c978f7d5d 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/doc.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/doc.go @@ -17,4 +17,4 @@ limitations under the License. // This package is generated by client-gen with arguments: --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/Service,api/Namespace,extensions/ReplicaSet,api/Secret,extensions/Ingress,extensions/Deployment,extensions/DaemonSet,api/ConfigMap,api/Event] --input=[../../federation/apis/federation/,api/,extensions/] // This package has the automatically generated typed clients. -package unversioned +package internalversion diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/extensions_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go similarity index 97% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/extensions_client.go rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go index 589569be30a..ba916199efb 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/extensions_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -30,7 +30,7 @@ type ExtensionsInterface interface { ReplicaSetsGetter } -// ExtensionsClient is used to interact with features provided by the Extensions group. +// ExtensionsClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type ExtensionsClient struct { restClient restclient.Interface } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/BUILD similarity index 92% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/BUILD rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/BUILD index 46e82634593..6a651e3b869 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/BUILD @@ -22,7 +22,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/doc.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/doc.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/doc.go rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/doc.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_daemonset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_daemonset.go rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_deployment.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_deployment.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_deployment.go rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_deployment.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go similarity index 69% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go index 6ed05f50211..098b0c0abb5 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned" + internalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,19 +26,19 @@ type FakeExtensions struct { *core.Fake } -func (c *FakeExtensions) DaemonSets(namespace string) unversioned.DaemonSetInterface { +func (c *FakeExtensions) DaemonSets(namespace string) internalversion.DaemonSetInterface { return &FakeDaemonSets{c, namespace} } -func (c *FakeExtensions) Deployments(namespace string) unversioned.DeploymentInterface { +func (c *FakeExtensions) Deployments(namespace string) internalversion.DeploymentInterface { return &FakeDeployments{c, namespace} } -func (c *FakeExtensions) Ingresses(namespace string) unversioned.IngressInterface { +func (c *FakeExtensions) Ingresses(namespace string) internalversion.IngressInterface { return &FakeIngresses{c, namespace} } -func (c *FakeExtensions) ReplicaSets(namespace string) unversioned.ReplicaSetInterface { +func (c *FakeExtensions) ReplicaSets(namespace string) internalversion.ReplicaSetInterface { return &FakeReplicaSets{c, namespace} } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_ingress.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_ingress.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_ingress.go rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_ingress.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_replicaset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/fake/fake_replicaset.go rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/generated_expansion.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/generated_expansion.go similarity index 96% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/generated_expansion.go rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/generated_expansion.go index 67a8c96687d..c68ea50b496 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/generated_expansion.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/generated_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion type DaemonSetExpansion interface{} diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/ingress.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/ingress.go rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go index 0fdfc118b8f..2b031e9ae24 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/ingress.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/replicaset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go similarity index 99% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/replicaset.go rename to federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go index 804f2d7f2a2..02d386574b7 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/replicaset.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/BUILD rename to federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/cluster.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go similarity index 99% rename from federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/cluster.go rename to federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go index 7a3cc4d2cdc..8777e3a0a10 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/cluster.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( federation "k8s.io/kubernetes/federation/apis/federation" diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/doc.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/doc.go similarity index 97% rename from federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/doc.go rename to federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/doc.go index 239d79b62aa..26c978f7d5d 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/doc.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/doc.go @@ -17,4 +17,4 @@ limitations under the License. // This package is generated by client-gen with arguments: --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --included-types-overrides=[api/Service,api/Namespace,extensions/ReplicaSet,api/Secret,extensions/Ingress,extensions/Deployment,extensions/DaemonSet,api/ConfigMap,api/Event] --input=[../../federation/apis/federation/,api/,extensions/] // This package has the automatically generated typed clients. -package unversioned +package internalversion diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/BUILD similarity index 92% rename from federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/BUILD rename to federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/BUILD index cb8c051c16b..216f70ca6b8 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/BUILD @@ -20,7 +20,7 @@ go_library( tags = ["automanaged"], deps = [ "//federation/apis/federation:go_default_library", - "//federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion:go_default_library", "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/client/restclient:go_default_library", diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/doc.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/doc.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/doc.go rename to federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/doc.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/fake_cluster.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_cluster.go similarity index 100% rename from federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/fake_cluster.go rename to federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_cluster.go diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/fake_federation_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_federation_client.go similarity index 82% rename from federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/fake_federation_client.go rename to federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_federation_client.go index 958b904bb11..c839f833558 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/fake/fake_federation_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake/fake_federation_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned" + internalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,7 +26,7 @@ type FakeFederation struct { *core.Fake } -func (c *FakeFederation) Clusters() unversioned.ClusterInterface { +func (c *FakeFederation) Clusters() internalversion.ClusterInterface { return &FakeClusters{c} } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/federation_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go similarity index 96% rename from federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/federation_client.go rename to federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go index ca8a97a1d38..5e9816df2b2 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/federation_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -27,7 +27,7 @@ type FederationInterface interface { ClustersGetter } -// FederationClient is used to interact with features provided by the Federation group. +// FederationClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type FederationClient struct { restClient restclient.Interface } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/generated_expansion.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/generated_expansion.go similarity index 96% rename from federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/generated_expansion.go rename to federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/generated_expansion.go index 13903a4cd7d..d18a8dda92f 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/generated_expansion.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/generated_expansion.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion type ClusterExpansion interface{} diff --git a/federation/client/clientset_generated/federation_release_1_3/clientset.go b/federation/client/clientset_generated/federation_release_1_3/clientset.go index c4c3202340c..f62d09894fd 100644 --- a/federation/client/clientset_generated/federation_release_1_3/clientset.go +++ b/federation/client/clientset_generated/federation_release_1_3/clientset.go @@ -36,7 +36,7 @@ type Interface interface { type Clientset struct { *discovery.DiscoveryClient *v1beta1federation.FederationClient - *v1core.CoreClient + *v1core.CoreUnversionedClient } // Federation retrieves the FederationClient @@ -47,12 +47,12 @@ func (c *Clientset) Federation() v1beta1federation.FederationInterface { return c.FederationClient } -// Core retrieves the CoreClient +// Core retrieves the CoreUnversionedClient func (c *Clientset) Core() v1core.CoreInterface { if c == nil { return nil } - return c.CoreClient + return c.CoreUnversionedClient } // Discovery retrieves the DiscoveryClient @@ -72,7 +72,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { if err != nil { return nil, err } - clientset.CoreClient, err = v1core.NewForConfig(&configShallowCopy) + clientset.CoreUnversionedClient, err = v1core.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -90,7 +90,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { func NewForConfigOrDie(c *restclient.Config) *Clientset { var clientset Clientset clientset.FederationClient = v1beta1federation.NewForConfigOrDie(c) - clientset.CoreClient = v1core.NewForConfigOrDie(c) + clientset.CoreUnversionedClient = v1core.NewForConfigOrDie(c) clientset.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &clientset @@ -100,7 +100,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { func New(c *restclient.RESTClient) *Clientset { var clientset Clientset clientset.FederationClient = v1beta1federation.New(c) - clientset.CoreClient = v1core.New(c) + clientset.CoreUnversionedClient = v1core.New(c) clientset.DiscoveryClient = discovery.NewDiscoveryClient(c) return &clientset diff --git a/federation/client/clientset_generated/federation_release_1_3/fake/clientset_generated.go b/federation/client/clientset_generated/federation_release_1_3/fake/clientset_generated.go index c5bb857c8a3..a9ac40d6987 100644 --- a/federation/client/clientset_generated/federation_release_1_3/fake/clientset_generated.go +++ b/federation/client/clientset_generated/federation_release_1_3/fake/clientset_generated.go @@ -69,7 +69,7 @@ func (c *Clientset) Federation() v1beta1federation.FederationInterface { return &fakev1beta1federation.FakeFederation{Fake: &c.Fake} } -// Core retrieves the CoreClient +// Core retrieves the CoreUnversionedClient func (c *Clientset) Core() v1core.CoreInterface { return &fakev1core.FakeCore{Fake: &c.Fake} } diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/core_client.go b/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/core_client.go index 6ca07bbd4c8..1cb50a84b2d 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/core_client.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/core_client.go @@ -28,17 +28,17 @@ type CoreInterface interface { ServicesGetter } -// CoreClient is used to interact with features provided by the Core group. -type CoreClient struct { +// CoreUnversionedClient is used to interact with features provided by the Core group. +type CoreUnversionedClient struct { *restclient.RESTClient } -func (c *CoreClient) Services(namespace string) ServiceInterface { +func (c *CoreUnversionedClient) Services(namespace string) ServiceInterface { return newServices(c, namespace) } -// NewForConfig creates a new CoreClient for the given config. -func NewForConfig(c *restclient.Config) (*CoreClient, error) { +// NewForConfig creates a new CoreUnversionedClient for the given config. +func NewForConfig(c *restclient.Config) (*CoreUnversionedClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -47,12 +47,12 @@ func NewForConfig(c *restclient.Config) (*CoreClient, error) { if err != nil { return nil, err } - return &CoreClient{client}, nil + return &CoreUnversionedClient{client}, nil } -// NewForConfigOrDie creates a new CoreClient for the given config and +// NewForConfigOrDie creates a new CoreUnversionedClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *CoreClient { +func NewForConfigOrDie(c *restclient.Config) *CoreUnversionedClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -60,9 +60,9 @@ func NewForConfigOrDie(c *restclient.Config) *CoreClient { return client } -// New creates a new CoreClient for the given RESTClient. -func New(c *restclient.RESTClient) *CoreClient { - return &CoreClient{c} +// New creates a new CoreUnversionedClient for the given RESTClient. +func New(c *restclient.RESTClient) *CoreUnversionedClient { + return &CoreUnversionedClient{c} } func setConfigDefaults(config *restclient.Config) error { @@ -88,7 +88,7 @@ func setConfigDefaults(config *restclient.Config) error { // GetRESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CoreClient) GetRESTClient() *restclient.RESTClient { +func (c *CoreUnversionedClient) GetRESTClient() *restclient.RESTClient { if c == nil { return nil } diff --git a/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/service.go b/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/service.go index 5c3bf4223c5..7c9d2710f2e 100644 --- a/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/service.go +++ b/federation/client/clientset_generated/federation_release_1_3/typed/core/v1/service.go @@ -44,12 +44,12 @@ type ServiceInterface interface { // services implements ServiceInterface type services struct { - client *CoreClient + client *CoreUnversionedClient ns string } // newServices returns a Services -func newServices(c *CoreClient, namespace string) *services { +func newServices(c *CoreUnversionedClient, namespace string) *services { return &services{ client: c, ns: namespace, diff --git a/federation/client/clientset_generated/federation_release_1_4/clientset.go b/federation/client/clientset_generated/federation_release_1_4/clientset.go index 209d9274acf..cf6a7117234 100644 --- a/federation/client/clientset_generated/federation_release_1_4/clientset.go +++ b/federation/client/clientset_generated/federation_release_1_4/clientset.go @@ -38,7 +38,7 @@ type Interface interface { type Clientset struct { *discovery.DiscoveryClient *v1beta1federation.FederationClient - *v1core.CoreClient + *v1core.CoreUnversionedClient *v1beta1extensions.ExtensionsClient } @@ -50,12 +50,12 @@ func (c *Clientset) Federation() v1beta1federation.FederationInterface { return c.FederationClient } -// Core retrieves the CoreClient +// Core retrieves the CoreUnversionedClient func (c *Clientset) Core() v1core.CoreInterface { if c == nil { return nil } - return c.CoreClient + return c.CoreUnversionedClient } // Extensions retrieves the ExtensionsClient @@ -83,7 +83,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { if err != nil { return nil, err } - clientset.CoreClient, err = v1core.NewForConfig(&configShallowCopy) + clientset.CoreUnversionedClient, err = v1core.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -105,7 +105,7 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { func NewForConfigOrDie(c *restclient.Config) *Clientset { var clientset Clientset clientset.FederationClient = v1beta1federation.NewForConfigOrDie(c) - clientset.CoreClient = v1core.NewForConfigOrDie(c) + clientset.CoreUnversionedClient = v1core.NewForConfigOrDie(c) clientset.ExtensionsClient = v1beta1extensions.NewForConfigOrDie(c) clientset.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) @@ -116,7 +116,7 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { func New(c *restclient.RESTClient) *Clientset { var clientset Clientset clientset.FederationClient = v1beta1federation.New(c) - clientset.CoreClient = v1core.New(c) + clientset.CoreUnversionedClient = v1core.New(c) clientset.ExtensionsClient = v1beta1extensions.New(c) clientset.DiscoveryClient = discovery.NewDiscoveryClient(c) diff --git a/federation/client/clientset_generated/federation_release_1_4/fake/clientset_generated.go b/federation/client/clientset_generated/federation_release_1_4/fake/clientset_generated.go index da690f7bb39..a8914c58096 100644 --- a/federation/client/clientset_generated/federation_release_1_4/fake/clientset_generated.go +++ b/federation/client/clientset_generated/federation_release_1_4/fake/clientset_generated.go @@ -71,7 +71,7 @@ func (c *Clientset) Federation() v1beta1federation.FederationInterface { return &fakev1beta1federation.FakeFederation{Fake: &c.Fake} } -// Core retrieves the CoreClient +// Core retrieves the CoreUnversionedClient func (c *Clientset) Core() v1core.CoreInterface { return &fakev1core.FakeCore{Fake: &c.Fake} } diff --git a/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/core_client.go b/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/core_client.go index 3ce0cc8f35e..273f98abe98 100644 --- a/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/core_client.go +++ b/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/core_client.go @@ -31,29 +31,29 @@ type CoreInterface interface { ServicesGetter } -// CoreClient is used to interact with features provided by the Core group. -type CoreClient struct { +// CoreUnversionedClient is used to interact with features provided by the Core group. +type CoreUnversionedClient struct { *restclient.RESTClient } -func (c *CoreClient) Events(namespace string) EventInterface { +func (c *CoreUnversionedClient) Events(namespace string) EventInterface { return newEvents(c, namespace) } -func (c *CoreClient) Namespaces() NamespaceInterface { +func (c *CoreUnversionedClient) Namespaces() NamespaceInterface { return newNamespaces(c) } -func (c *CoreClient) Secrets(namespace string) SecretInterface { +func (c *CoreUnversionedClient) Secrets(namespace string) SecretInterface { return newSecrets(c, namespace) } -func (c *CoreClient) Services(namespace string) ServiceInterface { +func (c *CoreUnversionedClient) Services(namespace string) ServiceInterface { return newServices(c, namespace) } -// NewForConfig creates a new CoreClient for the given config. -func NewForConfig(c *restclient.Config) (*CoreClient, error) { +// NewForConfig creates a new CoreUnversionedClient for the given config. +func NewForConfig(c *restclient.Config) (*CoreUnversionedClient, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -62,12 +62,12 @@ func NewForConfig(c *restclient.Config) (*CoreClient, error) { if err != nil { return nil, err } - return &CoreClient{client}, nil + return &CoreUnversionedClient{client}, nil } -// NewForConfigOrDie creates a new CoreClient for the given config and +// NewForConfigOrDie creates a new CoreUnversionedClient for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *CoreClient { +func NewForConfigOrDie(c *restclient.Config) *CoreUnversionedClient { client, err := NewForConfig(c) if err != nil { panic(err) @@ -75,9 +75,9 @@ func NewForConfigOrDie(c *restclient.Config) *CoreClient { return client } -// New creates a new CoreClient for the given RESTClient. -func New(c *restclient.RESTClient) *CoreClient { - return &CoreClient{c} +// New creates a new CoreUnversionedClient for the given RESTClient. +func New(c *restclient.RESTClient) *CoreUnversionedClient { + return &CoreUnversionedClient{c} } func setConfigDefaults(config *restclient.Config) error { @@ -103,7 +103,7 @@ func setConfigDefaults(config *restclient.Config) error { // GetRESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CoreClient) GetRESTClient() *restclient.RESTClient { +func (c *CoreUnversionedClient) GetRESTClient() *restclient.RESTClient { if c == nil { return nil } diff --git a/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/event.go b/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/event.go index da1de00ac06..4ef8131b70e 100644 --- a/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/event.go +++ b/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/event.go @@ -43,12 +43,12 @@ type EventInterface interface { // events implements EventInterface type events struct { - client *CoreClient + client *CoreUnversionedClient ns string } // newEvents returns a Events -func newEvents(c *CoreClient, namespace string) *events { +func newEvents(c *CoreUnversionedClient, namespace string) *events { return &events{ client: c, ns: namespace, diff --git a/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/namespace.go b/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/namespace.go index 174e4e29f6e..bbcc2bcced0 100644 --- a/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/namespace.go +++ b/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/namespace.go @@ -44,11 +44,11 @@ type NamespaceInterface interface { // namespaces implements NamespaceInterface type namespaces struct { - client *CoreClient + client *CoreUnversionedClient } // newNamespaces returns a Namespaces -func newNamespaces(c *CoreClient) *namespaces { +func newNamespaces(c *CoreUnversionedClient) *namespaces { return &namespaces{ client: c, } diff --git a/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/secret.go b/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/secret.go index 4ecb29e909c..db3dc28e299 100644 --- a/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/secret.go +++ b/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/secret.go @@ -43,12 +43,12 @@ type SecretInterface interface { // secrets implements SecretInterface type secrets struct { - client *CoreClient + client *CoreUnversionedClient ns string } // newSecrets returns a Secrets -func newSecrets(c *CoreClient, namespace string) *secrets { +func newSecrets(c *CoreUnversionedClient, namespace string) *secrets { return &secrets{ client: c, ns: namespace, diff --git a/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/service.go b/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/service.go index 80fe4d72c2f..a44b157ebb6 100644 --- a/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/service.go +++ b/federation/client/clientset_generated/federation_release_1_4/typed/core/v1/service.go @@ -44,12 +44,12 @@ type ServiceInterface interface { // services implements ServiceInterface type services struct { - client *CoreClient + client *CoreUnversionedClient ns string } // newServices returns a Services -func newServices(c *CoreClient, namespace string) *services { +func newServices(c *CoreUnversionedClient, namespace string) *services { return &services{ client: c, ns: namespace, diff --git a/federation/client/clientset_generated/federation_release_1_5/clientset.go b/federation/client/clientset_generated/federation_release_1_5/clientset.go index d389ea266ae..ffe87a7bbf0 100644 --- a/federation/client/clientset_generated/federation_release_1_5/clientset.go +++ b/federation/client/clientset_generated/federation_release_1_5/clientset.go @@ -29,42 +29,75 @@ import ( type Interface interface { Discovery() discovery.DiscoveryInterface - Federation() v1beta1federation.FederationInterface - Core() v1core.CoreInterface - Extensions() v1beta1extensions.ExtensionsInterface + CoreV1() v1core.CoreV1Interface + // Deprecated: please explicitly pick a version if possible. + Core() v1core.CoreV1Interface + ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Interface + // Deprecated: please explicitly pick a version if possible. + Extensions() v1beta1extensions.ExtensionsV1beta1Interface + FederationV1beta1() v1beta1federation.FederationV1beta1Interface + // Deprecated: please explicitly pick a version if possible. + Federation() v1beta1federation.FederationV1beta1Interface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *v1beta1federation.FederationClient - *v1core.CoreClient - *v1beta1extensions.ExtensionsClient + *v1core.CoreV1Client + *v1beta1extensions.ExtensionsV1beta1Client + *v1beta1federation.FederationV1beta1Client } -// Federation retrieves the FederationClient -func (c *Clientset) Federation() v1beta1federation.FederationInterface { +// CoreV1 retrieves the CoreV1Client +func (c *Clientset) CoreV1() v1core.CoreV1Interface { if c == nil { return nil } - return c.FederationClient + return c.CoreV1Client } -// Core retrieves the CoreClient -func (c *Clientset) Core() v1core.CoreInterface { +// Deprecated: Core retrieves the default version of CoreClient. +// Please explicitly pick a version. +func (c *Clientset) Core() v1core.CoreV1Interface { if c == nil { return nil } - return c.CoreClient + return c.CoreV1Client } -// Extensions retrieves the ExtensionsClient -func (c *Clientset) Extensions() v1beta1extensions.ExtensionsInterface { +// ExtensionsV1beta1 retrieves the ExtensionsV1beta1Client +func (c *Clientset) ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Interface { if c == nil { return nil } - return c.ExtensionsClient + return c.ExtensionsV1beta1Client +} + +// Deprecated: Extensions retrieves the default version of ExtensionsClient. +// Please explicitly pick a version. +func (c *Clientset) Extensions() v1beta1extensions.ExtensionsV1beta1Interface { + if c == nil { + return nil + } + return c.ExtensionsV1beta1Client +} + +// FederationV1beta1 retrieves the FederationV1beta1Client +func (c *Clientset) FederationV1beta1() v1beta1federation.FederationV1beta1Interface { + if c == nil { + return nil + } + return c.FederationV1beta1Client +} + +// Deprecated: Federation retrieves the default version of FederationClient. +// Please explicitly pick a version. +func (c *Clientset) Federation() v1beta1federation.FederationV1beta1Interface { + if c == nil { + return nil + } + return c.FederationV1beta1Client } // Discovery retrieves the DiscoveryClient @@ -80,15 +113,15 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { } var clientset Clientset var err error - clientset.FederationClient, err = v1beta1federation.NewForConfig(&configShallowCopy) + clientset.CoreV1Client, err = v1core.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.CoreClient, err = v1core.NewForConfig(&configShallowCopy) + clientset.ExtensionsV1beta1Client, err = v1beta1extensions.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.ExtensionsClient, err = v1beta1extensions.NewForConfig(&configShallowCopy) + clientset.FederationV1beta1Client, err = v1beta1federation.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -105,9 +138,9 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *restclient.Config) *Clientset { var clientset Clientset - clientset.FederationClient = v1beta1federation.NewForConfigOrDie(c) - clientset.CoreClient = v1core.NewForConfigOrDie(c) - clientset.ExtensionsClient = v1beta1extensions.NewForConfigOrDie(c) + clientset.CoreV1Client = v1core.NewForConfigOrDie(c) + clientset.ExtensionsV1beta1Client = v1beta1extensions.NewForConfigOrDie(c) + clientset.FederationV1beta1Client = v1beta1federation.NewForConfigOrDie(c) clientset.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &clientset @@ -116,9 +149,9 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c restclient.Interface) *Clientset { var clientset Clientset - clientset.FederationClient = v1beta1federation.New(c) - clientset.CoreClient = v1core.New(c) - clientset.ExtensionsClient = v1beta1extensions.New(c) + clientset.CoreV1Client = v1core.New(c) + clientset.ExtensionsV1beta1Client = v1beta1extensions.New(c) + clientset.FederationV1beta1Client = v1beta1federation.New(c) clientset.DiscoveryClient = discovery.NewDiscoveryClient(c) return &clientset diff --git a/federation/client/clientset_generated/federation_release_1_5/fake/clientset_generated.go b/federation/client/clientset_generated/federation_release_1_5/fake/clientset_generated.go index 1f3b886da97..24b23ebdf3e 100644 --- a/federation/client/clientset_generated/federation_release_1_5/fake/clientset_generated.go +++ b/federation/client/clientset_generated/federation_release_1_5/fake/clientset_generated.go @@ -66,17 +66,32 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} -// Federation retrieves the FederationClient -func (c *Clientset) Federation() v1beta1federation.FederationInterface { - return &fakev1beta1federation.FakeFederation{Fake: &c.Fake} +// CoreV1 retrieves the CoreV1Client +func (c *Clientset) CoreV1() v1core.CoreV1Interface { + return &fakev1core.FakeCoreV1{Fake: &c.Fake} } -// Core retrieves the CoreClient -func (c *Clientset) Core() v1core.CoreInterface { - return &fakev1core.FakeCore{Fake: &c.Fake} +// Core retrieves the CoreV1Client +func (c *Clientset) Core() v1core.CoreV1Interface { + return &fakev1core.FakeCoreV1{Fake: &c.Fake} } -// Extensions retrieves the ExtensionsClient -func (c *Clientset) Extensions() v1beta1extensions.ExtensionsInterface { - return &fakev1beta1extensions.FakeExtensions{Fake: &c.Fake} +// ExtensionsV1beta1 retrieves the ExtensionsV1beta1Client +func (c *Clientset) ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Interface { + return &fakev1beta1extensions.FakeExtensionsV1beta1{Fake: &c.Fake} +} + +// Extensions retrieves the ExtensionsV1beta1Client +func (c *Clientset) Extensions() v1beta1extensions.ExtensionsV1beta1Interface { + return &fakev1beta1extensions.FakeExtensionsV1beta1{Fake: &c.Fake} +} + +// FederationV1beta1 retrieves the FederationV1beta1Client +func (c *Clientset) FederationV1beta1() v1beta1federation.FederationV1beta1Interface { + return &fakev1beta1federation.FakeFederationV1beta1{Fake: &c.Fake} +} + +// Federation retrieves the FederationV1beta1Client +func (c *Clientset) Federation() v1beta1federation.FederationV1beta1Interface { + return &fakev1beta1federation.FakeFederationV1beta1{Fake: &c.Fake} } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/BUILD b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/BUILD index 861912cfbfd..84cbe620efd 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/BUILD +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/BUILD @@ -26,6 +26,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/client/restclient:go_default_library", diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/configmap.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/configmap.go index 74831c42f99..942202e4255 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/configmap.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/configmap.go @@ -49,7 +49,7 @@ type configMaps struct { } // newConfigMaps returns a ConfigMaps -func newConfigMaps(c *CoreClient, namespace string) *configMaps { +func newConfigMaps(c *CoreV1Client, namespace string) *configMaps { return &configMaps{ client: c.RESTClient(), ns: namespace, diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/core_client.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/core_client.go index 323fe8dc1fc..97e18e77a73 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/core_client.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/core_client.go @@ -17,13 +17,15 @@ limitations under the License. package v1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type CoreInterface interface { +type CoreV1Interface interface { RESTClient() restclient.Interface ConfigMapsGetter EventsGetter @@ -32,33 +34,33 @@ type CoreInterface interface { ServicesGetter } -// CoreClient is used to interact with features provided by the Core group. -type CoreClient struct { +// CoreV1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type CoreV1Client struct { restClient restclient.Interface } -func (c *CoreClient) ConfigMaps(namespace string) ConfigMapInterface { +func (c *CoreV1Client) ConfigMaps(namespace string) ConfigMapInterface { return newConfigMaps(c, namespace) } -func (c *CoreClient) Events(namespace string) EventInterface { +func (c *CoreV1Client) Events(namespace string) EventInterface { return newEvents(c, namespace) } -func (c *CoreClient) Namespaces() NamespaceInterface { +func (c *CoreV1Client) Namespaces() NamespaceInterface { return newNamespaces(c) } -func (c *CoreClient) Secrets(namespace string) SecretInterface { +func (c *CoreV1Client) Secrets(namespace string) SecretInterface { return newSecrets(c, namespace) } -func (c *CoreClient) Services(namespace string) ServiceInterface { +func (c *CoreV1Client) Services(namespace string) ServiceInterface { return newServices(c, namespace) } -// NewForConfig creates a new CoreClient for the given config. -func NewForConfig(c *restclient.Config) (*CoreClient, error) { +// NewForConfig creates a new CoreV1Client for the given config. +func NewForConfig(c *restclient.Config) (*CoreV1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -67,12 +69,12 @@ func NewForConfig(c *restclient.Config) (*CoreClient, error) { if err != nil { return nil, err } - return &CoreClient{client}, nil + return &CoreV1Client{client}, nil } -// NewForConfigOrDie creates a new CoreClient for the given config and +// NewForConfigOrDie creates a new CoreV1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *CoreClient { +func NewForConfigOrDie(c *restclient.Config) *CoreV1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -80,26 +82,26 @@ func NewForConfigOrDie(c *restclient.Config) *CoreClient { return client } -// New creates a new CoreClient for the given RESTClient. -func New(c restclient.Interface) *CoreClient { - return &CoreClient{c} +// New creates a new CoreV1Client for the given RESTClient. +func New(c restclient.Interface) *CoreV1Client { + return &CoreV1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if core group is not registered, return an error - g, err := registered.Group("") + gv, err := unversioned.ParseGroupVersion("/v1") if err != nil { return err } + // if /v1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("/v1 is not enabled") + } config.APIPath = "/api" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -108,7 +110,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CoreClient) RESTClient() restclient.Interface { +func (c *CoreV1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go index fc9287bc318..6d553a086dd 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go @@ -49,7 +49,7 @@ type events struct { } // newEvents returns a Events -func newEvents(c *CoreClient, namespace string) *events { +func newEvents(c *CoreV1Client, namespace string) *events { return &events{ client: c.RESTClient(), ns: namespace, diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_configmap.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_configmap.go index bfb64c9d41c..d9ea0c3e5e2 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_configmap.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_configmap.go @@ -27,7 +27,7 @@ import ( // FakeConfigMaps implements ConfigMapInterface type FakeConfigMaps struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_core_client.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_core_client.go index 628a0451cd1..15b74d43afa 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_core_client.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_core_client.go @@ -22,33 +22,33 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakeCore struct { +type FakeCoreV1 struct { *core.Fake } -func (c *FakeCore) ConfigMaps(namespace string) v1.ConfigMapInterface { +func (c *FakeCoreV1) ConfigMaps(namespace string) v1.ConfigMapInterface { return &FakeConfigMaps{c, namespace} } -func (c *FakeCore) Events(namespace string) v1.EventInterface { +func (c *FakeCoreV1) Events(namespace string) v1.EventInterface { return &FakeEvents{c, namespace} } -func (c *FakeCore) Namespaces() v1.NamespaceInterface { +func (c *FakeCoreV1) Namespaces() v1.NamespaceInterface { return &FakeNamespaces{c} } -func (c *FakeCore) Secrets(namespace string) v1.SecretInterface { +func (c *FakeCoreV1) Secrets(namespace string) v1.SecretInterface { return &FakeSecrets{c, namespace} } -func (c *FakeCore) Services(namespace string) v1.ServiceInterface { +func (c *FakeCoreV1) Services(namespace string) v1.ServiceInterface { return &FakeServices{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCore) RESTClient() restclient.Interface { +func (c *FakeCoreV1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_event.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_event.go index 92ebc96652b..6f53ab4a949 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_event.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_event.go @@ -27,7 +27,7 @@ import ( // FakeEvents implements EventInterface type FakeEvents struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace.go index a1ecd209a1e..1b552c340c5 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace.go @@ -27,7 +27,7 @@ import ( // FakeNamespaces implements NamespaceInterface type FakeNamespaces struct { - Fake *FakeCore + Fake *FakeCoreV1 } var namespacesResource = unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "namespaces"} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_secret.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_secret.go index efec61260a9..d70ff878396 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_secret.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_secret.go @@ -27,7 +27,7 @@ import ( // FakeSecrets implements SecretInterface type FakeSecrets struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_service.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_service.go index e40f670a6bd..6893267c835 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_service.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_service.go @@ -27,7 +27,7 @@ import ( // FakeServices implements ServiceInterface type FakeServices struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go index 287a0367191..186799e5be3 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go @@ -49,7 +49,7 @@ type namespaces struct { } // newNamespaces returns a Namespaces -func newNamespaces(c *CoreClient) *namespaces { +func newNamespaces(c *CoreV1Client) *namespaces { return &namespaces{ client: c.RESTClient(), } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go index c0f7095e01b..e8e5c275dbf 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go @@ -49,7 +49,7 @@ type secrets struct { } // newSecrets returns a Secrets -func newSecrets(c *CoreClient, namespace string) *secrets { +func newSecrets(c *CoreV1Client, namespace string) *secrets { return &secrets{ client: c.RESTClient(), ns: namespace, diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go index 4b2fd5bcf68..66ffd66b515 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go @@ -50,7 +50,7 @@ type services struct { } // newServices returns a Services -func newServices(c *CoreClient, namespace string) *services { +func newServices(c *CoreV1Client, namespace string) *services { return &services{ client: c.RESTClient(), ns: namespace, diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/BUILD b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/BUILD index 04a3f46b45d..6fbd1007ac9 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/BUILD +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/BUILD @@ -25,6 +25,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/daemonset.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/daemonset.go index 071e9825349..a1c6f2a2308 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/daemonset.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/daemonset.go @@ -51,7 +51,7 @@ type daemonSets struct { } // newDaemonSets returns a DaemonSets -func newDaemonSets(c *ExtensionsClient, namespace string) *daemonSets { +func newDaemonSets(c *ExtensionsV1beta1Client, namespace string) *daemonSets { return &daemonSets{ client: c.RESTClient(), ns: namespace, diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment.go index d77fa7931e4..6c8ae763b45 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment.go @@ -51,7 +51,7 @@ type deployments struct { } // newDeployments returns a Deployments -func newDeployments(c *ExtensionsClient, namespace string) *deployments { +func newDeployments(c *ExtensionsV1beta1Client, namespace string) *deployments { return &deployments{ client: c.RESTClient(), ns: namespace, diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/extensions_client.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/extensions_client.go index 89ecdc0020e..cfeca4429b9 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/extensions_client.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/extensions_client.go @@ -17,13 +17,15 @@ limitations under the License. package v1beta1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type ExtensionsInterface interface { +type ExtensionsV1beta1Interface interface { RESTClient() restclient.Interface DaemonSetsGetter DeploymentsGetter @@ -31,29 +33,29 @@ type ExtensionsInterface interface { ReplicaSetsGetter } -// ExtensionsClient is used to interact with features provided by the Extensions group. -type ExtensionsClient struct { +// ExtensionsV1beta1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type ExtensionsV1beta1Client struct { restClient restclient.Interface } -func (c *ExtensionsClient) DaemonSets(namespace string) DaemonSetInterface { +func (c *ExtensionsV1beta1Client) DaemonSets(namespace string) DaemonSetInterface { return newDaemonSets(c, namespace) } -func (c *ExtensionsClient) Deployments(namespace string) DeploymentInterface { +func (c *ExtensionsV1beta1Client) Deployments(namespace string) DeploymentInterface { return newDeployments(c, namespace) } -func (c *ExtensionsClient) Ingresses(namespace string) IngressInterface { +func (c *ExtensionsV1beta1Client) Ingresses(namespace string) IngressInterface { return newIngresses(c, namespace) } -func (c *ExtensionsClient) ReplicaSets(namespace string) ReplicaSetInterface { +func (c *ExtensionsV1beta1Client) ReplicaSets(namespace string) ReplicaSetInterface { return newReplicaSets(c, namespace) } -// NewForConfig creates a new ExtensionsClient for the given config. -func NewForConfig(c *restclient.Config) (*ExtensionsClient, error) { +// NewForConfig creates a new ExtensionsV1beta1Client for the given config. +func NewForConfig(c *restclient.Config) (*ExtensionsV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -62,12 +64,12 @@ func NewForConfig(c *restclient.Config) (*ExtensionsClient, error) { if err != nil { return nil, err } - return &ExtensionsClient{client}, nil + return &ExtensionsV1beta1Client{client}, nil } -// NewForConfigOrDie creates a new ExtensionsClient for the given config and +// NewForConfigOrDie creates a new ExtensionsV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *ExtensionsClient { +func NewForConfigOrDie(c *restclient.Config) *ExtensionsV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -75,26 +77,26 @@ func NewForConfigOrDie(c *restclient.Config) *ExtensionsClient { return client } -// New creates a new ExtensionsClient for the given RESTClient. -func New(c restclient.Interface) *ExtensionsClient { - return &ExtensionsClient{c} +// New creates a new ExtensionsV1beta1Client for the given RESTClient. +func New(c restclient.Interface) *ExtensionsV1beta1Client { + return &ExtensionsV1beta1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if extensions group is not registered, return an error - g, err := registered.Group("extensions") + gv, err := unversioned.ParseGroupVersion("extensions/v1beta1") if err != nil { return err } + // if extensions/v1beta1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("extensions/v1beta1 is not enabled") + } config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -103,7 +105,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ExtensionsClient) RESTClient() restclient.Interface { +func (c *ExtensionsV1beta1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go index 816317af7b3..372081663c5 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go @@ -28,7 +28,7 @@ import ( // FakeDaemonSets implements DaemonSetInterface type FakeDaemonSets struct { - Fake *FakeExtensions + Fake *FakeExtensionsV1beta1 ns string } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go index dfe1b5921d6..7df64acb30c 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go @@ -28,7 +28,7 @@ import ( // FakeDeployments implements DeploymentInterface type FakeDeployments struct { - Fake *FakeExtensions + Fake *FakeExtensionsV1beta1 ns string } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go index 30931d2bc27..d3d3e8f0d41 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go @@ -22,29 +22,29 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakeExtensions struct { +type FakeExtensionsV1beta1 struct { *core.Fake } -func (c *FakeExtensions) DaemonSets(namespace string) v1beta1.DaemonSetInterface { +func (c *FakeExtensionsV1beta1) DaemonSets(namespace string) v1beta1.DaemonSetInterface { return &FakeDaemonSets{c, namespace} } -func (c *FakeExtensions) Deployments(namespace string) v1beta1.DeploymentInterface { +func (c *FakeExtensionsV1beta1) Deployments(namespace string) v1beta1.DeploymentInterface { return &FakeDeployments{c, namespace} } -func (c *FakeExtensions) Ingresses(namespace string) v1beta1.IngressInterface { +func (c *FakeExtensionsV1beta1) Ingresses(namespace string) v1beta1.IngressInterface { return &FakeIngresses{c, namespace} } -func (c *FakeExtensions) ReplicaSets(namespace string) v1beta1.ReplicaSetInterface { +func (c *FakeExtensionsV1beta1) ReplicaSets(namespace string) v1beta1.ReplicaSetInterface { return &FakeReplicaSets{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeExtensions) RESTClient() restclient.Interface { +func (c *FakeExtensionsV1beta1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go index 04a380a2d73..a82e393cfdd 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go @@ -28,7 +28,7 @@ import ( // FakeIngresses implements IngressInterface type FakeIngresses struct { - Fake *FakeExtensions + Fake *FakeExtensionsV1beta1 ns string } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go index a16cb9cfbb9..75a4c2cd8b1 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go @@ -28,7 +28,7 @@ import ( // FakeReplicaSets implements ReplicaSetInterface type FakeReplicaSets struct { - Fake *FakeExtensions + Fake *FakeExtensionsV1beta1 ns string } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go index 287fbba9493..f09456cf08e 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go @@ -51,7 +51,7 @@ type ingresses struct { } // newIngresses returns a Ingresses -func newIngresses(c *ExtensionsClient, namespace string) *ingresses { +func newIngresses(c *ExtensionsV1beta1Client, namespace string) *ingresses { return &ingresses{ client: c.RESTClient(), ns: namespace, diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go index c3de95de5f5..00ef2d746a2 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go @@ -51,7 +51,7 @@ type replicaSets struct { } // newReplicaSets returns a ReplicaSets -func newReplicaSets(c *ExtensionsClient, namespace string) *replicaSets { +func newReplicaSets(c *ExtensionsV1beta1Client, namespace string) *replicaSets { return &replicaSets{ client: c.RESTClient(), ns: namespace, diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/BUILD b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/BUILD index bf0465935b7..b806c291913 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/BUILD +++ b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/BUILD @@ -22,6 +22,7 @@ go_library( deps = [ "//federation/apis/federation/v1beta1:go_default_library", "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/client/restclient:go_default_library", diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/cluster.go b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/cluster.go index f80e2e7f6b2..aa6cd118c78 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/cluster.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/cluster.go @@ -50,7 +50,7 @@ type clusters struct { } // newClusters returns a Clusters -func newClusters(c *FederationClient) *clusters { +func newClusters(c *FederationV1beta1Client) *clusters { return &clusters{ client: c.RESTClient(), } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_cluster.go b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_cluster.go index edf28b9172d..38e2443b288 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_cluster.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_cluster.go @@ -28,7 +28,7 @@ import ( // FakeClusters implements ClusterInterface type FakeClusters struct { - Fake *FakeFederation + Fake *FakeFederationV1beta1 } var clustersResource = unversioned.GroupVersionResource{Group: "federation", Version: "v1beta1", Resource: "clusters"} diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_federation_client.go b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_federation_client.go index 2826f7eb0d3..2cf167cdc26 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_federation_client.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_federation_client.go @@ -22,17 +22,17 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakeFederation struct { +type FakeFederationV1beta1 struct { *core.Fake } -func (c *FakeFederation) Clusters() v1beta1.ClusterInterface { +func (c *FakeFederationV1beta1) Clusters() v1beta1.ClusterInterface { return &FakeClusters{c} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeFederation) RESTClient() restclient.Interface { +func (c *FakeFederationV1beta1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/federation_client.go b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/federation_client.go index 5231d77ea70..2a00656db1b 100644 --- a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/federation_client.go +++ b/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/federation_client.go @@ -17,28 +17,30 @@ limitations under the License. package v1beta1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type FederationInterface interface { +type FederationV1beta1Interface interface { RESTClient() restclient.Interface ClustersGetter } -// FederationClient is used to interact with features provided by the Federation group. -type FederationClient struct { +// FederationV1beta1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type FederationV1beta1Client struct { restClient restclient.Interface } -func (c *FederationClient) Clusters() ClusterInterface { +func (c *FederationV1beta1Client) Clusters() ClusterInterface { return newClusters(c) } -// NewForConfig creates a new FederationClient for the given config. -func NewForConfig(c *restclient.Config) (*FederationClient, error) { +// NewForConfig creates a new FederationV1beta1Client for the given config. +func NewForConfig(c *restclient.Config) (*FederationV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -47,12 +49,12 @@ func NewForConfig(c *restclient.Config) (*FederationClient, error) { if err != nil { return nil, err } - return &FederationClient{client}, nil + return &FederationV1beta1Client{client}, nil } -// NewForConfigOrDie creates a new FederationClient for the given config and +// NewForConfigOrDie creates a new FederationV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *FederationClient { +func NewForConfigOrDie(c *restclient.Config) *FederationV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -60,26 +62,26 @@ func NewForConfigOrDie(c *restclient.Config) *FederationClient { return client } -// New creates a new FederationClient for the given RESTClient. -func New(c restclient.Interface) *FederationClient { - return &FederationClient{c} +// New creates a new FederationV1beta1Client for the given RESTClient. +func New(c restclient.Interface) *FederationV1beta1Client { + return &FederationV1beta1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if federation group is not registered, return an error - g, err := registered.Group("federation") + gv, err := unversioned.ParseGroupVersion("federation/v1beta1") if err != nil { return err } + // if federation/v1beta1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("federation/v1beta1 is not enabled") + } config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -88,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FederationClient) RESTClient() restclient.Interface { +func (c *FederationV1beta1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/hack/.linted_packages b/hack/.linted_packages index 51b3a862067..b1d32fa1f53 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -22,9 +22,10 @@ cmd/kubeadm/app/apis/kubeadm/install cmd/kubectl cmd/kubelet cmd/kubernetes-discovery +cmd/libs/go2idl/client-gen cmd/libs/go2idl/client-gen/generators -cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install -cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned +cmd/libs/go2idl/client-gen/test_apis/testgroup/install +cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/internalversion cmd/libs/go2idl/conversion-gen cmd/libs/go2idl/deepcopy-gen cmd/libs/go2idl/defaulter-gen diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 0b6502507cd..653845df6c5 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -38,19 +38,11 @@ setgen=$(kube::util::find-binary "set-gen") GROUP_VERSIONS=(${KUBE_AVAILABLE_GROUP_VERSIONS}) GV_DIRS=() -SEEN_GROUPS="," for gv in "${GROUP_VERSIONS[@]}"; do # add items, but strip off any leading apis/ you find to match command expectations api_dir=$(kube::util::group-version-to-pkg-path "${gv}") pkg_dir=${api_dir#apis/} - # don't add a version for a group you've already seen - group=${pkg_dir%%/*} - if [[ "${SEEN_GROUPS}" == *",${group}."* ]]; then - continue - fi - SEEN_GROUPS="${SEEN_GROUPS},${group}." - # skip groups that aren't being served, clients for these don't matter if [[ " ${KUBE_NONSERVER_GROUP_VERSIONS} " == *" ${gv} "* ]]; then continue diff --git a/pkg/apis/batch/v2alpha1/types.go b/pkg/apis/batch/v2alpha1/types.go index 6b471e8ed46..f96c17fc726 100644 --- a/pkg/apis/batch/v2alpha1/types.go +++ b/pkg/apis/batch/v2alpha1/types.go @@ -21,6 +21,8 @@ import ( "k8s.io/kubernetes/pkg/api/v1" ) +// +genclient=true + // Job represents the configuration of a single job. type Job struct { unversioned.TypeMeta `json:",inline"` @@ -192,6 +194,8 @@ type JobCondition struct { Message string `json:"message,omitempty" protobuf:"bytes,6,opt,name=message"` } +// +genclient=true + // ScheduledJob represents the configuration of a single scheduled job. type ScheduledJob struct { unversioned.TypeMeta `json:",inline"` diff --git a/pkg/client/clientset_generated/internalclientset/BUILD b/pkg/client/clientset_generated/internalclientset/BUILD index 81503894141..68c324f32bb 100644 --- a/pkg/client/clientset_generated/internalclientset/BUILD +++ b/pkg/client/clientset_generated/internalclientset/BUILD @@ -32,17 +32,17 @@ go_library( "//pkg/apis/policy/install:go_default_library", "//pkg/apis/rbac/install:go_default_library", "//pkg/apis/storage/install:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/apps/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/batch/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/policy/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/storage/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/storage/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/util/flowcontrol:go_default_library", diff --git a/pkg/client/clientset_generated/internalclientset/clientset.go b/pkg/client/clientset_generated/internalclientset/clientset.go index f53df1020a8..7819009c80e 100644 --- a/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/pkg/client/clientset_generated/internalclientset/clientset.go @@ -18,17 +18,17 @@ package internalclientset import ( "github.com/golang/glog" - unversionedapps "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned" - unversionedauthentication "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned" - unversionedauthorization "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned" - unversionedautoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned" - unversionedbatch "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned" - unversionedcertificates "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" - unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" - unversionedpolicy "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned" - unversionedrbac "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned" - unversionedstorage "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned" + internalversionapps "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" + internalversionauthentication "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion" + internalversionauthorization "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion" + internalversionautoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion" + internalversionbatch "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" + internalversioncertificates "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion" + internalversioncore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + internalversionextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" + internalversionpolicy "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" + internalversionrbac "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion" + internalversionstorage "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" discovery "k8s.io/kubernetes/pkg/client/typed/discovery" "k8s.io/kubernetes/pkg/util/flowcontrol" @@ -37,46 +37,64 @@ import ( type Interface interface { Discovery() discovery.DiscoveryInterface - Core() unversionedcore.CoreInterface - Authentication() unversionedauthentication.AuthenticationInterface - Authorization() unversionedauthorization.AuthorizationInterface - Autoscaling() unversionedautoscaling.AutoscalingInterface - Batch() unversionedbatch.BatchInterface - Certificates() unversionedcertificates.CertificatesInterface - Extensions() unversionedextensions.ExtensionsInterface - Rbac() unversionedrbac.RbacInterface - Storage() unversionedstorage.StorageInterface - Apps() unversionedapps.AppsInterface - Policy() unversionedpolicy.PolicyInterface + Core() internalversioncore.CoreInterface + + Apps() internalversionapps.AppsInterface + + Authentication() internalversionauthentication.AuthenticationInterface + + Authorization() internalversionauthorization.AuthorizationInterface + + Autoscaling() internalversionautoscaling.AutoscalingInterface + + Batch() internalversionbatch.BatchInterface + + Certificates() internalversioncertificates.CertificatesInterface + + Extensions() internalversionextensions.ExtensionsInterface + + Policy() internalversionpolicy.PolicyInterface + + Rbac() internalversionrbac.RbacInterface + + Storage() internalversionstorage.StorageInterface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *unversionedcore.CoreClient - *unversionedauthentication.AuthenticationClient - *unversionedauthorization.AuthorizationClient - *unversionedautoscaling.AutoscalingClient - *unversionedbatch.BatchClient - *unversionedcertificates.CertificatesClient - *unversionedextensions.ExtensionsClient - *unversionedrbac.RbacClient - *unversionedstorage.StorageClient - *unversionedapps.AppsClient - *unversionedpolicy.PolicyClient + *internalversioncore.CoreClient + *internalversionapps.AppsClient + *internalversionauthentication.AuthenticationClient + *internalversionauthorization.AuthorizationClient + *internalversionautoscaling.AutoscalingClient + *internalversionbatch.BatchClient + *internalversioncertificates.CertificatesClient + *internalversionextensions.ExtensionsClient + *internalversionpolicy.PolicyClient + *internalversionrbac.RbacClient + *internalversionstorage.StorageClient } // Core retrieves the CoreClient -func (c *Clientset) Core() unversionedcore.CoreInterface { +func (c *Clientset) Core() internalversioncore.CoreInterface { if c == nil { return nil } return c.CoreClient } +// Apps retrieves the AppsClient +func (c *Clientset) Apps() internalversionapps.AppsInterface { + if c == nil { + return nil + } + return c.AppsClient +} + // Authentication retrieves the AuthenticationClient -func (c *Clientset) Authentication() unversionedauthentication.AuthenticationInterface { +func (c *Clientset) Authentication() internalversionauthentication.AuthenticationInterface { if c == nil { return nil } @@ -84,7 +102,7 @@ func (c *Clientset) Authentication() unversionedauthentication.AuthenticationInt } // Authorization retrieves the AuthorizationClient -func (c *Clientset) Authorization() unversionedauthorization.AuthorizationInterface { +func (c *Clientset) Authorization() internalversionauthorization.AuthorizationInterface { if c == nil { return nil } @@ -92,7 +110,7 @@ func (c *Clientset) Authorization() unversionedauthorization.AuthorizationInterf } // Autoscaling retrieves the AutoscalingClient -func (c *Clientset) Autoscaling() unversionedautoscaling.AutoscalingInterface { +func (c *Clientset) Autoscaling() internalversionautoscaling.AutoscalingInterface { if c == nil { return nil } @@ -100,7 +118,7 @@ func (c *Clientset) Autoscaling() unversionedautoscaling.AutoscalingInterface { } // Batch retrieves the BatchClient -func (c *Clientset) Batch() unversionedbatch.BatchInterface { +func (c *Clientset) Batch() internalversionbatch.BatchInterface { if c == nil { return nil } @@ -108,7 +126,7 @@ func (c *Clientset) Batch() unversionedbatch.BatchInterface { } // Certificates retrieves the CertificatesClient -func (c *Clientset) Certificates() unversionedcertificates.CertificatesInterface { +func (c *Clientset) Certificates() internalversioncertificates.CertificatesInterface { if c == nil { return nil } @@ -116,15 +134,23 @@ func (c *Clientset) Certificates() unversionedcertificates.CertificatesInterface } // Extensions retrieves the ExtensionsClient -func (c *Clientset) Extensions() unversionedextensions.ExtensionsInterface { +func (c *Clientset) Extensions() internalversionextensions.ExtensionsInterface { if c == nil { return nil } return c.ExtensionsClient } +// Policy retrieves the PolicyClient +func (c *Clientset) Policy() internalversionpolicy.PolicyInterface { + if c == nil { + return nil + } + return c.PolicyClient +} + // Rbac retrieves the RbacClient -func (c *Clientset) Rbac() unversionedrbac.RbacInterface { +func (c *Clientset) Rbac() internalversionrbac.RbacInterface { if c == nil { return nil } @@ -132,29 +158,13 @@ func (c *Clientset) Rbac() unversionedrbac.RbacInterface { } // Storage retrieves the StorageClient -func (c *Clientset) Storage() unversionedstorage.StorageInterface { +func (c *Clientset) Storage() internalversionstorage.StorageInterface { if c == nil { return nil } return c.StorageClient } -// Apps retrieves the AppsClient -func (c *Clientset) Apps() unversionedapps.AppsInterface { - if c == nil { - return nil - } - return c.AppsClient -} - -// Policy retrieves the PolicyClient -func (c *Clientset) Policy() unversionedpolicy.PolicyInterface { - if c == nil { - return nil - } - return c.PolicyClient -} - // Discovery retrieves the DiscoveryClient func (c *Clientset) Discovery() discovery.DiscoveryInterface { return c.DiscoveryClient @@ -168,47 +178,47 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { } var clientset Clientset var err error - clientset.CoreClient, err = unversionedcore.NewForConfig(&configShallowCopy) + clientset.CoreClient, err = internalversioncore.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.AuthenticationClient, err = unversionedauthentication.NewForConfig(&configShallowCopy) + clientset.AppsClient, err = internalversionapps.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.AuthorizationClient, err = unversionedauthorization.NewForConfig(&configShallowCopy) + clientset.AuthenticationClient, err = internalversionauthentication.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.AutoscalingClient, err = unversionedautoscaling.NewForConfig(&configShallowCopy) + clientset.AuthorizationClient, err = internalversionauthorization.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.BatchClient, err = unversionedbatch.NewForConfig(&configShallowCopy) + clientset.AutoscalingClient, err = internalversionautoscaling.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.CertificatesClient, err = unversionedcertificates.NewForConfig(&configShallowCopy) + clientset.BatchClient, err = internalversionbatch.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.ExtensionsClient, err = unversionedextensions.NewForConfig(&configShallowCopy) + clientset.CertificatesClient, err = internalversioncertificates.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.RbacClient, err = unversionedrbac.NewForConfig(&configShallowCopy) + clientset.ExtensionsClient, err = internalversionextensions.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.StorageClient, err = unversionedstorage.NewForConfig(&configShallowCopy) + clientset.PolicyClient, err = internalversionpolicy.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.AppsClient, err = unversionedapps.NewForConfig(&configShallowCopy) + clientset.RbacClient, err = internalversionrbac.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.PolicyClient, err = unversionedpolicy.NewForConfig(&configShallowCopy) + clientset.StorageClient, err = internalversionstorage.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -225,17 +235,17 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *restclient.Config) *Clientset { var clientset Clientset - clientset.CoreClient = unversionedcore.NewForConfigOrDie(c) - clientset.AuthenticationClient = unversionedauthentication.NewForConfigOrDie(c) - clientset.AuthorizationClient = unversionedauthorization.NewForConfigOrDie(c) - clientset.AutoscalingClient = unversionedautoscaling.NewForConfigOrDie(c) - clientset.BatchClient = unversionedbatch.NewForConfigOrDie(c) - clientset.CertificatesClient = unversionedcertificates.NewForConfigOrDie(c) - clientset.ExtensionsClient = unversionedextensions.NewForConfigOrDie(c) - clientset.RbacClient = unversionedrbac.NewForConfigOrDie(c) - clientset.StorageClient = unversionedstorage.NewForConfigOrDie(c) - clientset.AppsClient = unversionedapps.NewForConfigOrDie(c) - clientset.PolicyClient = unversionedpolicy.NewForConfigOrDie(c) + clientset.CoreClient = internalversioncore.NewForConfigOrDie(c) + clientset.AppsClient = internalversionapps.NewForConfigOrDie(c) + clientset.AuthenticationClient = internalversionauthentication.NewForConfigOrDie(c) + clientset.AuthorizationClient = internalversionauthorization.NewForConfigOrDie(c) + clientset.AutoscalingClient = internalversionautoscaling.NewForConfigOrDie(c) + clientset.BatchClient = internalversionbatch.NewForConfigOrDie(c) + clientset.CertificatesClient = internalversioncertificates.NewForConfigOrDie(c) + clientset.ExtensionsClient = internalversionextensions.NewForConfigOrDie(c) + clientset.PolicyClient = internalversionpolicy.NewForConfigOrDie(c) + clientset.RbacClient = internalversionrbac.NewForConfigOrDie(c) + clientset.StorageClient = internalversionstorage.NewForConfigOrDie(c) clientset.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &clientset @@ -244,17 +254,17 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c restclient.Interface) *Clientset { var clientset Clientset - clientset.CoreClient = unversionedcore.New(c) - clientset.AuthenticationClient = unversionedauthentication.New(c) - clientset.AuthorizationClient = unversionedauthorization.New(c) - clientset.AutoscalingClient = unversionedautoscaling.New(c) - clientset.BatchClient = unversionedbatch.New(c) - clientset.CertificatesClient = unversionedcertificates.New(c) - clientset.ExtensionsClient = unversionedextensions.New(c) - clientset.RbacClient = unversionedrbac.New(c) - clientset.StorageClient = unversionedstorage.New(c) - clientset.AppsClient = unversionedapps.New(c) - clientset.PolicyClient = unversionedpolicy.New(c) + clientset.CoreClient = internalversioncore.New(c) + clientset.AppsClient = internalversionapps.New(c) + clientset.AuthenticationClient = internalversionauthentication.New(c) + clientset.AuthorizationClient = internalversionauthorization.New(c) + clientset.AutoscalingClient = internalversionautoscaling.New(c) + clientset.BatchClient = internalversionbatch.New(c) + clientset.CertificatesClient = internalversioncertificates.New(c) + clientset.ExtensionsClient = internalversionextensions.New(c) + clientset.PolicyClient = internalversionpolicy.New(c) + clientset.RbacClient = internalversionrbac.New(c) + clientset.StorageClient = internalversionstorage.New(c) clientset.DiscoveryClient = discovery.NewDiscoveryClient(c) return &clientset diff --git a/pkg/client/clientset_generated/internalclientset/fake/BUILD b/pkg/client/clientset_generated/internalclientset/fake/BUILD index 295419ad92f..846af8c57d8 100644 --- a/pkg/client/clientset_generated/internalclientset/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/fake/BUILD @@ -21,28 +21,28 @@ go_library( "//pkg/api:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/apps/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/batch/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/policy/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/storage/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/storage/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/client/typed/discovery/fake:go_default_library", diff --git a/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go b/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go index fc7e36704b0..e6eac0081c4 100644 --- a/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go +++ b/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go @@ -20,28 +20,28 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/registered" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedapps "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned" - fakeunversionedapps "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake" - unversionedauthentication "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned" - fakeunversionedauthentication "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake" - unversionedauthorization "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned" - fakeunversionedauthorization "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake" - unversionedautoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned" - fakeunversionedautoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake" - unversionedbatch "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned" - fakeunversionedbatch "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake" - unversionedcertificates "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned" - fakeunversionedcertificates "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" - fakeunversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake" - unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" - fakeunversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake" - unversionedpolicy "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned" - fakeunversionedpolicy "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake" - unversionedrbac "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned" - fakeunversionedrbac "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake" - unversionedstorage "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned" - fakeunversionedstorage "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake" + internalversionapps "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" + fakeinternalversionapps "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake" + internalversionauthentication "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion" + fakeinternalversionauthentication "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake" + internalversionauthorization "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion" + fakeinternalversionauthorization "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake" + internalversionautoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion" + fakeinternalversionautoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake" + internalversionbatch "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" + fakeinternalversionbatch "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake" + internalversioncertificates "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion" + fakeinternalversioncertificates "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake" + internalversioncore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + fakeinternalversioncore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake" + internalversionextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" + fakeinternalversionextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake" + internalversionpolicy "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" + fakeinternalversionpolicy "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake" + internalversionrbac "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion" + fakeinternalversionrbac "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake" + internalversionstorage "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion" + fakeinternalversionstorage "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/client/typed/discovery" fakediscovery "k8s.io/kubernetes/pkg/client/typed/discovery/fake" @@ -83,56 +83,56 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} // Core retrieves the CoreClient -func (c *Clientset) Core() unversionedcore.CoreInterface { - return &fakeunversionedcore.FakeCore{Fake: &c.Fake} -} - -// Authentication retrieves the AuthenticationClient -func (c *Clientset) Authentication() unversionedauthentication.AuthenticationInterface { - return &fakeunversionedauthentication.FakeAuthentication{Fake: &c.Fake} -} - -// Authorization retrieves the AuthorizationClient -func (c *Clientset) Authorization() unversionedauthorization.AuthorizationInterface { - return &fakeunversionedauthorization.FakeAuthorization{Fake: &c.Fake} -} - -// Autoscaling retrieves the AutoscalingClient -func (c *Clientset) Autoscaling() unversionedautoscaling.AutoscalingInterface { - return &fakeunversionedautoscaling.FakeAutoscaling{Fake: &c.Fake} -} - -// Batch retrieves the BatchClient -func (c *Clientset) Batch() unversionedbatch.BatchInterface { - return &fakeunversionedbatch.FakeBatch{Fake: &c.Fake} -} - -// Certificates retrieves the CertificatesClient -func (c *Clientset) Certificates() unversionedcertificates.CertificatesInterface { - return &fakeunversionedcertificates.FakeCertificates{Fake: &c.Fake} -} - -// Extensions retrieves the ExtensionsClient -func (c *Clientset) Extensions() unversionedextensions.ExtensionsInterface { - return &fakeunversionedextensions.FakeExtensions{Fake: &c.Fake} -} - -// Rbac retrieves the RbacClient -func (c *Clientset) Rbac() unversionedrbac.RbacInterface { - return &fakeunversionedrbac.FakeRbac{Fake: &c.Fake} -} - -// Storage retrieves the StorageClient -func (c *Clientset) Storage() unversionedstorage.StorageInterface { - return &fakeunversionedstorage.FakeStorage{Fake: &c.Fake} +func (c *Clientset) Core() internalversioncore.CoreInterface { + return &fakeinternalversioncore.FakeCore{Fake: &c.Fake} } // Apps retrieves the AppsClient -func (c *Clientset) Apps() unversionedapps.AppsInterface { - return &fakeunversionedapps.FakeApps{Fake: &c.Fake} +func (c *Clientset) Apps() internalversionapps.AppsInterface { + return &fakeinternalversionapps.FakeApps{Fake: &c.Fake} +} + +// Authentication retrieves the AuthenticationClient +func (c *Clientset) Authentication() internalversionauthentication.AuthenticationInterface { + return &fakeinternalversionauthentication.FakeAuthentication{Fake: &c.Fake} +} + +// Authorization retrieves the AuthorizationClient +func (c *Clientset) Authorization() internalversionauthorization.AuthorizationInterface { + return &fakeinternalversionauthorization.FakeAuthorization{Fake: &c.Fake} +} + +// Autoscaling retrieves the AutoscalingClient +func (c *Clientset) Autoscaling() internalversionautoscaling.AutoscalingInterface { + return &fakeinternalversionautoscaling.FakeAutoscaling{Fake: &c.Fake} +} + +// Batch retrieves the BatchClient +func (c *Clientset) Batch() internalversionbatch.BatchInterface { + return &fakeinternalversionbatch.FakeBatch{Fake: &c.Fake} +} + +// Certificates retrieves the CertificatesClient +func (c *Clientset) Certificates() internalversioncertificates.CertificatesInterface { + return &fakeinternalversioncertificates.FakeCertificates{Fake: &c.Fake} +} + +// Extensions retrieves the ExtensionsClient +func (c *Clientset) Extensions() internalversionextensions.ExtensionsInterface { + return &fakeinternalversionextensions.FakeExtensions{Fake: &c.Fake} } // Policy retrieves the PolicyClient -func (c *Clientset) Policy() unversionedpolicy.PolicyInterface { - return &fakeunversionedpolicy.FakePolicy{Fake: &c.Fake} +func (c *Clientset) Policy() internalversionpolicy.PolicyInterface { + return &fakeinternalversionpolicy.FakePolicy{Fake: &c.Fake} +} + +// Rbac retrieves the RbacClient +func (c *Clientset) Rbac() internalversionrbac.RbacInterface { + return &fakeinternalversionrbac.FakeRbac{Fake: &c.Fake} +} + +// Storage retrieves the StorageClient +func (c *Clientset) Storage() internalversionstorage.StorageInterface { + return &fakeinternalversionstorage.FakeStorage{Fake: &c.Fake} } diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/BUILD b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/apps_client.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/apps_client.go rename to pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go index 254ef847840..84ffd5f9fe8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/apps_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -27,7 +27,7 @@ type AppsInterface interface { StatefulSetsGetter } -// AppsClient is used to interact with features provided by the Apps group. +// AppsClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type AppsClient struct { restClient restclient.Interface } diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/doc.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/doc.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/doc.go index 1e6a8ff827b..d908962a44c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/doc.go @@ -17,4 +17,4 @@ limitations under the License. // This package is generated by client-gen with the default arguments. // This package has the automatically generated typed clients. -package unversioned +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/BUILD similarity index 94% rename from pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/BUILD index afa149b604a..dcf23b3687e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/BUILD @@ -22,7 +22,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/apis/apps:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/apps/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/doc.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/doc.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/fake_apps_client.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_apps_client.go similarity index 83% rename from pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/fake_apps_client.go rename to pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_apps_client.go index 0f5901733ed..f38c7296002 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/fake_apps_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_apps_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned" + internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,7 +26,7 @@ type FakeApps struct { *core.Fake } -func (c *FakeApps) StatefulSets(namespace string) unversioned.StatefulSetInterface { +func (c *FakeApps) StatefulSets(namespace string) internalversion.StatefulSetInterface { return &FakeStatefulSets{c, namespace} } diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/fake_statefulset.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_statefulset.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake/fake_statefulset.go rename to pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake/fake_statefulset.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/generated_expansion.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/generated_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/generated_expansion.go index 698d440fadb..14e220e7a35 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/generated_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/generated_expansion.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion type StatefulSetExpansion interface{} diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/statefulset.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/statefulset.go rename to pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go index 67854249b02..18089e70a6e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/statefulset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/authentication_client.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/authentication_client.go rename to pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go index 5e2563dd082..a4f9bdef4cf 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/authentication_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -27,7 +27,7 @@ type AuthenticationInterface interface { TokenReviewsGetter } -// AuthenticationClient is used to interact with features provided by the Authentication group. +// AuthenticationClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type AuthenticationClient struct { restClient restclient.Interface } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/doc.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/doc.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/doc.go index 1e6a8ff827b..d908962a44c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/doc.go @@ -17,4 +17,4 @@ limitations under the License. // This package is generated by client-gen with the default arguments. // This package has the automatically generated typed clients. -package unversioned +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/BUILD similarity index 92% rename from pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/BUILD index 073a3b0468a..2c4dad2e7cd 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/BUILD @@ -21,7 +21,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/authentication:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", ], diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/doc.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/doc.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/fake_authentication_client.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_authentication_client.go similarity index 82% rename from pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/fake_authentication_client.go rename to pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_authentication_client.go index 325f8a5b08e..ca8db0215b1 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/fake_authentication_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_authentication_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned" + internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,7 +26,7 @@ type FakeAuthentication struct { *core.Fake } -func (c *FakeAuthentication) TokenReviews() unversioned.TokenReviewInterface { +func (c *FakeAuthentication) TokenReviews() internalversion.TokenReviewInterface { return &FakeTokenReviews{c} } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/fake_generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_generated_expansion.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/fake_generated_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_generated_expansion.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/fake_tokenreview.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_tokenreview.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake/fake_tokenreview.go rename to pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake/fake_tokenreview.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/generated_expansion.go similarity index 95% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/generated_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/generated_expansion.go index 6cdbfc5bcda..85214a81408 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/generated_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/generated_expansion.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/tokenreview.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/tokenreview.go similarity index 98% rename from pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/tokenreview.go rename to pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/tokenreview.go index 9540b1673c6..9987d63e2e1 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/tokenreview.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/tokenreview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( restclient "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/tokenreview_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/tokenreview_expansion.go similarity index 97% rename from pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/tokenreview_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/tokenreview_expansion.go index 1137e520467..57bdc3ccda5 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/tokenreview_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/tokenreview_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( authenticationapi "k8s.io/kubernetes/pkg/apis/authentication" diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/authorization_client.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go similarity index 97% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/authorization_client.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go index 3caf9d7c6fe..b9b85f6370d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/authorization_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -29,7 +29,7 @@ type AuthorizationInterface interface { SubjectAccessReviewsGetter } -// AuthorizationClient is used to interact with features provided by the Authorization group. +// AuthorizationClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type AuthorizationClient struct { restClient restclient.Interface } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/doc.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/doc.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/doc.go index 1e6a8ff827b..d908962a44c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/doc.go @@ -17,4 +17,4 @@ limitations under the License. // This package is generated by client-gen with the default arguments. // This package has the automatically generated typed clients. -package unversioned +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/BUILD similarity index 93% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/BUILD index 3a7445258a4..766722d86d8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/BUILD @@ -23,7 +23,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/authorization:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", ], diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/doc.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/doc.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_authorization_client.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_authorization_client.go similarity index 75% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_authorization_client.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_authorization_client.go index 35aa290e6fb..ce668628f6c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_authorization_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_authorization_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned" + internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,15 +26,15 @@ type FakeAuthorization struct { *core.Fake } -func (c *FakeAuthorization) LocalSubjectAccessReviews(namespace string) unversioned.LocalSubjectAccessReviewInterface { +func (c *FakeAuthorization) LocalSubjectAccessReviews(namespace string) internalversion.LocalSubjectAccessReviewInterface { return &FakeLocalSubjectAccessReviews{c, namespace} } -func (c *FakeAuthorization) SelfSubjectAccessReviews() unversioned.SelfSubjectAccessReviewInterface { +func (c *FakeAuthorization) SelfSubjectAccessReviews() internalversion.SelfSubjectAccessReviewInterface { return &FakeSelfSubjectAccessReviews{c} } -func (c *FakeAuthorization) SubjectAccessReviews() unversioned.SubjectAccessReviewInterface { +func (c *FakeAuthorization) SubjectAccessReviews() internalversion.SubjectAccessReviewInterface { return &FakeSubjectAccessReviews{c} } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_generated_expansion.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_generated_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_generated_expansion.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_localsubjectaccessreview.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_localsubjectaccessreview.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_localsubjectaccessreview.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_localsubjectaccessreview.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_selfsubjectaccessreview.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_selfsubjectaccessreview.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_selfsubjectaccessreview.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_selfsubjectaccessreview.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_subjectaccessreview.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_subjectaccessreview.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake/fake_subjectaccessreview.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake/fake_subjectaccessreview.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/generated_expansion.go similarity index 95% rename from pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/generated_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/generated_expansion.go index 6cdbfc5bcda..85214a81408 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/generated_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/generated_expansion.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/localsubjectaccessreview.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/localsubjectaccessreview.go similarity index 98% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/localsubjectaccessreview.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/localsubjectaccessreview.go index 66b24a8d062..5277a227d77 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/localsubjectaccessreview.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/localsubjectaccessreview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( restclient "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/localsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/localsubjectaccessreview_expansion.go similarity index 97% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/localsubjectaccessreview_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/localsubjectaccessreview_expansion.go index afe092a5860..b49970bfeac 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/localsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/localsubjectaccessreview_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/selfsubjectaccessreview.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/selfsubjectaccessreview.go similarity index 98% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/selfsubjectaccessreview.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/selfsubjectaccessreview.go index ef118d6c9f4..7e22f832b3c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/selfsubjectaccessreview.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/selfsubjectaccessreview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( restclient "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/selfsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/selfsubjectaccessreview_expansion.go similarity index 97% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/selfsubjectaccessreview_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/selfsubjectaccessreview_expansion.go index 0cde6e83b41..fcfe9e97b5b 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/selfsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/selfsubjectaccessreview_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/subjectaccessreview.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/subjectaccessreview.go similarity index 98% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/subjectaccessreview.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/subjectaccessreview.go index 429692f176a..344bcebf09c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/subjectaccessreview.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/subjectaccessreview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( restclient "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/subjectaccessreview_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/subjectaccessreview_expansion.go similarity index 97% rename from pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/subjectaccessreview_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/subjectaccessreview_expansion.go index ce6e91eb449..44d672d604a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/subjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/subjectaccessreview_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/BUILD b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/autoscaling_client.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/autoscaling_client.go rename to pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go index 53ef5f35452..0291b6d6c8d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/autoscaling_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -27,7 +27,7 @@ type AutoscalingInterface interface { HorizontalPodAutoscalersGetter } -// AutoscalingClient is used to interact with features provided by the Autoscaling group. +// AutoscalingClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type AutoscalingClient struct { restClient restclient.Interface } diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/doc.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/doc.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/doc.go index 1e6a8ff827b..d908962a44c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/doc.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/doc.go @@ -17,4 +17,4 @@ limitations under the License. // This package is generated by client-gen with the default arguments. // This package has the automatically generated typed clients. -package unversioned +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/BUILD similarity index 94% rename from pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/BUILD index 4242a0eb88b..88190760f5d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/BUILD @@ -22,7 +22,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/apis/autoscaling:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/doc.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/doc.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/fake_autoscaling_client.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go similarity index 86% rename from pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/fake_autoscaling_client.go rename to pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go index c779831cdb9..b36326f4a21 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/fake_autoscaling_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_autoscaling_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned" + internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,7 +26,7 @@ type FakeAutoscaling struct { *core.Fake } -func (c *FakeAutoscaling) HorizontalPodAutoscalers(namespace string) unversioned.HorizontalPodAutoscalerInterface { +func (c *FakeAutoscaling) HorizontalPodAutoscalers(namespace string) internalversion.HorizontalPodAutoscalerInterface { return &FakeHorizontalPodAutoscalers{c, namespace} } diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/fake_horizontalpodautoscaler.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake/fake_horizontalpodautoscaler.go rename to pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake/fake_horizontalpodautoscaler.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/generated_expansion.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/generated_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/generated_expansion.go index 628b494c0e0..386fb42223a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/generated_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/generated_expansion.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion type HorizontalPodAutoscalerExpansion interface{} diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/horizontalpodautoscaler.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/horizontalpodautoscaler.go rename to pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go index cd244d9a349..fea42bb821c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/BUILD b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/batch_client.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go similarity index 97% rename from pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/batch_client.go rename to pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go index 3382c720a37..32abd5fab0a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/batch_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -28,7 +28,7 @@ type BatchInterface interface { ScheduledJobsGetter } -// BatchClient is used to interact with features provided by the Batch group. +// BatchClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type BatchClient struct { restClient restclient.Interface } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/doc.go new file mode 100644 index 00000000000..d908962a44c --- /dev/null +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with the default arguments. + +// This package has the automatically generated typed clients. +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/BUILD similarity index 94% rename from pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/BUILD index e5d3a083715..c26816d1541 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/BUILD @@ -23,7 +23,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/apis/batch:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/batch/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/doc.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/doc.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/fake_batch_client.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_batch_client.go similarity index 78% rename from pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/fake_batch_client.go rename to pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_batch_client.go index 47deee0bc13..51726897bf7 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/fake_batch_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_batch_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned" + internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,11 +26,11 @@ type FakeBatch struct { *core.Fake } -func (c *FakeBatch) Jobs(namespace string) unversioned.JobInterface { +func (c *FakeBatch) Jobs(namespace string) internalversion.JobInterface { return &FakeJobs{c, namespace} } -func (c *FakeBatch) ScheduledJobs(namespace string) unversioned.ScheduledJobInterface { +func (c *FakeBatch) ScheduledJobs(namespace string) internalversion.ScheduledJobInterface { return &FakeScheduledJobs{c, namespace} } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/fake_job.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_job.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/fake_job.go rename to pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_job.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/fake_scheduledjob.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_scheduledjob.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake/fake_scheduledjob.go rename to pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake/fake_scheduledjob.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/generated_expansion.go new file mode 100644 index 00000000000..802f4f4b99e --- /dev/null +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/generated_expansion.go @@ -0,0 +1,21 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package internalversion + +type JobExpansion interface{} + +type ScheduledJobExpansion interface{} diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/job.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/job.go rename to pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go index a2c4aa977e8..f5fb8ffa22c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/job.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/scheduledjob.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/scheduledjob.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/scheduledjob.go rename to pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/scheduledjob.go index 863d6d90dd8..897e41a3b82 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/scheduledjob.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/scheduledjob.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/doc.go b/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/doc.go deleted file mode 100644 index 1e6a8ff827b..00000000000 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// This package is generated by client-gen with the default arguments. - -// This package has the automatically generated typed clients. -package unversioned diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/BUILD b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go rename to pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go index c3b7820938a..0c10fdb59c7 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -27,7 +27,7 @@ type CertificatesInterface interface { CertificateSigningRequestsGetter } -// CertificatesClient is used to interact with features provided by the Certificates group. +// CertificatesClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type CertificatesClient struct { restClient restclient.Interface } diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificatesigningrequest.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificatesigningrequest.go rename to pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go index 682c0f32a00..b647475fb2f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificatesigningrequest.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificatesigningrequest_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest_expansion.go similarity index 98% rename from pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificatesigningrequest_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest_expansion.go index b4f015b86bc..ffdde205605 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificatesigningrequest_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import "k8s.io/kubernetes/pkg/apis/certificates" diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/doc.go new file mode 100644 index 00000000000..d908962a44c --- /dev/null +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with the default arguments. + +// This package has the automatically generated typed clients. +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/BUILD similarity index 94% rename from pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/BUILD index 8ccf9e31c95..e6bb476da11 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/BUILD @@ -23,7 +23,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/apis/certificates:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/doc.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/doc.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificates_client.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificates_client.go similarity index 81% rename from pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificates_client.go rename to pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificates_client.go index 92cf1449a10..d52bcdd2ead 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificates_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificates_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned" + internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,7 +26,7 @@ type FakeCertificates struct { *core.Fake } -func (c *FakeCertificates) CertificateSigningRequests() unversioned.CertificateSigningRequestInterface { +func (c *FakeCertificates) CertificateSigningRequests() internalversion.CertificateSigningRequestInterface { return &FakeCertificateSigningRequests{c} } diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificatesigningrequest.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificatesigningrequest.go rename to pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificatesigningrequest_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest_expansion.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake/fake_certificatesigningrequest_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake/fake_certificatesigningrequest_expansion.go diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/generated_expansion.go similarity index 95% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/generated_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/generated_expansion.go index 6cdbfc5bcda..85214a81408 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/generated_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/generated_expansion.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/doc.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/doc.go deleted file mode 100644 index 1e6a8ff827b..00000000000 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// This package is generated by client-gen with the default arguments. - -// This package has the automatically generated typed clients. -package unversioned diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/generated_expansion.go deleted file mode 100644 index 6cdbfc5bcda..00000000000 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/generated_expansion.go +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package unversioned diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/BUILD b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/componentstatus.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/componentstatus.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go index 0f49e4d3c2c..25ec37e4e8a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/componentstatus.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/configmap.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/configmap.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go index 0f8352b5c90..0956777bb7a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/configmap.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/core_client.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go similarity index 98% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/core_client.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go index 6183e7e4ddd..b5d4a88893f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/core_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -42,7 +42,7 @@ type CoreInterface interface { ServiceAccountsGetter } -// CoreClient is used to interact with features provided by the Core group. +// CoreClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type CoreClient struct { restClient restclient.Interface } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/doc.go new file mode 100644 index 00000000000..d908962a44c --- /dev/null +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with the default arguments. + +// This package has the automatically generated typed clients. +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/endpoints.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/endpoints.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go index dbad5180819..a7989de3ba5 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/endpoints.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/event.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go similarity index 99% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/event.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go index dbf92eec99f..8667ac4688b 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/event.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/event_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event_expansion.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/event_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event_expansion.go index f3d6f468d71..2d316aaed3e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/event_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( "fmt" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/BUILD similarity index 97% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/BUILD index 4a89fee5b89..62161dbd450 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/BUILD @@ -41,7 +41,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/fields:go_default_library", diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/doc.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/doc.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_componentstatus.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_componentstatus.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_componentstatus.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_componentstatus.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_configmap.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_configmap.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_configmap.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_configmap.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_core_client.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_core_client.go similarity index 52% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_core_client.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_core_client.go index 7dda351c3bb..66808c32dbf 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_core_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_core_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,67 +26,67 @@ type FakeCore struct { *core.Fake } -func (c *FakeCore) ComponentStatuses() unversioned.ComponentStatusInterface { +func (c *FakeCore) ComponentStatuses() internalversion.ComponentStatusInterface { return &FakeComponentStatuses{c} } -func (c *FakeCore) ConfigMaps(namespace string) unversioned.ConfigMapInterface { +func (c *FakeCore) ConfigMaps(namespace string) internalversion.ConfigMapInterface { return &FakeConfigMaps{c, namespace} } -func (c *FakeCore) Endpoints(namespace string) unversioned.EndpointsInterface { +func (c *FakeCore) Endpoints(namespace string) internalversion.EndpointsInterface { return &FakeEndpoints{c, namespace} } -func (c *FakeCore) Events(namespace string) unversioned.EventInterface { +func (c *FakeCore) Events(namespace string) internalversion.EventInterface { return &FakeEvents{c, namespace} } -func (c *FakeCore) LimitRanges(namespace string) unversioned.LimitRangeInterface { +func (c *FakeCore) LimitRanges(namespace string) internalversion.LimitRangeInterface { return &FakeLimitRanges{c, namespace} } -func (c *FakeCore) Namespaces() unversioned.NamespaceInterface { +func (c *FakeCore) Namespaces() internalversion.NamespaceInterface { return &FakeNamespaces{c} } -func (c *FakeCore) Nodes() unversioned.NodeInterface { +func (c *FakeCore) Nodes() internalversion.NodeInterface { return &FakeNodes{c} } -func (c *FakeCore) PersistentVolumes() unversioned.PersistentVolumeInterface { +func (c *FakeCore) PersistentVolumes() internalversion.PersistentVolumeInterface { return &FakePersistentVolumes{c} } -func (c *FakeCore) PersistentVolumeClaims(namespace string) unversioned.PersistentVolumeClaimInterface { +func (c *FakeCore) PersistentVolumeClaims(namespace string) internalversion.PersistentVolumeClaimInterface { return &FakePersistentVolumeClaims{c, namespace} } -func (c *FakeCore) Pods(namespace string) unversioned.PodInterface { +func (c *FakeCore) Pods(namespace string) internalversion.PodInterface { return &FakePods{c, namespace} } -func (c *FakeCore) PodTemplates(namespace string) unversioned.PodTemplateInterface { +func (c *FakeCore) PodTemplates(namespace string) internalversion.PodTemplateInterface { return &FakePodTemplates{c, namespace} } -func (c *FakeCore) ReplicationControllers(namespace string) unversioned.ReplicationControllerInterface { +func (c *FakeCore) ReplicationControllers(namespace string) internalversion.ReplicationControllerInterface { return &FakeReplicationControllers{c, namespace} } -func (c *FakeCore) ResourceQuotas(namespace string) unversioned.ResourceQuotaInterface { +func (c *FakeCore) ResourceQuotas(namespace string) internalversion.ResourceQuotaInterface { return &FakeResourceQuotas{c, namespace} } -func (c *FakeCore) Secrets(namespace string) unversioned.SecretInterface { +func (c *FakeCore) Secrets(namespace string) internalversion.SecretInterface { return &FakeSecrets{c, namespace} } -func (c *FakeCore) Services(namespace string) unversioned.ServiceInterface { +func (c *FakeCore) Services(namespace string) internalversion.ServiceInterface { return &FakeServices{c, namespace} } -func (c *FakeCore) ServiceAccounts(namespace string) unversioned.ServiceAccountInterface { +func (c *FakeCore) ServiceAccounts(namespace string) internalversion.ServiceAccountInterface { return &FakeServiceAccounts{c, namespace} } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_endpoints.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_endpoints.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_endpoints.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_endpoints.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_event.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_event.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_event_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event_expansion.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_event_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_event_expansion.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_limitrange.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_limitrange.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_limitrange.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_limitrange.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_namespace.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_namespace.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_namespace_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace_expansion.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_namespace_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_namespace_expansion.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_node.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_node.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_node_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node_expansion.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_node_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_node_expansion.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_persistentvolume.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolume.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_persistentvolume.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolume.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_persistentvolumeclaim.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolumeclaim.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_persistentvolumeclaim.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_persistentvolumeclaim.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_pod.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_pod.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_pod_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod_expansion.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_pod_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_pod_expansion.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_podtemplate.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_podtemplate.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_podtemplate.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_podtemplate.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_replicationcontroller.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_replicationcontroller.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_replicationcontroller.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_replicationcontroller.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_resourcequota.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_resourcequota.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_resourcequota.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_resourcequota.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_secret.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_secret.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_secret.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_secret.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_service.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_service.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_service_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service_expansion.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_service_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_service_expansion.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_serviceaccount.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_serviceaccount.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake/fake_serviceaccount.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake/fake_serviceaccount.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/generated_expansion.go similarity index 97% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/generated_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/generated_expansion.go index 25241159766..39ad1b2fe39 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/generated_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/generated_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion type ComponentStatusExpansion interface{} diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/limitrange.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/limitrange.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go index dfbf0a64678..51c7b799a21 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/limitrange.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/namespace.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/namespace.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go index fb75e5e7b2d..b94a2aa27f3 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/namespace.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/namespace_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace_expansion.go similarity index 98% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/namespace_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace_expansion.go index 15049da11fa..456de1cdfcd 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/namespace_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/node.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/node.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go index b7929427fa9..ebf6d77e079 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/node.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/node_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node_expansion.go similarity index 98% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/node_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node_expansion.go index 767f157b82e..ec917502d0b 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/node_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolume.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolume.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go index ceea642bfc2..dd63e5d01d0 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolume.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolumeclaim.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolumeclaim.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go index 589967b872e..ff87b85e007 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/persistentvolumeclaim.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/pod.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/pod.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go index 1ce3747d68e..1495f1ea0c9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/pod.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/pod_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod_expansion.go similarity index 98% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/pod_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod_expansion.go index a72b843246e..be7dd3a711a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/pod_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/podtemplate.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/podtemplate.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go index e5d6f7b4358..a610e4db2b2 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/podtemplate.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/replicationcontroller.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/replicationcontroller.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go index dcaa7e02de9..58f97f9181a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/replicationcontroller.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/resourcequota.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/resourcequota.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go index c1c8db9dfce..254a7361f9a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/resourcequota.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/secret.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go similarity index 99% rename from federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/secret.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go index a937f8f4b75..6fb40f5a6ed 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/secret.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/service.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/service.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go index 97680b33202..2e912e4b1d7 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/service.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/service_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service_expansion.go similarity index 98% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/service_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service_expansion.go index de8f21c6255..7a7c1daeebb 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/service_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/serviceaccount.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/core/unversioned/serviceaccount.go rename to pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go index 93995242825..1ace7261986 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/serviceaccount.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/doc.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/doc.go deleted file mode 100644 index 1e6a8ff827b..00000000000 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// This package is generated by client-gen with the default arguments. - -// This package has the automatically generated typed clients. -package unversioned diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/BUILD b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/daemonset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go similarity index 99% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/daemonset.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go index 75ba112abbe..c219deddb97 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/daemonset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/deployment.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go similarity index 99% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/deployment.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go index f008b338011..7da091b6c24 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/deployment.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/deployment_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment_expansion.go similarity index 97% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/deployment_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment_expansion.go index 4d89330f848..f8d7a1c6341 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/deployment_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import "k8s.io/kubernetes/pkg/apis/extensions" diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/doc.go new file mode 100644 index 00000000000..d908962a44c --- /dev/null +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with the default arguments. + +// This package has the automatically generated typed clients. +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/extensions_client.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go similarity index 97% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/extensions_client.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go index f081c8357ce..99bf3b59779 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/extensions_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -34,7 +34,7 @@ type ExtensionsInterface interface { ThirdPartyResourcesGetter } -// ExtensionsClient is used to interact with features provided by the Extensions group. +// ExtensionsClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type ExtensionsClient struct { restClient restclient.Interface } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/BUILD similarity index 95% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/BUILD index 09be838aed8..2b21d6406fc 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/BUILD @@ -31,7 +31,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/doc.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/doc.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_daemonset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_daemonset.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_daemonset.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_deployment.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_deployment.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_deployment_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment_expansion.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_deployment_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_deployment_expansion.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go similarity index 60% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go index 3670a2960de..9ab490eb13e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_extensions_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_extensions_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" + internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,35 +26,35 @@ type FakeExtensions struct { *core.Fake } -func (c *FakeExtensions) DaemonSets(namespace string) unversioned.DaemonSetInterface { +func (c *FakeExtensions) DaemonSets(namespace string) internalversion.DaemonSetInterface { return &FakeDaemonSets{c, namespace} } -func (c *FakeExtensions) Deployments(namespace string) unversioned.DeploymentInterface { +func (c *FakeExtensions) Deployments(namespace string) internalversion.DeploymentInterface { return &FakeDeployments{c, namespace} } -func (c *FakeExtensions) Ingresses(namespace string) unversioned.IngressInterface { +func (c *FakeExtensions) Ingresses(namespace string) internalversion.IngressInterface { return &FakeIngresses{c, namespace} } -func (c *FakeExtensions) NetworkPolicies(namespace string) unversioned.NetworkPolicyInterface { +func (c *FakeExtensions) NetworkPolicies(namespace string) internalversion.NetworkPolicyInterface { return &FakeNetworkPolicies{c, namespace} } -func (c *FakeExtensions) PodSecurityPolicies() unversioned.PodSecurityPolicyInterface { +func (c *FakeExtensions) PodSecurityPolicies() internalversion.PodSecurityPolicyInterface { return &FakePodSecurityPolicies{c} } -func (c *FakeExtensions) ReplicaSets(namespace string) unversioned.ReplicaSetInterface { +func (c *FakeExtensions) ReplicaSets(namespace string) internalversion.ReplicaSetInterface { return &FakeReplicaSets{c, namespace} } -func (c *FakeExtensions) Scales(namespace string) unversioned.ScaleInterface { +func (c *FakeExtensions) Scales(namespace string) internalversion.ScaleInterface { return &FakeScales{c, namespace} } -func (c *FakeExtensions) ThirdPartyResources() unversioned.ThirdPartyResourceInterface { +func (c *FakeExtensions) ThirdPartyResources() internalversion.ThirdPartyResourceInterface { return &FakeThirdPartyResources{c} } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_ingress.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_ingress.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_ingress.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_ingress.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_networkpolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_networkpolicy.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_networkpolicy.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_networkpolicy.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_podsecuritypolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_podsecuritypolicy.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_podsecuritypolicy.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_podsecuritypolicy.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_replicaset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_replicaset.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_replicaset.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_scale.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_scale.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_scale.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_scale.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_scale_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_scale_expansion.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_scale_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_scale_expansion.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_thirdpartyresource.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_thirdpartyresource.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake/fake_thirdpartyresource.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake/fake_thirdpartyresource.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/generated_expansion.go similarity index 97% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/generated_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/generated_expansion.go index 6a140557512..070aeeaa603 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/generated_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/generated_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion type DaemonSetExpansion interface{} diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/ingress.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go similarity index 99% rename from federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/ingress.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go index 0fdfc118b8f..2b031e9ae24 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/ingress.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/networkpolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/networkpolicy.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go index 91e737d91dd..40127cf1175 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/networkpolicy.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/podsecuritypolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/podsecuritypolicy.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go index a491802240a..cffa9e874fa 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/podsecuritypolicy.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/replicaset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/replicaset.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go index 804f2d7f2a2..02d386574b7 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/replicaset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/scale.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/scale.go similarity index 98% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/scale.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/scale.go index 94bafbdfaa9..f1e703c3d40 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/scale.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/scale.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( restclient "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/scale_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/scale_expansion.go similarity index 98% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/scale_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/scale_expansion.go index 8dbba79e3fe..6b1e64dd865 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/scale_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/scale_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( "k8s.io/kubernetes/pkg/api/meta" diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/thirdpartyresource.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/thirdpartyresource.go rename to pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go index 6f2e8d65061..a3056f330ac 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/thirdpartyresource.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/doc.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/doc.go deleted file mode 100644 index 1e6a8ff827b..00000000000 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// This package is generated by client-gen with the default arguments. - -// This package has the automatically generated typed clients. -package unversioned diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/BUILD b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/doc.go new file mode 100644 index 00000000000..d908962a44c --- /dev/null +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with the default arguments. + +// This package has the automatically generated typed clients. +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/BUILD similarity index 94% rename from pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/BUILD index e4bad3cc1b5..d7627220e87 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/BUILD @@ -22,7 +22,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/apis/policy:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/policy/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/doc.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/doc.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/fake_poddisruptionbudget.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_poddisruptionbudget.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/fake_poddisruptionbudget.go rename to pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_poddisruptionbudget.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/fake_policy_client.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_policy_client.go similarity index 81% rename from pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/fake_policy_client.go rename to pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_policy_client.go index e019322b61b..4eba902cfdd 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/fake/fake_policy_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_policy_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned" + internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,7 +26,7 @@ type FakePolicy struct { *core.Fake } -func (c *FakePolicy) PodDisruptionBudgets(namespace string) unversioned.PodDisruptionBudgetInterface { +func (c *FakePolicy) PodDisruptionBudgets(namespace string) internalversion.PodDisruptionBudgetInterface { return &FakePodDisruptionBudgets{c, namespace} } diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/generated_expansion.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/generated_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/generated_expansion.go index e0c814fcf83..f60d699df6d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/generated_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/generated_expansion.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion type PodDisruptionBudgetExpansion interface{} diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/poddisruptionbudget.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/poddisruptionbudget.go rename to pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go index 1c8c91ede1c..d71984dbad8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/poddisruptionbudget.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/policy_client.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/policy_client.go rename to pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go index 6a6aa06e508..a3804959d0f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/policy_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -27,7 +27,7 @@ type PolicyInterface interface { PodDisruptionBudgetsGetter } -// PolicyClient is used to interact with features provided by the Policy group. +// PolicyClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type PolicyClient struct { restClient restclient.Interface } diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/doc.go b/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/doc.go deleted file mode 100644 index 1e6a8ff827b..00000000000 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// This package is generated by client-gen with the default arguments. - -// This package has the automatically generated typed clients. -package unversioned diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/BUILD b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrole.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrole.go rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go index 1037a6807e5..e595057e2f9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrole.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrolebinding.go rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go index 94ead7a98c4..92300ce2a61 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/clusterrolebinding.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/doc.go new file mode 100644 index 00000000000..d908962a44c --- /dev/null +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with the default arguments. + +// This package has the automatically generated typed clients. +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/BUILD similarity index 95% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/BUILD index eec0a61f0f1..6bd5c0179a0 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/BUILD @@ -25,7 +25,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/doc.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/doc.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_clusterrole.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrole.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_clusterrole.go rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrole.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_clusterrolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrolebinding.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_clusterrolebinding.go rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_clusterrolebinding.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_rbac_client.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rbac_client.go similarity index 71% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_rbac_client.go rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rbac_client.go index 682a2b58370..eba5b0375a4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_rbac_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rbac_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned" + internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,19 +26,19 @@ type FakeRbac struct { *core.Fake } -func (c *FakeRbac) ClusterRoles() unversioned.ClusterRoleInterface { +func (c *FakeRbac) ClusterRoles() internalversion.ClusterRoleInterface { return &FakeClusterRoles{c} } -func (c *FakeRbac) ClusterRoleBindings() unversioned.ClusterRoleBindingInterface { +func (c *FakeRbac) ClusterRoleBindings() internalversion.ClusterRoleBindingInterface { return &FakeClusterRoleBindings{c} } -func (c *FakeRbac) Roles(namespace string) unversioned.RoleInterface { +func (c *FakeRbac) Roles(namespace string) internalversion.RoleInterface { return &FakeRoles{c, namespace} } -func (c *FakeRbac) RoleBindings(namespace string) unversioned.RoleBindingInterface { +func (c *FakeRbac) RoleBindings(namespace string) internalversion.RoleBindingInterface { return &FakeRoleBindings{c, namespace} } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_role.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_role.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_role.go rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_role.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_rolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rolebinding.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake/fake_rolebinding.go rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake/fake_rolebinding.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/generated_expansion.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/generated_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/generated_expansion.go index cbb0192a164..bbdee22a351 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/generated_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/generated_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion type ClusterRoleExpansion interface{} diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rbac_client.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go similarity index 97% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rbac_client.go rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go index 731768c35a7..40dfd5a6307 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rbac_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -30,7 +30,7 @@ type RbacInterface interface { RoleBindingsGetter } -// RbacClient is used to interact with features provided by the Rbac group. +// RbacClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type RbacClient struct { restClient restclient.Interface } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/role.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/role.go rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go index 05140b23d91..1203535b47c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/role.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rolebinding.go rename to pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go index be6669f2e94..839aff4b0b1 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rolebinding.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/doc.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/doc.go deleted file mode 100644 index 1e6a8ff827b..00000000000 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// This package is generated by client-gen with the default arguments. - -// This package has the automatically generated typed clients. -package unversioned diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/BUILD b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/doc.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/doc.go new file mode 100644 index 00000000000..d908962a44c --- /dev/null +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with the default arguments. + +// This package has the automatically generated typed clients. +package internalversion diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/BUILD b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/BUILD similarity index 94% rename from pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/BUILD rename to pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/BUILD index b357370133e..73f10374410 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/BUILD @@ -22,7 +22,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/apis/storage:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/storage/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/storage/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/doc.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/doc.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/doc.go rename to pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/doc.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/fake_storage_client.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storage_client.go similarity index 83% rename from pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/fake_storage_client.go rename to pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storage_client.go index 64ba35ac5b5..37721e05107 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/fake_storage_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storage_client.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - unversioned "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned" + internalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion" restclient "k8s.io/kubernetes/pkg/client/restclient" core "k8s.io/kubernetes/pkg/client/testing/core" ) @@ -26,7 +26,7 @@ type FakeStorage struct { *core.Fake } -func (c *FakeStorage) StorageClasses() unversioned.StorageClassInterface { +func (c *FakeStorage) StorageClasses() internalversion.StorageClassInterface { return &FakeStorageClasses{c} } diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/fake_storageclass.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storageclass.go similarity index 100% rename from pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake/fake_storageclass.go rename to pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake/fake_storageclass.go diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/generated_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/generated_expansion.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/generated_expansion.go rename to pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/generated_expansion.go index 3d0155b2077..6b85162067a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/generated_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/generated_expansion.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion type StorageClassExpansion interface{} diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storage_client.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storage_client.go rename to pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go index f009cb0a4a2..75692f1afbd 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storage_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" @@ -27,7 +27,7 @@ type StorageInterface interface { StorageClassesGetter } -// StorageClient is used to interact with features provided by the Storage group. +// StorageClient is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. type StorageClient struct { restClient restclient.Interface } diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storageclass.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go similarity index 99% rename from pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storageclass.go rename to pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go index 8b4321cae75..4d2ece07885 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storageclass.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package internalversion import ( api "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/doc.go b/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/doc.go deleted file mode 100644 index 1e6a8ff827b..00000000000 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// This package is generated by client-gen with the default arguments. - -// This package has the automatically generated typed clients. -package unversioned diff --git a/pkg/client/clientset_generated/release_1_5/BUILD b/pkg/client/clientset_generated/release_1_5/BUILD index fd228815437..df1fef31d9f 100644 --- a/pkg/client/clientset_generated/release_1_5/BUILD +++ b/pkg/client/clientset_generated/release_1_5/BUILD @@ -36,6 +36,7 @@ go_library( "//pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/batch/v1:go_default_library", + "//pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/core/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1:go_default_library", diff --git a/pkg/client/clientset_generated/release_1_5/clientset.go b/pkg/client/clientset_generated/release_1_5/clientset.go index 77045f0d217..a0b36765cd1 100644 --- a/pkg/client/clientset_generated/release_1_5/clientset.go +++ b/pkg/client/clientset_generated/release_1_5/clientset.go @@ -23,6 +23,7 @@ import ( v1beta1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1" v1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1" v1batch "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/batch/v1" + v2alpha1batch "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1" v1alpha1certificates "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" v1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1" @@ -37,122 +38,254 @@ import ( type Interface interface { Discovery() discovery.DiscoveryInterface - Core() v1core.CoreInterface - Apps() v1alpha1apps.AppsInterface - Authentication() v1beta1authentication.AuthenticationInterface - Authorization() v1beta1authorization.AuthorizationInterface - Autoscaling() v1autoscaling.AutoscalingInterface - Batch() v1batch.BatchInterface - Certificates() v1alpha1certificates.CertificatesInterface - Extensions() v1beta1extensions.ExtensionsInterface - Policy() v1alpha1policy.PolicyInterface - Rbac() v1alpha1rbac.RbacInterface - Storage() v1beta1storage.StorageInterface + CoreV1() v1core.CoreV1Interface + // Deprecated: please explicitly pick a version if possible. + Core() v1core.CoreV1Interface + AppsV1alpha1() v1alpha1apps.AppsV1alpha1Interface + // Deprecated: please explicitly pick a version if possible. + Apps() v1alpha1apps.AppsV1alpha1Interface + AuthenticationV1beta1() v1beta1authentication.AuthenticationV1beta1Interface + // Deprecated: please explicitly pick a version if possible. + Authentication() v1beta1authentication.AuthenticationV1beta1Interface + AuthorizationV1beta1() v1beta1authorization.AuthorizationV1beta1Interface + // Deprecated: please explicitly pick a version if possible. + Authorization() v1beta1authorization.AuthorizationV1beta1Interface + AutoscalingV1() v1autoscaling.AutoscalingV1Interface + // Deprecated: please explicitly pick a version if possible. + Autoscaling() v1autoscaling.AutoscalingV1Interface + BatchV1() v1batch.BatchV1Interface + // Deprecated: please explicitly pick a version if possible. + Batch() v1batch.BatchV1Interface + BatchV2alpha1() v2alpha1batch.BatchV2alpha1Interface + + CertificatesV1alpha1() v1alpha1certificates.CertificatesV1alpha1Interface + // Deprecated: please explicitly pick a version if possible. + Certificates() v1alpha1certificates.CertificatesV1alpha1Interface + ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Interface + // Deprecated: please explicitly pick a version if possible. + Extensions() v1beta1extensions.ExtensionsV1beta1Interface + PolicyV1alpha1() v1alpha1policy.PolicyV1alpha1Interface + // Deprecated: please explicitly pick a version if possible. + Policy() v1alpha1policy.PolicyV1alpha1Interface + RbacV1alpha1() v1alpha1rbac.RbacV1alpha1Interface + // Deprecated: please explicitly pick a version if possible. + Rbac() v1alpha1rbac.RbacV1alpha1Interface + StorageV1beta1() v1beta1storage.StorageV1beta1Interface + // Deprecated: please explicitly pick a version if possible. + Storage() v1beta1storage.StorageV1beta1Interface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *v1core.CoreClient - *v1alpha1apps.AppsClient - *v1beta1authentication.AuthenticationClient - *v1beta1authorization.AuthorizationClient - *v1autoscaling.AutoscalingClient - *v1batch.BatchClient - *v1alpha1certificates.CertificatesClient - *v1beta1extensions.ExtensionsClient - *v1alpha1policy.PolicyClient - *v1alpha1rbac.RbacClient - *v1beta1storage.StorageClient + *v1core.CoreV1Client + *v1alpha1apps.AppsV1alpha1Client + *v1beta1authentication.AuthenticationV1beta1Client + *v1beta1authorization.AuthorizationV1beta1Client + *v1autoscaling.AutoscalingV1Client + *v1batch.BatchV1Client + *v2alpha1batch.BatchV2alpha1Client + *v1alpha1certificates.CertificatesV1alpha1Client + *v1beta1extensions.ExtensionsV1beta1Client + *v1alpha1policy.PolicyV1alpha1Client + *v1alpha1rbac.RbacV1alpha1Client + *v1beta1storage.StorageV1beta1Client } -// Core retrieves the CoreClient -func (c *Clientset) Core() v1core.CoreInterface { +// CoreV1 retrieves the CoreV1Client +func (c *Clientset) CoreV1() v1core.CoreV1Interface { if c == nil { return nil } - return c.CoreClient + return c.CoreV1Client } -// Apps retrieves the AppsClient -func (c *Clientset) Apps() v1alpha1apps.AppsInterface { +// Deprecated: Core retrieves the default version of CoreClient. +// Please explicitly pick a version. +func (c *Clientset) Core() v1core.CoreV1Interface { if c == nil { return nil } - return c.AppsClient + return c.CoreV1Client } -// Authentication retrieves the AuthenticationClient -func (c *Clientset) Authentication() v1beta1authentication.AuthenticationInterface { +// AppsV1alpha1 retrieves the AppsV1alpha1Client +func (c *Clientset) AppsV1alpha1() v1alpha1apps.AppsV1alpha1Interface { if c == nil { return nil } - return c.AuthenticationClient + return c.AppsV1alpha1Client } -// Authorization retrieves the AuthorizationClient -func (c *Clientset) Authorization() v1beta1authorization.AuthorizationInterface { +// Deprecated: Apps retrieves the default version of AppsClient. +// Please explicitly pick a version. +func (c *Clientset) Apps() v1alpha1apps.AppsV1alpha1Interface { if c == nil { return nil } - return c.AuthorizationClient + return c.AppsV1alpha1Client } -// Autoscaling retrieves the AutoscalingClient -func (c *Clientset) Autoscaling() v1autoscaling.AutoscalingInterface { +// AuthenticationV1beta1 retrieves the AuthenticationV1beta1Client +func (c *Clientset) AuthenticationV1beta1() v1beta1authentication.AuthenticationV1beta1Interface { if c == nil { return nil } - return c.AutoscalingClient + return c.AuthenticationV1beta1Client } -// Batch retrieves the BatchClient -func (c *Clientset) Batch() v1batch.BatchInterface { +// Deprecated: Authentication retrieves the default version of AuthenticationClient. +// Please explicitly pick a version. +func (c *Clientset) Authentication() v1beta1authentication.AuthenticationV1beta1Interface { if c == nil { return nil } - return c.BatchClient + return c.AuthenticationV1beta1Client } -// Certificates retrieves the CertificatesClient -func (c *Clientset) Certificates() v1alpha1certificates.CertificatesInterface { +// AuthorizationV1beta1 retrieves the AuthorizationV1beta1Client +func (c *Clientset) AuthorizationV1beta1() v1beta1authorization.AuthorizationV1beta1Interface { if c == nil { return nil } - return c.CertificatesClient + return c.AuthorizationV1beta1Client } -// Extensions retrieves the ExtensionsClient -func (c *Clientset) Extensions() v1beta1extensions.ExtensionsInterface { +// Deprecated: Authorization retrieves the default version of AuthorizationClient. +// Please explicitly pick a version. +func (c *Clientset) Authorization() v1beta1authorization.AuthorizationV1beta1Interface { if c == nil { return nil } - return c.ExtensionsClient + return c.AuthorizationV1beta1Client } -// Policy retrieves the PolicyClient -func (c *Clientset) Policy() v1alpha1policy.PolicyInterface { +// AutoscalingV1 retrieves the AutoscalingV1Client +func (c *Clientset) AutoscalingV1() v1autoscaling.AutoscalingV1Interface { if c == nil { return nil } - return c.PolicyClient + return c.AutoscalingV1Client } -// Rbac retrieves the RbacClient -func (c *Clientset) Rbac() v1alpha1rbac.RbacInterface { +// Deprecated: Autoscaling retrieves the default version of AutoscalingClient. +// Please explicitly pick a version. +func (c *Clientset) Autoscaling() v1autoscaling.AutoscalingV1Interface { if c == nil { return nil } - return c.RbacClient + return c.AutoscalingV1Client } -// Storage retrieves the StorageClient -func (c *Clientset) Storage() v1beta1storage.StorageInterface { +// BatchV1 retrieves the BatchV1Client +func (c *Clientset) BatchV1() v1batch.BatchV1Interface { if c == nil { return nil } - return c.StorageClient + return c.BatchV1Client +} + +// Deprecated: Batch retrieves the default version of BatchClient. +// Please explicitly pick a version. +func (c *Clientset) Batch() v1batch.BatchV1Interface { + if c == nil { + return nil + } + return c.BatchV1Client +} + +// BatchV2alpha1 retrieves the BatchV2alpha1Client +func (c *Clientset) BatchV2alpha1() v2alpha1batch.BatchV2alpha1Interface { + if c == nil { + return nil + } + return c.BatchV2alpha1Client +} + +// CertificatesV1alpha1 retrieves the CertificatesV1alpha1Client +func (c *Clientset) CertificatesV1alpha1() v1alpha1certificates.CertificatesV1alpha1Interface { + if c == nil { + return nil + } + return c.CertificatesV1alpha1Client +} + +// Deprecated: Certificates retrieves the default version of CertificatesClient. +// Please explicitly pick a version. +func (c *Clientset) Certificates() v1alpha1certificates.CertificatesV1alpha1Interface { + if c == nil { + return nil + } + return c.CertificatesV1alpha1Client +} + +// ExtensionsV1beta1 retrieves the ExtensionsV1beta1Client +func (c *Clientset) ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Interface { + if c == nil { + return nil + } + return c.ExtensionsV1beta1Client +} + +// Deprecated: Extensions retrieves the default version of ExtensionsClient. +// Please explicitly pick a version. +func (c *Clientset) Extensions() v1beta1extensions.ExtensionsV1beta1Interface { + if c == nil { + return nil + } + return c.ExtensionsV1beta1Client +} + +// PolicyV1alpha1 retrieves the PolicyV1alpha1Client +func (c *Clientset) PolicyV1alpha1() v1alpha1policy.PolicyV1alpha1Interface { + if c == nil { + return nil + } + return c.PolicyV1alpha1Client +} + +// Deprecated: Policy retrieves the default version of PolicyClient. +// Please explicitly pick a version. +func (c *Clientset) Policy() v1alpha1policy.PolicyV1alpha1Interface { + if c == nil { + return nil + } + return c.PolicyV1alpha1Client +} + +// RbacV1alpha1 retrieves the RbacV1alpha1Client +func (c *Clientset) RbacV1alpha1() v1alpha1rbac.RbacV1alpha1Interface { + if c == nil { + return nil + } + return c.RbacV1alpha1Client +} + +// Deprecated: Rbac retrieves the default version of RbacClient. +// Please explicitly pick a version. +func (c *Clientset) Rbac() v1alpha1rbac.RbacV1alpha1Interface { + if c == nil { + return nil + } + return c.RbacV1alpha1Client +} + +// StorageV1beta1 retrieves the StorageV1beta1Client +func (c *Clientset) StorageV1beta1() v1beta1storage.StorageV1beta1Interface { + if c == nil { + return nil + } + return c.StorageV1beta1Client +} + +// Deprecated: Storage retrieves the default version of StorageClient. +// Please explicitly pick a version. +func (c *Clientset) Storage() v1beta1storage.StorageV1beta1Interface { + if c == nil { + return nil + } + return c.StorageV1beta1Client } // Discovery retrieves the DiscoveryClient @@ -168,47 +301,51 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { } var clientset Clientset var err error - clientset.CoreClient, err = v1core.NewForConfig(&configShallowCopy) + clientset.CoreV1Client, err = v1core.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.AppsClient, err = v1alpha1apps.NewForConfig(&configShallowCopy) + clientset.AppsV1alpha1Client, err = v1alpha1apps.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.AuthenticationClient, err = v1beta1authentication.NewForConfig(&configShallowCopy) + clientset.AuthenticationV1beta1Client, err = v1beta1authentication.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.AuthorizationClient, err = v1beta1authorization.NewForConfig(&configShallowCopy) + clientset.AuthorizationV1beta1Client, err = v1beta1authorization.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.AutoscalingClient, err = v1autoscaling.NewForConfig(&configShallowCopy) + clientset.AutoscalingV1Client, err = v1autoscaling.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.BatchClient, err = v1batch.NewForConfig(&configShallowCopy) + clientset.BatchV1Client, err = v1batch.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.CertificatesClient, err = v1alpha1certificates.NewForConfig(&configShallowCopy) + clientset.BatchV2alpha1Client, err = v2alpha1batch.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.ExtensionsClient, err = v1beta1extensions.NewForConfig(&configShallowCopy) + clientset.CertificatesV1alpha1Client, err = v1alpha1certificates.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.PolicyClient, err = v1alpha1policy.NewForConfig(&configShallowCopy) + clientset.ExtensionsV1beta1Client, err = v1beta1extensions.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.RbacClient, err = v1alpha1rbac.NewForConfig(&configShallowCopy) + clientset.PolicyV1alpha1Client, err = v1alpha1policy.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - clientset.StorageClient, err = v1beta1storage.NewForConfig(&configShallowCopy) + clientset.RbacV1alpha1Client, err = v1alpha1rbac.NewForConfig(&configShallowCopy) + if err != nil { + return nil, err + } + clientset.StorageV1beta1Client, err = v1beta1storage.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -225,17 +362,18 @@ func NewForConfig(c *restclient.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *restclient.Config) *Clientset { var clientset Clientset - clientset.CoreClient = v1core.NewForConfigOrDie(c) - clientset.AppsClient = v1alpha1apps.NewForConfigOrDie(c) - clientset.AuthenticationClient = v1beta1authentication.NewForConfigOrDie(c) - clientset.AuthorizationClient = v1beta1authorization.NewForConfigOrDie(c) - clientset.AutoscalingClient = v1autoscaling.NewForConfigOrDie(c) - clientset.BatchClient = v1batch.NewForConfigOrDie(c) - clientset.CertificatesClient = v1alpha1certificates.NewForConfigOrDie(c) - clientset.ExtensionsClient = v1beta1extensions.NewForConfigOrDie(c) - clientset.PolicyClient = v1alpha1policy.NewForConfigOrDie(c) - clientset.RbacClient = v1alpha1rbac.NewForConfigOrDie(c) - clientset.StorageClient = v1beta1storage.NewForConfigOrDie(c) + clientset.CoreV1Client = v1core.NewForConfigOrDie(c) + clientset.AppsV1alpha1Client = v1alpha1apps.NewForConfigOrDie(c) + clientset.AuthenticationV1beta1Client = v1beta1authentication.NewForConfigOrDie(c) + clientset.AuthorizationV1beta1Client = v1beta1authorization.NewForConfigOrDie(c) + clientset.AutoscalingV1Client = v1autoscaling.NewForConfigOrDie(c) + clientset.BatchV1Client = v1batch.NewForConfigOrDie(c) + clientset.BatchV2alpha1Client = v2alpha1batch.NewForConfigOrDie(c) + clientset.CertificatesV1alpha1Client = v1alpha1certificates.NewForConfigOrDie(c) + clientset.ExtensionsV1beta1Client = v1beta1extensions.NewForConfigOrDie(c) + clientset.PolicyV1alpha1Client = v1alpha1policy.NewForConfigOrDie(c) + clientset.RbacV1alpha1Client = v1alpha1rbac.NewForConfigOrDie(c) + clientset.StorageV1beta1Client = v1beta1storage.NewForConfigOrDie(c) clientset.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &clientset @@ -244,17 +382,18 @@ func NewForConfigOrDie(c *restclient.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c restclient.Interface) *Clientset { var clientset Clientset - clientset.CoreClient = v1core.New(c) - clientset.AppsClient = v1alpha1apps.New(c) - clientset.AuthenticationClient = v1beta1authentication.New(c) - clientset.AuthorizationClient = v1beta1authorization.New(c) - clientset.AutoscalingClient = v1autoscaling.New(c) - clientset.BatchClient = v1batch.New(c) - clientset.CertificatesClient = v1alpha1certificates.New(c) - clientset.ExtensionsClient = v1beta1extensions.New(c) - clientset.PolicyClient = v1alpha1policy.New(c) - clientset.RbacClient = v1alpha1rbac.New(c) - clientset.StorageClient = v1beta1storage.New(c) + clientset.CoreV1Client = v1core.New(c) + clientset.AppsV1alpha1Client = v1alpha1apps.New(c) + clientset.AuthenticationV1beta1Client = v1beta1authentication.New(c) + clientset.AuthorizationV1beta1Client = v1beta1authorization.New(c) + clientset.AutoscalingV1Client = v1autoscaling.New(c) + clientset.BatchV1Client = v1batch.New(c) + clientset.BatchV2alpha1Client = v2alpha1batch.New(c) + clientset.CertificatesV1alpha1Client = v1alpha1certificates.New(c) + clientset.ExtensionsV1beta1Client = v1beta1extensions.New(c) + clientset.PolicyV1alpha1Client = v1alpha1policy.New(c) + clientset.RbacV1alpha1Client = v1alpha1rbac.New(c) + clientset.StorageV1beta1Client = v1beta1storage.New(c) clientset.DiscoveryClient = discovery.NewDiscoveryClient(c) return &clientset diff --git a/pkg/client/clientset_generated/release_1_5/doc.go b/pkg/client/clientset_generated/release_1_5/doc.go index 8a05f023d71..1ef4bac9dfd 100644 --- a/pkg/client/clientset_generated/release_1_5/doc.go +++ b/pkg/client/clientset_generated/release_1_5/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated clientset. package release_1_5 diff --git a/pkg/client/clientset_generated/release_1_5/fake/BUILD b/pkg/client/clientset_generated/release_1_5/fake/BUILD index 14b7989605b..9b27a49dc35 100644 --- a/pkg/client/clientset_generated/release_1_5/fake/BUILD +++ b/pkg/client/clientset_generated/release_1_5/fake/BUILD @@ -31,6 +31,8 @@ go_library( "//pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/batch/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake:go_default_library", + "//pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1:go_default_library", + "//pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/core/v1:go_default_library", diff --git a/pkg/client/clientset_generated/release_1_5/fake/clientset_generated.go b/pkg/client/clientset_generated/release_1_5/fake/clientset_generated.go index 9e9befffea2..bc72f452a2a 100644 --- a/pkg/client/clientset_generated/release_1_5/fake/clientset_generated.go +++ b/pkg/client/clientset_generated/release_1_5/fake/clientset_generated.go @@ -30,6 +30,8 @@ import ( fakev1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake" v1batch "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/batch/v1" fakev1batch "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake" + v2alpha1batch "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1" + fakev2alpha1batch "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake" v1alpha1certificates "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1" fakev1alpha1certificates "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" @@ -82,57 +84,117 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} -// Core retrieves the CoreClient -func (c *Clientset) Core() v1core.CoreInterface { - return &fakev1core.FakeCore{Fake: &c.Fake} +// CoreV1 retrieves the CoreV1Client +func (c *Clientset) CoreV1() v1core.CoreV1Interface { + return &fakev1core.FakeCoreV1{Fake: &c.Fake} } -// Apps retrieves the AppsClient -func (c *Clientset) Apps() v1alpha1apps.AppsInterface { - return &fakev1alpha1apps.FakeApps{Fake: &c.Fake} +// Core retrieves the CoreV1Client +func (c *Clientset) Core() v1core.CoreV1Interface { + return &fakev1core.FakeCoreV1{Fake: &c.Fake} } -// Authentication retrieves the AuthenticationClient -func (c *Clientset) Authentication() v1beta1authentication.AuthenticationInterface { - return &fakev1beta1authentication.FakeAuthentication{Fake: &c.Fake} +// AppsV1alpha1 retrieves the AppsV1alpha1Client +func (c *Clientset) AppsV1alpha1() v1alpha1apps.AppsV1alpha1Interface { + return &fakev1alpha1apps.FakeAppsV1alpha1{Fake: &c.Fake} } -// Authorization retrieves the AuthorizationClient -func (c *Clientset) Authorization() v1beta1authorization.AuthorizationInterface { - return &fakev1beta1authorization.FakeAuthorization{Fake: &c.Fake} +// Apps retrieves the AppsV1alpha1Client +func (c *Clientset) Apps() v1alpha1apps.AppsV1alpha1Interface { + return &fakev1alpha1apps.FakeAppsV1alpha1{Fake: &c.Fake} } -// Autoscaling retrieves the AutoscalingClient -func (c *Clientset) Autoscaling() v1autoscaling.AutoscalingInterface { - return &fakev1autoscaling.FakeAutoscaling{Fake: &c.Fake} +// AuthenticationV1beta1 retrieves the AuthenticationV1beta1Client +func (c *Clientset) AuthenticationV1beta1() v1beta1authentication.AuthenticationV1beta1Interface { + return &fakev1beta1authentication.FakeAuthenticationV1beta1{Fake: &c.Fake} } -// Batch retrieves the BatchClient -func (c *Clientset) Batch() v1batch.BatchInterface { - return &fakev1batch.FakeBatch{Fake: &c.Fake} +// Authentication retrieves the AuthenticationV1beta1Client +func (c *Clientset) Authentication() v1beta1authentication.AuthenticationV1beta1Interface { + return &fakev1beta1authentication.FakeAuthenticationV1beta1{Fake: &c.Fake} } -// Certificates retrieves the CertificatesClient -func (c *Clientset) Certificates() v1alpha1certificates.CertificatesInterface { - return &fakev1alpha1certificates.FakeCertificates{Fake: &c.Fake} +// AuthorizationV1beta1 retrieves the AuthorizationV1beta1Client +func (c *Clientset) AuthorizationV1beta1() v1beta1authorization.AuthorizationV1beta1Interface { + return &fakev1beta1authorization.FakeAuthorizationV1beta1{Fake: &c.Fake} } -// Extensions retrieves the ExtensionsClient -func (c *Clientset) Extensions() v1beta1extensions.ExtensionsInterface { - return &fakev1beta1extensions.FakeExtensions{Fake: &c.Fake} +// Authorization retrieves the AuthorizationV1beta1Client +func (c *Clientset) Authorization() v1beta1authorization.AuthorizationV1beta1Interface { + return &fakev1beta1authorization.FakeAuthorizationV1beta1{Fake: &c.Fake} } -// Policy retrieves the PolicyClient -func (c *Clientset) Policy() v1alpha1policy.PolicyInterface { - return &fakev1alpha1policy.FakePolicy{Fake: &c.Fake} +// AutoscalingV1 retrieves the AutoscalingV1Client +func (c *Clientset) AutoscalingV1() v1autoscaling.AutoscalingV1Interface { + return &fakev1autoscaling.FakeAutoscalingV1{Fake: &c.Fake} } -// Rbac retrieves the RbacClient -func (c *Clientset) Rbac() v1alpha1rbac.RbacInterface { - return &fakev1alpha1rbac.FakeRbac{Fake: &c.Fake} +// Autoscaling retrieves the AutoscalingV1Client +func (c *Clientset) Autoscaling() v1autoscaling.AutoscalingV1Interface { + return &fakev1autoscaling.FakeAutoscalingV1{Fake: &c.Fake} } -// Storage retrieves the StorageClient -func (c *Clientset) Storage() v1beta1storage.StorageInterface { - return &fakev1beta1storage.FakeStorage{Fake: &c.Fake} +// BatchV1 retrieves the BatchV1Client +func (c *Clientset) BatchV1() v1batch.BatchV1Interface { + return &fakev1batch.FakeBatchV1{Fake: &c.Fake} +} + +// Batch retrieves the BatchV1Client +func (c *Clientset) Batch() v1batch.BatchV1Interface { + return &fakev1batch.FakeBatchV1{Fake: &c.Fake} +} + +// BatchV2alpha1 retrieves the BatchV2alpha1Client +func (c *Clientset) BatchV2alpha1() v2alpha1batch.BatchV2alpha1Interface { + return &fakev2alpha1batch.FakeBatchV2alpha1{Fake: &c.Fake} +} + +// CertificatesV1alpha1 retrieves the CertificatesV1alpha1Client +func (c *Clientset) CertificatesV1alpha1() v1alpha1certificates.CertificatesV1alpha1Interface { + return &fakev1alpha1certificates.FakeCertificatesV1alpha1{Fake: &c.Fake} +} + +// Certificates retrieves the CertificatesV1alpha1Client +func (c *Clientset) Certificates() v1alpha1certificates.CertificatesV1alpha1Interface { + return &fakev1alpha1certificates.FakeCertificatesV1alpha1{Fake: &c.Fake} +} + +// ExtensionsV1beta1 retrieves the ExtensionsV1beta1Client +func (c *Clientset) ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Interface { + return &fakev1beta1extensions.FakeExtensionsV1beta1{Fake: &c.Fake} +} + +// Extensions retrieves the ExtensionsV1beta1Client +func (c *Clientset) Extensions() v1beta1extensions.ExtensionsV1beta1Interface { + return &fakev1beta1extensions.FakeExtensionsV1beta1{Fake: &c.Fake} +} + +// PolicyV1alpha1 retrieves the PolicyV1alpha1Client +func (c *Clientset) PolicyV1alpha1() v1alpha1policy.PolicyV1alpha1Interface { + return &fakev1alpha1policy.FakePolicyV1alpha1{Fake: &c.Fake} +} + +// Policy retrieves the PolicyV1alpha1Client +func (c *Clientset) Policy() v1alpha1policy.PolicyV1alpha1Interface { + return &fakev1alpha1policy.FakePolicyV1alpha1{Fake: &c.Fake} +} + +// RbacV1alpha1 retrieves the RbacV1alpha1Client +func (c *Clientset) RbacV1alpha1() v1alpha1rbac.RbacV1alpha1Interface { + return &fakev1alpha1rbac.FakeRbacV1alpha1{Fake: &c.Fake} +} + +// Rbac retrieves the RbacV1alpha1Client +func (c *Clientset) Rbac() v1alpha1rbac.RbacV1alpha1Interface { + return &fakev1alpha1rbac.FakeRbacV1alpha1{Fake: &c.Fake} +} + +// StorageV1beta1 retrieves the StorageV1beta1Client +func (c *Clientset) StorageV1beta1() v1beta1storage.StorageV1beta1Interface { + return &fakev1beta1storage.FakeStorageV1beta1{Fake: &c.Fake} +} + +// Storage retrieves the StorageV1beta1Client +func (c *Clientset) Storage() v1beta1storage.StorageV1beta1Interface { + return &fakev1beta1storage.FakeStorageV1beta1{Fake: &c.Fake} } diff --git a/pkg/client/clientset_generated/release_1_5/fake/doc.go b/pkg/client/clientset_generated/release_1_5/fake/doc.go index f849c0cdaac..c956bde094e 100644 --- a/pkg/client/clientset_generated/release_1_5/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated fake clientset. package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/BUILD b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/BUILD index a6a3d0b5fa0..de22ef4a3d3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/BUILD +++ b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/BUILD @@ -21,6 +21,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/apps/v1alpha1:go_default_library", diff --git a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/apps_client.go b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/apps_client.go index 03eac997163..a1ddf9f487a 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/apps_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/apps_client.go @@ -17,28 +17,30 @@ limitations under the License. package v1alpha1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type AppsInterface interface { +type AppsV1alpha1Interface interface { RESTClient() restclient.Interface StatefulSetsGetter } -// AppsClient is used to interact with features provided by the Apps group. -type AppsClient struct { +// AppsV1alpha1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type AppsV1alpha1Client struct { restClient restclient.Interface } -func (c *AppsClient) StatefulSets(namespace string) StatefulSetInterface { +func (c *AppsV1alpha1Client) StatefulSets(namespace string) StatefulSetInterface { return newStatefulSets(c, namespace) } -// NewForConfig creates a new AppsClient for the given config. -func NewForConfig(c *restclient.Config) (*AppsClient, error) { +// NewForConfig creates a new AppsV1alpha1Client for the given config. +func NewForConfig(c *restclient.Config) (*AppsV1alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -47,12 +49,12 @@ func NewForConfig(c *restclient.Config) (*AppsClient, error) { if err != nil { return nil, err } - return &AppsClient{client}, nil + return &AppsV1alpha1Client{client}, nil } -// NewForConfigOrDie creates a new AppsClient for the given config and +// NewForConfigOrDie creates a new AppsV1alpha1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *AppsClient { +func NewForConfigOrDie(c *restclient.Config) *AppsV1alpha1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -60,26 +62,26 @@ func NewForConfigOrDie(c *restclient.Config) *AppsClient { return client } -// New creates a new AppsClient for the given RESTClient. -func New(c restclient.Interface) *AppsClient { - return &AppsClient{c} +// New creates a new AppsV1alpha1Client for the given RESTClient. +func New(c restclient.Interface) *AppsV1alpha1Client { + return &AppsV1alpha1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if apps group is not registered, return an error - g, err := registered.Group("apps") + gv, err := unversioned.ParseGroupVersion("apps/v1alpha1") if err != nil { return err } + // if apps/v1alpha1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("apps/v1alpha1 is not enabled") + } config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -88,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AppsClient) RESTClient() restclient.Interface { +func (c *AppsV1alpha1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/doc.go index 0c1ca41facc..0eb10bf4809 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1alpha1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/doc.go index 6499875c0b5..3a0baba43e3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/fake_apps_client.go b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/fake_apps_client.go index 16c5ec2c9e0..136763fedcf 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/fake_apps_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/fake_apps_client.go @@ -22,17 +22,17 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakeApps struct { +type FakeAppsV1alpha1 struct { *core.Fake } -func (c *FakeApps) StatefulSets(namespace string) v1alpha1.StatefulSetInterface { +func (c *FakeAppsV1alpha1) StatefulSets(namespace string) v1alpha1.StatefulSetInterface { return &FakeStatefulSets{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeApps) RESTClient() restclient.Interface { +func (c *FakeAppsV1alpha1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/fake_statefulset.go b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/fake_statefulset.go index 19d587557a6..bff7ac63f04 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/fake_statefulset.go +++ b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/fake/fake_statefulset.go @@ -28,7 +28,7 @@ import ( // FakeStatefulSets implements StatefulSetInterface type FakeStatefulSets struct { - Fake *FakeApps + Fake *FakeAppsV1alpha1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/statefulset.go b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/statefulset.go index 2f73b6e27ed..225ab938290 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/statefulset.go +++ b/pkg/client/clientset_generated/release_1_5/typed/apps/v1alpha1/statefulset.go @@ -51,7 +51,7 @@ type statefulSets struct { } // newStatefulSets returns a StatefulSets -func newStatefulSets(c *AppsClient, namespace string) *statefulSets { +func newStatefulSets(c *AppsV1alpha1Client, namespace string) *statefulSets { return &statefulSets{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/BUILD b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/BUILD index 14c92784f73..adebbe0e90d 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/BUILD +++ b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/BUILD @@ -21,6 +21,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/runtime/serializer:go_default_library", diff --git a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/authentication_client.go b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/authentication_client.go index 1898e7a1dfe..beb50ce729e 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/authentication_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/authentication_client.go @@ -17,28 +17,30 @@ limitations under the License. package v1beta1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type AuthenticationInterface interface { +type AuthenticationV1beta1Interface interface { RESTClient() restclient.Interface TokenReviewsGetter } -// AuthenticationClient is used to interact with features provided by the Authentication group. -type AuthenticationClient struct { +// AuthenticationV1beta1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type AuthenticationV1beta1Client struct { restClient restclient.Interface } -func (c *AuthenticationClient) TokenReviews() TokenReviewInterface { +func (c *AuthenticationV1beta1Client) TokenReviews() TokenReviewInterface { return newTokenReviews(c) } -// NewForConfig creates a new AuthenticationClient for the given config. -func NewForConfig(c *restclient.Config) (*AuthenticationClient, error) { +// NewForConfig creates a new AuthenticationV1beta1Client for the given config. +func NewForConfig(c *restclient.Config) (*AuthenticationV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -47,12 +49,12 @@ func NewForConfig(c *restclient.Config) (*AuthenticationClient, error) { if err != nil { return nil, err } - return &AuthenticationClient{client}, nil + return &AuthenticationV1beta1Client{client}, nil } -// NewForConfigOrDie creates a new AuthenticationClient for the given config and +// NewForConfigOrDie creates a new AuthenticationV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *AuthenticationClient { +func NewForConfigOrDie(c *restclient.Config) *AuthenticationV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -60,26 +62,26 @@ func NewForConfigOrDie(c *restclient.Config) *AuthenticationClient { return client } -// New creates a new AuthenticationClient for the given RESTClient. -func New(c restclient.Interface) *AuthenticationClient { - return &AuthenticationClient{c} +// New creates a new AuthenticationV1beta1Client for the given RESTClient. +func New(c restclient.Interface) *AuthenticationV1beta1Client { + return &AuthenticationV1beta1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if authentication group is not registered, return an error - g, err := registered.Group("authentication.k8s.io") + gv, err := unversioned.ParseGroupVersion("authentication.k8s.io/v1beta1") if err != nil { return err } + // if authentication.k8s.io/v1beta1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("authentication.k8s.io/v1beta1 is not enabled") + } config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -88,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AuthenticationClient) RESTClient() restclient.Interface { +func (c *AuthenticationV1beta1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/doc.go index 5616c95d325..77edaa863fd 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1beta1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/doc.go index 6499875c0b5..3a0baba43e3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/fake_authentication_client.go b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/fake_authentication_client.go index 64e8b350c59..6646479de1f 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/fake_authentication_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/fake_authentication_client.go @@ -22,17 +22,17 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakeAuthentication struct { +type FakeAuthenticationV1beta1 struct { *core.Fake } -func (c *FakeAuthentication) TokenReviews() v1beta1.TokenReviewInterface { +func (c *FakeAuthenticationV1beta1) TokenReviews() v1beta1.TokenReviewInterface { return &FakeTokenReviews{c} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAuthentication) RESTClient() restclient.Interface { +func (c *FakeAuthenticationV1beta1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/fake_tokenreview.go b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/fake_tokenreview.go index 6508f5a94aa..92408580b45 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/fake_tokenreview.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/fake/fake_tokenreview.go @@ -18,5 +18,5 @@ package fake // FakeTokenReviews implements TokenReviewInterface type FakeTokenReviews struct { - Fake *FakeAuthentication + Fake *FakeAuthenticationV1beta1 } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/tokenreview.go b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/tokenreview.go index 452c3073cf3..f43c86c162c 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/tokenreview.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authentication/v1beta1/tokenreview.go @@ -37,7 +37,7 @@ type tokenReviews struct { } // newTokenReviews returns a TokenReviews -func newTokenReviews(c *AuthenticationClient) *tokenReviews { +func newTokenReviews(c *AuthenticationV1beta1Client) *tokenReviews { return &tokenReviews{ client: c.RESTClient(), } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/BUILD b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/BUILD index 80f75189e0c..87de5914467 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/BUILD +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/BUILD @@ -24,6 +24,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/authorization/v1beta1:go_default_library", "//pkg/client/restclient:go_default_library", diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/authorization_client.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/authorization_client.go index 649c6273841..1011939784f 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/authorization_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/authorization_client.go @@ -17,38 +17,40 @@ limitations under the License. package v1beta1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type AuthorizationInterface interface { +type AuthorizationV1beta1Interface interface { RESTClient() restclient.Interface LocalSubjectAccessReviewsGetter SelfSubjectAccessReviewsGetter SubjectAccessReviewsGetter } -// AuthorizationClient is used to interact with features provided by the Authorization group. -type AuthorizationClient struct { +// AuthorizationV1beta1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type AuthorizationV1beta1Client struct { restClient restclient.Interface } -func (c *AuthorizationClient) LocalSubjectAccessReviews(namespace string) LocalSubjectAccessReviewInterface { +func (c *AuthorizationV1beta1Client) LocalSubjectAccessReviews(namespace string) LocalSubjectAccessReviewInterface { return newLocalSubjectAccessReviews(c, namespace) } -func (c *AuthorizationClient) SelfSubjectAccessReviews() SelfSubjectAccessReviewInterface { +func (c *AuthorizationV1beta1Client) SelfSubjectAccessReviews() SelfSubjectAccessReviewInterface { return newSelfSubjectAccessReviews(c) } -func (c *AuthorizationClient) SubjectAccessReviews() SubjectAccessReviewInterface { +func (c *AuthorizationV1beta1Client) SubjectAccessReviews() SubjectAccessReviewInterface { return newSubjectAccessReviews(c) } -// NewForConfig creates a new AuthorizationClient for the given config. -func NewForConfig(c *restclient.Config) (*AuthorizationClient, error) { +// NewForConfig creates a new AuthorizationV1beta1Client for the given config. +func NewForConfig(c *restclient.Config) (*AuthorizationV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -57,12 +59,12 @@ func NewForConfig(c *restclient.Config) (*AuthorizationClient, error) { if err != nil { return nil, err } - return &AuthorizationClient{client}, nil + return &AuthorizationV1beta1Client{client}, nil } -// NewForConfigOrDie creates a new AuthorizationClient for the given config and +// NewForConfigOrDie creates a new AuthorizationV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *AuthorizationClient { +func NewForConfigOrDie(c *restclient.Config) *AuthorizationV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -70,26 +72,26 @@ func NewForConfigOrDie(c *restclient.Config) *AuthorizationClient { return client } -// New creates a new AuthorizationClient for the given RESTClient. -func New(c restclient.Interface) *AuthorizationClient { - return &AuthorizationClient{c} +// New creates a new AuthorizationV1beta1Client for the given RESTClient. +func New(c restclient.Interface) *AuthorizationV1beta1Client { + return &AuthorizationV1beta1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if authorization group is not registered, return an error - g, err := registered.Group("authorization.k8s.io") + gv, err := unversioned.ParseGroupVersion("authorization.k8s.io/v1beta1") if err != nil { return err } + // if authorization.k8s.io/v1beta1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("authorization.k8s.io/v1beta1 is not enabled") + } config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -98,7 +100,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AuthorizationClient) RESTClient() restclient.Interface { +func (c *AuthorizationV1beta1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/doc.go index 5616c95d325..77edaa863fd 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1beta1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/doc.go index 6499875c0b5..3a0baba43e3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_authorization_client.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_authorization_client.go index 260476dcae6..d5d62699086 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_authorization_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_authorization_client.go @@ -22,25 +22,25 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakeAuthorization struct { +type FakeAuthorizationV1beta1 struct { *core.Fake } -func (c *FakeAuthorization) LocalSubjectAccessReviews(namespace string) v1beta1.LocalSubjectAccessReviewInterface { +func (c *FakeAuthorizationV1beta1) LocalSubjectAccessReviews(namespace string) v1beta1.LocalSubjectAccessReviewInterface { return &FakeLocalSubjectAccessReviews{c, namespace} } -func (c *FakeAuthorization) SelfSubjectAccessReviews() v1beta1.SelfSubjectAccessReviewInterface { +func (c *FakeAuthorizationV1beta1) SelfSubjectAccessReviews() v1beta1.SelfSubjectAccessReviewInterface { return &FakeSelfSubjectAccessReviews{c} } -func (c *FakeAuthorization) SubjectAccessReviews() v1beta1.SubjectAccessReviewInterface { +func (c *FakeAuthorizationV1beta1) SubjectAccessReviews() v1beta1.SubjectAccessReviewInterface { return &FakeSubjectAccessReviews{c} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAuthorization) RESTClient() restclient.Interface { +func (c *FakeAuthorizationV1beta1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview.go index 50a1e3a8997..d78ea8232b7 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview.go @@ -18,6 +18,6 @@ package fake // FakeLocalSubjectAccessReviews implements LocalSubjectAccessReviewInterface type FakeLocalSubjectAccessReviews struct { - Fake *FakeAuthorization + Fake *FakeAuthorizationV1beta1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview.go index b107c1b2c45..8ec42827ca2 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview.go @@ -18,5 +18,5 @@ package fake // FakeSelfSubjectAccessReviews implements SelfSubjectAccessReviewInterface type FakeSelfSubjectAccessReviews struct { - Fake *FakeAuthorization + Fake *FakeAuthorizationV1beta1 } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_subjectaccessreview.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_subjectaccessreview.go index 0a01cd81a45..d38afc0b8a7 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_subjectaccessreview.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/fake/fake_subjectaccessreview.go @@ -18,5 +18,5 @@ package fake // FakeSubjectAccessReviews implements SubjectAccessReviewInterface type FakeSubjectAccessReviews struct { - Fake *FakeAuthorization + Fake *FakeAuthorizationV1beta1 } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/localsubjectaccessreview.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/localsubjectaccessreview.go index 0f14ad5278c..e9f1c6bf96b 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/localsubjectaccessreview.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/localsubjectaccessreview.go @@ -38,7 +38,7 @@ type localSubjectAccessReviews struct { } // newLocalSubjectAccessReviews returns a LocalSubjectAccessReviews -func newLocalSubjectAccessReviews(c *AuthorizationClient, namespace string) *localSubjectAccessReviews { +func newLocalSubjectAccessReviews(c *AuthorizationV1beta1Client, namespace string) *localSubjectAccessReviews { return &localSubjectAccessReviews{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/selfsubjectaccessreview.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/selfsubjectaccessreview.go index bce0a107c6e..e812bfe36a0 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/selfsubjectaccessreview.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/selfsubjectaccessreview.go @@ -37,7 +37,7 @@ type selfSubjectAccessReviews struct { } // newSelfSubjectAccessReviews returns a SelfSubjectAccessReviews -func newSelfSubjectAccessReviews(c *AuthorizationClient) *selfSubjectAccessReviews { +func newSelfSubjectAccessReviews(c *AuthorizationV1beta1Client) *selfSubjectAccessReviews { return &selfSubjectAccessReviews{ client: c.RESTClient(), } diff --git a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/subjectaccessreview.go b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/subjectaccessreview.go index ef62ced9d25..2c7aea2a61e 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/subjectaccessreview.go +++ b/pkg/client/clientset_generated/release_1_5/typed/authorization/v1beta1/subjectaccessreview.go @@ -37,7 +37,7 @@ type subjectAccessReviews struct { } // newSubjectAccessReviews returns a SubjectAccessReviews -func newSubjectAccessReviews(c *AuthorizationClient) *subjectAccessReviews { +func newSubjectAccessReviews(c *AuthorizationV1beta1Client) *subjectAccessReviews { return &subjectAccessReviews{ client: c.RESTClient(), } diff --git a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/BUILD b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/BUILD index 4e3ffc990e2..5392ea4b8ca 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/BUILD +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/BUILD @@ -21,6 +21,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", diff --git a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/autoscaling_client.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/autoscaling_client.go index 320ba73d333..1b271a42f59 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/autoscaling_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/autoscaling_client.go @@ -17,28 +17,30 @@ limitations under the License. package v1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type AutoscalingInterface interface { +type AutoscalingV1Interface interface { RESTClient() restclient.Interface HorizontalPodAutoscalersGetter } -// AutoscalingClient is used to interact with features provided by the Autoscaling group. -type AutoscalingClient struct { +// AutoscalingV1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type AutoscalingV1Client struct { restClient restclient.Interface } -func (c *AutoscalingClient) HorizontalPodAutoscalers(namespace string) HorizontalPodAutoscalerInterface { +func (c *AutoscalingV1Client) HorizontalPodAutoscalers(namespace string) HorizontalPodAutoscalerInterface { return newHorizontalPodAutoscalers(c, namespace) } -// NewForConfig creates a new AutoscalingClient for the given config. -func NewForConfig(c *restclient.Config) (*AutoscalingClient, error) { +// NewForConfig creates a new AutoscalingV1Client for the given config. +func NewForConfig(c *restclient.Config) (*AutoscalingV1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -47,12 +49,12 @@ func NewForConfig(c *restclient.Config) (*AutoscalingClient, error) { if err != nil { return nil, err } - return &AutoscalingClient{client}, nil + return &AutoscalingV1Client{client}, nil } -// NewForConfigOrDie creates a new AutoscalingClient for the given config and +// NewForConfigOrDie creates a new AutoscalingV1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *AutoscalingClient { +func NewForConfigOrDie(c *restclient.Config) *AutoscalingV1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -60,26 +62,26 @@ func NewForConfigOrDie(c *restclient.Config) *AutoscalingClient { return client } -// New creates a new AutoscalingClient for the given RESTClient. -func New(c restclient.Interface) *AutoscalingClient { - return &AutoscalingClient{c} +// New creates a new AutoscalingV1Client for the given RESTClient. +func New(c restclient.Interface) *AutoscalingV1Client { + return &AutoscalingV1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if autoscaling group is not registered, return an error - g, err := registered.Group("autoscaling") + gv, err := unversioned.ParseGroupVersion("autoscaling/v1") if err != nil { return err } + // if autoscaling/v1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("autoscaling/v1 is not enabled") + } config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -88,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *AutoscalingClient) RESTClient() restclient.Interface { +func (c *AutoscalingV1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/doc.go index fe27cf5c194..3907c1c81f1 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/doc.go index 6499875c0b5..3a0baba43e3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_autoscaling_client.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_autoscaling_client.go index 2243c08075d..234498640a7 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_autoscaling_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_autoscaling_client.go @@ -22,17 +22,17 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakeAutoscaling struct { +type FakeAutoscalingV1 struct { *core.Fake } -func (c *FakeAutoscaling) HorizontalPodAutoscalers(namespace string) v1.HorizontalPodAutoscalerInterface { +func (c *FakeAutoscalingV1) HorizontalPodAutoscalers(namespace string) v1.HorizontalPodAutoscalerInterface { return &FakeHorizontalPodAutoscalers{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeAutoscaling) RESTClient() restclient.Interface { +func (c *FakeAutoscalingV1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go index 2ae477e70ce..0783df3fa71 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go @@ -28,7 +28,7 @@ import ( // FakeHorizontalPodAutoscalers implements HorizontalPodAutoscalerInterface type FakeHorizontalPodAutoscalers struct { - Fake *FakeAutoscaling + Fake *FakeAutoscalingV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/horizontalpodautoscaler.go index d09bd4ead19..fd3ca6c9962 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1/horizontalpodautoscaler.go @@ -51,7 +51,7 @@ type horizontalPodAutoscalers struct { } // newHorizontalPodAutoscalers returns a HorizontalPodAutoscalers -func newHorizontalPodAutoscalers(c *AutoscalingClient, namespace string) *horizontalPodAutoscalers { +func newHorizontalPodAutoscalers(c *AutoscalingV1Client, namespace string) *horizontalPodAutoscalers { return &horizontalPodAutoscalers{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/BUILD b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/BUILD index 7784ed2d4d2..f5a1ffce49d 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/BUILD +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/BUILD @@ -21,6 +21,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/batch/v1:go_default_library", diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/batch_client.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/batch_client.go index 84d73c4c97c..221d3cf28f3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/batch_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/batch_client.go @@ -17,28 +17,30 @@ limitations under the License. package v1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type BatchInterface interface { +type BatchV1Interface interface { RESTClient() restclient.Interface JobsGetter } -// BatchClient is used to interact with features provided by the Batch group. -type BatchClient struct { +// BatchV1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type BatchV1Client struct { restClient restclient.Interface } -func (c *BatchClient) Jobs(namespace string) JobInterface { +func (c *BatchV1Client) Jobs(namespace string) JobInterface { return newJobs(c, namespace) } -// NewForConfig creates a new BatchClient for the given config. -func NewForConfig(c *restclient.Config) (*BatchClient, error) { +// NewForConfig creates a new BatchV1Client for the given config. +func NewForConfig(c *restclient.Config) (*BatchV1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -47,12 +49,12 @@ func NewForConfig(c *restclient.Config) (*BatchClient, error) { if err != nil { return nil, err } - return &BatchClient{client}, nil + return &BatchV1Client{client}, nil } -// NewForConfigOrDie creates a new BatchClient for the given config and +// NewForConfigOrDie creates a new BatchV1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *BatchClient { +func NewForConfigOrDie(c *restclient.Config) *BatchV1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -60,26 +62,26 @@ func NewForConfigOrDie(c *restclient.Config) *BatchClient { return client } -// New creates a new BatchClient for the given RESTClient. -func New(c restclient.Interface) *BatchClient { - return &BatchClient{c} +// New creates a new BatchV1Client for the given RESTClient. +func New(c restclient.Interface) *BatchV1Client { + return &BatchV1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if batch group is not registered, return an error - g, err := registered.Group("batch") + gv, err := unversioned.ParseGroupVersion("batch/v1") if err != nil { return err } + // if batch/v1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("batch/v1 is not enabled") + } config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -88,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *BatchClient) RESTClient() restclient.Interface { +func (c *BatchV1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/doc.go index fe27cf5c194..3907c1c81f1 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/doc.go index 6499875c0b5..3a0baba43e3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_batch_client.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_batch_client.go index 4fd07c84d04..70d73ffb08e 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_batch_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_batch_client.go @@ -22,17 +22,17 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakeBatch struct { +type FakeBatchV1 struct { *core.Fake } -func (c *FakeBatch) Jobs(namespace string) v1.JobInterface { +func (c *FakeBatchV1) Jobs(namespace string) v1.JobInterface { return &FakeJobs{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeBatch) RESTClient() restclient.Interface { +func (c *FakeBatchV1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_job.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_job.go index 8a6acfe1811..ee2baf219d6 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_job.go +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/fake/fake_job.go @@ -28,7 +28,7 @@ import ( // FakeJobs implements JobInterface type FakeJobs struct { - Fake *FakeBatch + Fake *FakeBatchV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/job.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/job.go index 752256defba..0c7c1b9c6d0 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/batch/v1/job.go +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v1/job.go @@ -51,7 +51,7 @@ type jobs struct { } // newJobs returns a Jobs -func newJobs(c *BatchClient, namespace string) *jobs { +func newJobs(c *BatchV1Client, namespace string) *jobs { return &jobs{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/BUILD b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/BUILD new file mode 100644 index 00000000000..306b40ec07f --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/BUILD @@ -0,0 +1,33 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_binary", + "go_library", + "go_test", + "cgo_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "batch_client.go", + "doc.go", + "generated_expansion.go", + "job.go", + "scheduledjob.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", + "//pkg/api/v1:go_default_library", + "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/batch/v2alpha1:go_default_library", + "//pkg/client/restclient:go_default_library", + "//pkg/runtime/serializer:go_default_library", + "//pkg/watch:go_default_library", + ], +) diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/batch_client.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/batch_client.go new file mode 100644 index 00000000000..7b1d426f334 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/batch_client.go @@ -0,0 +1,103 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v2alpha1 + +import ( + fmt "fmt" + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + registered "k8s.io/kubernetes/pkg/apimachinery/registered" + restclient "k8s.io/kubernetes/pkg/client/restclient" + serializer "k8s.io/kubernetes/pkg/runtime/serializer" +) + +type BatchV2alpha1Interface interface { + RESTClient() restclient.Interface + JobsGetter + ScheduledJobsGetter +} + +// BatchV2alpha1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type BatchV2alpha1Client struct { + restClient restclient.Interface +} + +func (c *BatchV2alpha1Client) Jobs(namespace string) JobInterface { + return newJobs(c, namespace) +} + +func (c *BatchV2alpha1Client) ScheduledJobs(namespace string) ScheduledJobInterface { + return newScheduledJobs(c, namespace) +} + +// NewForConfig creates a new BatchV2alpha1Client for the given config. +func NewForConfig(c *restclient.Config) (*BatchV2alpha1Client, error) { + config := *c + if err := setConfigDefaults(&config); err != nil { + return nil, err + } + client, err := restclient.RESTClientFor(&config) + if err != nil { + return nil, err + } + return &BatchV2alpha1Client{client}, nil +} + +// NewForConfigOrDie creates a new BatchV2alpha1Client for the given config and +// panics if there is an error in the config. +func NewForConfigOrDie(c *restclient.Config) *BatchV2alpha1Client { + client, err := NewForConfig(c) + if err != nil { + panic(err) + } + return client +} + +// New creates a new BatchV2alpha1Client for the given RESTClient. +func New(c restclient.Interface) *BatchV2alpha1Client { + return &BatchV2alpha1Client{c} +} + +func setConfigDefaults(config *restclient.Config) error { + gv, err := unversioned.ParseGroupVersion("batch/v2alpha1") + if err != nil { + return err + } + // if batch/v2alpha1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("batch/v2alpha1 is not enabled") + } + config.APIPath = "/apis" + if config.UserAgent == "" { + config.UserAgent = restclient.DefaultKubernetesUserAgent() + } + copyGroupVersion := gv + config.GroupVersion = ©GroupVersion + + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} + + return nil +} + +// RESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *BatchV2alpha1Client) RESTClient() restclient.Interface { + if c == nil { + return nil + } + return c.restClient +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/doc.go new file mode 100644 index 00000000000..6e3c4a84ce0 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] + +// This package has the automatically generated typed clients. +package v2alpha1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/BUILD b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/BUILD new file mode 100644 index 00000000000..41be0f53a37 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/BUILD @@ -0,0 +1,33 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_binary", + "go_library", + "go_test", + "cgo_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "doc.go", + "fake_batch_client.go", + "fake_job.go", + "fake_scheduledjob.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", + "//pkg/api/v1:go_default_library", + "//pkg/apis/batch/v2alpha1:go_default_library", + "//pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1:go_default_library", + "//pkg/client/restclient:go_default_library", + "//pkg/client/testing/core:go_default_library", + "//pkg/labels:go_default_library", + "//pkg/watch:go_default_library", + ], +) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testtype_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/doc.go similarity index 62% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testtype_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/doc.go index 08effda7d18..3a0baba43e3 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/fake/fake_testtype_expansion.go +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/doc.go @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package fake +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] -func (c *FakeTestTypes) Hello() string { - return "hello!" -} +// Package fake has the automatically generated clients. +package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/fake_batch_client.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/fake_batch_client.go new file mode 100644 index 00000000000..5fb5d1d4525 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/fake_batch_client.go @@ -0,0 +1,42 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + v2alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1" + restclient "k8s.io/kubernetes/pkg/client/restclient" + core "k8s.io/kubernetes/pkg/client/testing/core" +) + +type FakeBatchV2alpha1 struct { + *core.Fake +} + +func (c *FakeBatchV2alpha1) Jobs(namespace string) v2alpha1.JobInterface { + return &FakeJobs{c, namespace} +} + +func (c *FakeBatchV2alpha1) ScheduledJobs(namespace string) v2alpha1.ScheduledJobInterface { + return &FakeScheduledJobs{c, namespace} +} + +// RESTClient returns a RESTClient that is used to communicate +// with API server by this client implementation. +func (c *FakeBatchV2alpha1) RESTClient() restclient.Interface { + var ret *restclient.RESTClient + return ret +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/fake_job.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/fake_job.go new file mode 100644 index 00000000000..08d35083a97 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/fake_job.go @@ -0,0 +1,128 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/api/v1" + v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + core "k8s.io/kubernetes/pkg/client/testing/core" + labels "k8s.io/kubernetes/pkg/labels" + watch "k8s.io/kubernetes/pkg/watch" +) + +// FakeJobs implements JobInterface +type FakeJobs struct { + Fake *FakeBatchV2alpha1 + ns string +} + +var jobsResource = unversioned.GroupVersionResource{Group: "batch", Version: "v2alpha1", Resource: "jobs"} + +func (c *FakeJobs) Create(job *v2alpha1.Job) (result *v2alpha1.Job, err error) { + obj, err := c.Fake. + Invokes(core.NewCreateAction(jobsResource, c.ns, job), &v2alpha1.Job{}) + + if obj == nil { + return nil, err + } + return obj.(*v2alpha1.Job), err +} + +func (c *FakeJobs) Update(job *v2alpha1.Job) (result *v2alpha1.Job, err error) { + obj, err := c.Fake. + Invokes(core.NewUpdateAction(jobsResource, c.ns, job), &v2alpha1.Job{}) + + if obj == nil { + return nil, err + } + return obj.(*v2alpha1.Job), err +} + +func (c *FakeJobs) UpdateStatus(job *v2alpha1.Job) (*v2alpha1.Job, error) { + obj, err := c.Fake. + Invokes(core.NewUpdateSubresourceAction(jobsResource, "status", c.ns, job), &v2alpha1.Job{}) + + if obj == nil { + return nil, err + } + return obj.(*v2alpha1.Job), err +} + +func (c *FakeJobs) Delete(name string, options *v1.DeleteOptions) error { + _, err := c.Fake. + Invokes(core.NewDeleteAction(jobsResource, c.ns, name), &v2alpha1.Job{}) + + return err +} + +func (c *FakeJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { + action := core.NewDeleteCollectionAction(jobsResource, c.ns, listOptions) + + _, err := c.Fake.Invokes(action, &v2alpha1.JobList{}) + return err +} + +func (c *FakeJobs) Get(name string) (result *v2alpha1.Job, err error) { + obj, err := c.Fake. + Invokes(core.NewGetAction(jobsResource, c.ns, name), &v2alpha1.Job{}) + + if obj == nil { + return nil, err + } + return obj.(*v2alpha1.Job), err +} + +func (c *FakeJobs) List(opts v1.ListOptions) (result *v2alpha1.JobList, err error) { + obj, err := c.Fake. + Invokes(core.NewListAction(jobsResource, c.ns, opts), &v2alpha1.JobList{}) + + if obj == nil { + return nil, err + } + + label, _, _ := core.ExtractFromListOptions(opts) + if label == nil { + label = labels.Everything() + } + list := &v2alpha1.JobList{} + for _, item := range obj.(*v2alpha1.JobList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested jobs. +func (c *FakeJobs) Watch(opts v1.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(core.NewWatchAction(jobsResource, c.ns, opts)) + +} + +// Patch applies the patch and returns the patched job. +func (c *FakeJobs) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v2alpha1.Job, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(jobsResource, c.ns, name, data, subresources...), &v2alpha1.Job{}) + + if obj == nil { + return nil, err + } + return obj.(*v2alpha1.Job), err +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/fake_scheduledjob.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/fake_scheduledjob.go new file mode 100644 index 00000000000..d38f25c3bbe --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/fake/fake_scheduledjob.go @@ -0,0 +1,128 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/api/v1" + v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + core "k8s.io/kubernetes/pkg/client/testing/core" + labels "k8s.io/kubernetes/pkg/labels" + watch "k8s.io/kubernetes/pkg/watch" +) + +// FakeScheduledJobs implements ScheduledJobInterface +type FakeScheduledJobs struct { + Fake *FakeBatchV2alpha1 + ns string +} + +var scheduledjobsResource = unversioned.GroupVersionResource{Group: "batch", Version: "v2alpha1", Resource: "scheduledjobs"} + +func (c *FakeScheduledJobs) Create(scheduledJob *v2alpha1.ScheduledJob) (result *v2alpha1.ScheduledJob, err error) { + obj, err := c.Fake. + Invokes(core.NewCreateAction(scheduledjobsResource, c.ns, scheduledJob), &v2alpha1.ScheduledJob{}) + + if obj == nil { + return nil, err + } + return obj.(*v2alpha1.ScheduledJob), err +} + +func (c *FakeScheduledJobs) Update(scheduledJob *v2alpha1.ScheduledJob) (result *v2alpha1.ScheduledJob, err error) { + obj, err := c.Fake. + Invokes(core.NewUpdateAction(scheduledjobsResource, c.ns, scheduledJob), &v2alpha1.ScheduledJob{}) + + if obj == nil { + return nil, err + } + return obj.(*v2alpha1.ScheduledJob), err +} + +func (c *FakeScheduledJobs) UpdateStatus(scheduledJob *v2alpha1.ScheduledJob) (*v2alpha1.ScheduledJob, error) { + obj, err := c.Fake. + Invokes(core.NewUpdateSubresourceAction(scheduledjobsResource, "status", c.ns, scheduledJob), &v2alpha1.ScheduledJob{}) + + if obj == nil { + return nil, err + } + return obj.(*v2alpha1.ScheduledJob), err +} + +func (c *FakeScheduledJobs) Delete(name string, options *v1.DeleteOptions) error { + _, err := c.Fake. + Invokes(core.NewDeleteAction(scheduledjobsResource, c.ns, name), &v2alpha1.ScheduledJob{}) + + return err +} + +func (c *FakeScheduledJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { + action := core.NewDeleteCollectionAction(scheduledjobsResource, c.ns, listOptions) + + _, err := c.Fake.Invokes(action, &v2alpha1.ScheduledJobList{}) + return err +} + +func (c *FakeScheduledJobs) Get(name string) (result *v2alpha1.ScheduledJob, err error) { + obj, err := c.Fake. + Invokes(core.NewGetAction(scheduledjobsResource, c.ns, name), &v2alpha1.ScheduledJob{}) + + if obj == nil { + return nil, err + } + return obj.(*v2alpha1.ScheduledJob), err +} + +func (c *FakeScheduledJobs) List(opts v1.ListOptions) (result *v2alpha1.ScheduledJobList, err error) { + obj, err := c.Fake. + Invokes(core.NewListAction(scheduledjobsResource, c.ns, opts), &v2alpha1.ScheduledJobList{}) + + if obj == nil { + return nil, err + } + + label, _, _ := core.ExtractFromListOptions(opts) + if label == nil { + label = labels.Everything() + } + list := &v2alpha1.ScheduledJobList{} + for _, item := range obj.(*v2alpha1.ScheduledJobList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested scheduledJobs. +func (c *FakeScheduledJobs) Watch(opts v1.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(core.NewWatchAction(scheduledjobsResource, c.ns, opts)) + +} + +// Patch applies the patch and returns the patched scheduledJob. +func (c *FakeScheduledJobs) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v2alpha1.ScheduledJob, err error) { + obj, err := c.Fake. + Invokes(core.NewPatchSubresourceAction(scheduledjobsResource, c.ns, name, data, subresources...), &v2alpha1.ScheduledJob{}) + + if obj == nil { + return nil, err + } + return obj.(*v2alpha1.ScheduledJob), err +} diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/generated_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/generated_expansion.go similarity index 96% rename from pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/generated_expansion.go rename to pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/generated_expansion.go index a12d6f30841..1a4ac98d184 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/generated_expansion.go +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/generated_expansion.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v2alpha1 type JobExpansion interface{} diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/job.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/job.go new file mode 100644 index 00000000000..3f28239fba1 --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/job.go @@ -0,0 +1,167 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v2alpha1 + +import ( + api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/api/v1" + v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + restclient "k8s.io/kubernetes/pkg/client/restclient" + watch "k8s.io/kubernetes/pkg/watch" +) + +// JobsGetter has a method to return a JobInterface. +// A group's client should implement this interface. +type JobsGetter interface { + Jobs(namespace string) JobInterface +} + +// JobInterface has methods to work with Job resources. +type JobInterface interface { + Create(*v2alpha1.Job) (*v2alpha1.Job, error) + Update(*v2alpha1.Job) (*v2alpha1.Job, error) + UpdateStatus(*v2alpha1.Job) (*v2alpha1.Job, error) + Delete(name string, options *v1.DeleteOptions) error + DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error + Get(name string) (*v2alpha1.Job, error) + List(opts v1.ListOptions) (*v2alpha1.JobList, error) + Watch(opts v1.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v2alpha1.Job, err error) + JobExpansion +} + +// jobs implements JobInterface +type jobs struct { + client restclient.Interface + ns string +} + +// newJobs returns a Jobs +func newJobs(c *BatchV2alpha1Client, namespace string) *jobs { + return &jobs{ + client: c.RESTClient(), + ns: namespace, + } +} + +// Create takes the representation of a job and creates it. Returns the server's representation of the job, and an error, if there is any. +func (c *jobs) Create(job *v2alpha1.Job) (result *v2alpha1.Job, err error) { + result = &v2alpha1.Job{} + err = c.client.Post(). + Namespace(c.ns). + Resource("jobs"). + Body(job). + Do(). + Into(result) + return +} + +// Update takes the representation of a job and updates it. Returns the server's representation of the job, and an error, if there is any. +func (c *jobs) Update(job *v2alpha1.Job) (result *v2alpha1.Job, err error) { + result = &v2alpha1.Job{} + err = c.client.Put(). + Namespace(c.ns). + Resource("jobs"). + Name(job.Name). + Body(job). + Do(). + Into(result) + return +} + +func (c *jobs) UpdateStatus(job *v2alpha1.Job) (result *v2alpha1.Job, err error) { + result = &v2alpha1.Job{} + err = c.client.Put(). + Namespace(c.ns). + Resource("jobs"). + Name(job.Name). + SubResource("status"). + Body(job). + Do(). + Into(result) + return +} + +// Delete takes name of the job and deletes it. Returns an error if one occurs. +func (c *jobs) Delete(name string, options *v1.DeleteOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("jobs"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *jobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("jobs"). + VersionedParams(&listOptions, api.ParameterCodec). + Body(options). + Do(). + Error() +} + +// Get takes name of the job, and returns the corresponding job object, and an error if there is any. +func (c *jobs) Get(name string) (result *v2alpha1.Job, err error) { + result = &v2alpha1.Job{} + err = c.client.Get(). + Namespace(c.ns). + Resource("jobs"). + Name(name). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of Jobs that match those selectors. +func (c *jobs) List(opts v1.ListOptions) (result *v2alpha1.JobList, err error) { + result = &v2alpha1.JobList{} + err = c.client.Get(). + Namespace(c.ns). + Resource("jobs"). + VersionedParams(&opts, api.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested jobs. +func (c *jobs) Watch(opts v1.ListOptions) (watch.Interface, error) { + return c.client.Get(). + Prefix("watch"). + Namespace(c.ns). + Resource("jobs"). + VersionedParams(&opts, api.ParameterCodec). + Watch() +} + +// Patch applies the patch and returns the patched job. +func (c *jobs) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v2alpha1.Job, err error) { + result = &v2alpha1.Job{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("jobs"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/scheduledjob.go b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/scheduledjob.go new file mode 100644 index 00000000000..af90157485a --- /dev/null +++ b/pkg/client/clientset_generated/release_1_5/typed/batch/v2alpha1/scheduledjob.go @@ -0,0 +1,167 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package v2alpha1 + +import ( + api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/api/v1" + v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + restclient "k8s.io/kubernetes/pkg/client/restclient" + watch "k8s.io/kubernetes/pkg/watch" +) + +// ScheduledJobsGetter has a method to return a ScheduledJobInterface. +// A group's client should implement this interface. +type ScheduledJobsGetter interface { + ScheduledJobs(namespace string) ScheduledJobInterface +} + +// ScheduledJobInterface has methods to work with ScheduledJob resources. +type ScheduledJobInterface interface { + Create(*v2alpha1.ScheduledJob) (*v2alpha1.ScheduledJob, error) + Update(*v2alpha1.ScheduledJob) (*v2alpha1.ScheduledJob, error) + UpdateStatus(*v2alpha1.ScheduledJob) (*v2alpha1.ScheduledJob, error) + Delete(name string, options *v1.DeleteOptions) error + DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error + Get(name string) (*v2alpha1.ScheduledJob, error) + List(opts v1.ListOptions) (*v2alpha1.ScheduledJobList, error) + Watch(opts v1.ListOptions) (watch.Interface, error) + Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v2alpha1.ScheduledJob, err error) + ScheduledJobExpansion +} + +// scheduledJobs implements ScheduledJobInterface +type scheduledJobs struct { + client restclient.Interface + ns string +} + +// newScheduledJobs returns a ScheduledJobs +func newScheduledJobs(c *BatchV2alpha1Client, namespace string) *scheduledJobs { + return &scheduledJobs{ + client: c.RESTClient(), + ns: namespace, + } +} + +// Create takes the representation of a scheduledJob and creates it. Returns the server's representation of the scheduledJob, and an error, if there is any. +func (c *scheduledJobs) Create(scheduledJob *v2alpha1.ScheduledJob) (result *v2alpha1.ScheduledJob, err error) { + result = &v2alpha1.ScheduledJob{} + err = c.client.Post(). + Namespace(c.ns). + Resource("scheduledjobs"). + Body(scheduledJob). + Do(). + Into(result) + return +} + +// Update takes the representation of a scheduledJob and updates it. Returns the server's representation of the scheduledJob, and an error, if there is any. +func (c *scheduledJobs) Update(scheduledJob *v2alpha1.ScheduledJob) (result *v2alpha1.ScheduledJob, err error) { + result = &v2alpha1.ScheduledJob{} + err = c.client.Put(). + Namespace(c.ns). + Resource("scheduledjobs"). + Name(scheduledJob.Name). + Body(scheduledJob). + Do(). + Into(result) + return +} + +func (c *scheduledJobs) UpdateStatus(scheduledJob *v2alpha1.ScheduledJob) (result *v2alpha1.ScheduledJob, err error) { + result = &v2alpha1.ScheduledJob{} + err = c.client.Put(). + Namespace(c.ns). + Resource("scheduledjobs"). + Name(scheduledJob.Name). + SubResource("status"). + Body(scheduledJob). + Do(). + Into(result) + return +} + +// Delete takes name of the scheduledJob and deletes it. Returns an error if one occurs. +func (c *scheduledJobs) Delete(name string, options *v1.DeleteOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("scheduledjobs"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *scheduledJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { + return c.client.Delete(). + Namespace(c.ns). + Resource("scheduledjobs"). + VersionedParams(&listOptions, api.ParameterCodec). + Body(options). + Do(). + Error() +} + +// Get takes name of the scheduledJob, and returns the corresponding scheduledJob object, and an error if there is any. +func (c *scheduledJobs) Get(name string) (result *v2alpha1.ScheduledJob, err error) { + result = &v2alpha1.ScheduledJob{} + err = c.client.Get(). + Namespace(c.ns). + Resource("scheduledjobs"). + Name(name). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of ScheduledJobs that match those selectors. +func (c *scheduledJobs) List(opts v1.ListOptions) (result *v2alpha1.ScheduledJobList, err error) { + result = &v2alpha1.ScheduledJobList{} + err = c.client.Get(). + Namespace(c.ns). + Resource("scheduledjobs"). + VersionedParams(&opts, api.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested scheduledJobs. +func (c *scheduledJobs) Watch(opts v1.ListOptions) (watch.Interface, error) { + return c.client.Get(). + Prefix("watch"). + Namespace(c.ns). + Resource("scheduledjobs"). + VersionedParams(&opts, api.ParameterCodec). + Watch() +} + +// Patch applies the patch and returns the patched scheduledJob. +func (c *scheduledJobs) Patch(name string, pt api.PatchType, data []byte, subresources ...string) (result *v2alpha1.ScheduledJob, err error) { + result = &v2alpha1.ScheduledJob{} + err = c.client.Patch(pt). + Namespace(c.ns). + Resource("scheduledjobs"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/BUILD b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/BUILD index a81b8e5ecec..27fff0d484a 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/BUILD +++ b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/BUILD @@ -21,6 +21,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/certificates/v1alpha1:go_default_library", diff --git a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificates_client.go b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificates_client.go index df8e4ef9fbb..b348a9ff788 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificates_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificates_client.go @@ -17,28 +17,30 @@ limitations under the License. package v1alpha1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type CertificatesInterface interface { +type CertificatesV1alpha1Interface interface { RESTClient() restclient.Interface CertificateSigningRequestsGetter } -// CertificatesClient is used to interact with features provided by the Certificates group. -type CertificatesClient struct { +// CertificatesV1alpha1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type CertificatesV1alpha1Client struct { restClient restclient.Interface } -func (c *CertificatesClient) CertificateSigningRequests() CertificateSigningRequestInterface { +func (c *CertificatesV1alpha1Client) CertificateSigningRequests() CertificateSigningRequestInterface { return newCertificateSigningRequests(c) } -// NewForConfig creates a new CertificatesClient for the given config. -func NewForConfig(c *restclient.Config) (*CertificatesClient, error) { +// NewForConfig creates a new CertificatesV1alpha1Client for the given config. +func NewForConfig(c *restclient.Config) (*CertificatesV1alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -47,12 +49,12 @@ func NewForConfig(c *restclient.Config) (*CertificatesClient, error) { if err != nil { return nil, err } - return &CertificatesClient{client}, nil + return &CertificatesV1alpha1Client{client}, nil } -// NewForConfigOrDie creates a new CertificatesClient for the given config and +// NewForConfigOrDie creates a new CertificatesV1alpha1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *CertificatesClient { +func NewForConfigOrDie(c *restclient.Config) *CertificatesV1alpha1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -60,26 +62,26 @@ func NewForConfigOrDie(c *restclient.Config) *CertificatesClient { return client } -// New creates a new CertificatesClient for the given RESTClient. -func New(c restclient.Interface) *CertificatesClient { - return &CertificatesClient{c} +// New creates a new CertificatesV1alpha1Client for the given RESTClient. +func New(c restclient.Interface) *CertificatesV1alpha1Client { + return &CertificatesV1alpha1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if certificates group is not registered, return an error - g, err := registered.Group("certificates.k8s.io") + gv, err := unversioned.ParseGroupVersion("certificates.k8s.io/v1alpha1") if err != nil { return err } + // if certificates.k8s.io/v1alpha1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("certificates.k8s.io/v1alpha1 is not enabled") + } config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -88,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CertificatesClient) RESTClient() restclient.Interface { +func (c *CertificatesV1alpha1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificatesigningrequest.go b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificatesigningrequest.go index d08fc5ab117..efb6d9f3be7 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificatesigningrequest.go +++ b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/certificatesigningrequest.go @@ -50,7 +50,7 @@ type certificateSigningRequests struct { } // newCertificateSigningRequests returns a CertificateSigningRequests -func newCertificateSigningRequests(c *CertificatesClient) *certificateSigningRequests { +func newCertificateSigningRequests(c *CertificatesV1alpha1Client) *certificateSigningRequests { return &certificateSigningRequests{ client: c.RESTClient(), } diff --git a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/doc.go index 0c1ca41facc..0eb10bf4809 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1alpha1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/doc.go index 6499875c0b5..3a0baba43e3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/fake_certificates_client.go b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/fake_certificates_client.go index 7e215c7f808..b407f4ebbc7 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/fake_certificates_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/fake_certificates_client.go @@ -22,17 +22,17 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakeCertificates struct { +type FakeCertificatesV1alpha1 struct { *core.Fake } -func (c *FakeCertificates) CertificateSigningRequests() v1alpha1.CertificateSigningRequestInterface { +func (c *FakeCertificatesV1alpha1) CertificateSigningRequests() v1alpha1.CertificateSigningRequestInterface { return &FakeCertificateSigningRequests{c} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCertificates) RESTClient() restclient.Interface { +func (c *FakeCertificatesV1alpha1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/fake_certificatesigningrequest.go b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/fake_certificatesigningrequest.go index 2cb28ac6095..53bb575867f 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/fake_certificatesigningrequest.go +++ b/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1/fake/fake_certificatesigningrequest.go @@ -28,7 +28,7 @@ import ( // FakeCertificateSigningRequests implements CertificateSigningRequestInterface type FakeCertificateSigningRequests struct { - Fake *FakeCertificates + Fake *FakeCertificatesV1alpha1 } var certificatesigningrequestsResource = unversioned.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1alpha1", Resource: "certificatesigningrequests"} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/BUILD b/pkg/client/clientset_generated/release_1_5/typed/core/v1/BUILD index 7f7deecf2ea..1bdced5066e 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/BUILD +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/BUILD @@ -40,6 +40,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/policy/v1alpha1:go_default_library", diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/componentstatus.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/componentstatus.go index bc0d6e457f7..80cf825a777 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/componentstatus.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/componentstatus.go @@ -48,7 +48,7 @@ type componentStatuses struct { } // newComponentStatuses returns a ComponentStatuses -func newComponentStatuses(c *CoreClient) *componentStatuses { +func newComponentStatuses(c *CoreV1Client) *componentStatuses { return &componentStatuses{ client: c.RESTClient(), } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/configmap.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/configmap.go index 74831c42f99..942202e4255 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/configmap.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/configmap.go @@ -49,7 +49,7 @@ type configMaps struct { } // newConfigMaps returns a ConfigMaps -func newConfigMaps(c *CoreClient, namespace string) *configMaps { +func newConfigMaps(c *CoreV1Client, namespace string) *configMaps { return &configMaps{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/core_client.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/core_client.go index 2c9d7c712c2..edadf1dd687 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/core_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/core_client.go @@ -17,13 +17,15 @@ limitations under the License. package v1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type CoreInterface interface { +type CoreV1Interface interface { RESTClient() restclient.Interface ComponentStatusesGetter ConfigMapsGetter @@ -43,77 +45,77 @@ type CoreInterface interface { ServiceAccountsGetter } -// CoreClient is used to interact with features provided by the Core group. -type CoreClient struct { +// CoreV1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type CoreV1Client struct { restClient restclient.Interface } -func (c *CoreClient) ComponentStatuses() ComponentStatusInterface { +func (c *CoreV1Client) ComponentStatuses() ComponentStatusInterface { return newComponentStatuses(c) } -func (c *CoreClient) ConfigMaps(namespace string) ConfigMapInterface { +func (c *CoreV1Client) ConfigMaps(namespace string) ConfigMapInterface { return newConfigMaps(c, namespace) } -func (c *CoreClient) Endpoints(namespace string) EndpointsInterface { +func (c *CoreV1Client) Endpoints(namespace string) EndpointsInterface { return newEndpoints(c, namespace) } -func (c *CoreClient) Events(namespace string) EventInterface { +func (c *CoreV1Client) Events(namespace string) EventInterface { return newEvents(c, namespace) } -func (c *CoreClient) LimitRanges(namespace string) LimitRangeInterface { +func (c *CoreV1Client) LimitRanges(namespace string) LimitRangeInterface { return newLimitRanges(c, namespace) } -func (c *CoreClient) Namespaces() NamespaceInterface { +func (c *CoreV1Client) Namespaces() NamespaceInterface { return newNamespaces(c) } -func (c *CoreClient) Nodes() NodeInterface { +func (c *CoreV1Client) Nodes() NodeInterface { return newNodes(c) } -func (c *CoreClient) PersistentVolumes() PersistentVolumeInterface { +func (c *CoreV1Client) PersistentVolumes() PersistentVolumeInterface { return newPersistentVolumes(c) } -func (c *CoreClient) PersistentVolumeClaims(namespace string) PersistentVolumeClaimInterface { +func (c *CoreV1Client) PersistentVolumeClaims(namespace string) PersistentVolumeClaimInterface { return newPersistentVolumeClaims(c, namespace) } -func (c *CoreClient) Pods(namespace string) PodInterface { +func (c *CoreV1Client) Pods(namespace string) PodInterface { return newPods(c, namespace) } -func (c *CoreClient) PodTemplates(namespace string) PodTemplateInterface { +func (c *CoreV1Client) PodTemplates(namespace string) PodTemplateInterface { return newPodTemplates(c, namespace) } -func (c *CoreClient) ReplicationControllers(namespace string) ReplicationControllerInterface { +func (c *CoreV1Client) ReplicationControllers(namespace string) ReplicationControllerInterface { return newReplicationControllers(c, namespace) } -func (c *CoreClient) ResourceQuotas(namespace string) ResourceQuotaInterface { +func (c *CoreV1Client) ResourceQuotas(namespace string) ResourceQuotaInterface { return newResourceQuotas(c, namespace) } -func (c *CoreClient) Secrets(namespace string) SecretInterface { +func (c *CoreV1Client) Secrets(namespace string) SecretInterface { return newSecrets(c, namespace) } -func (c *CoreClient) Services(namespace string) ServiceInterface { +func (c *CoreV1Client) Services(namespace string) ServiceInterface { return newServices(c, namespace) } -func (c *CoreClient) ServiceAccounts(namespace string) ServiceAccountInterface { +func (c *CoreV1Client) ServiceAccounts(namespace string) ServiceAccountInterface { return newServiceAccounts(c, namespace) } -// NewForConfig creates a new CoreClient for the given config. -func NewForConfig(c *restclient.Config) (*CoreClient, error) { +// NewForConfig creates a new CoreV1Client for the given config. +func NewForConfig(c *restclient.Config) (*CoreV1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -122,12 +124,12 @@ func NewForConfig(c *restclient.Config) (*CoreClient, error) { if err != nil { return nil, err } - return &CoreClient{client}, nil + return &CoreV1Client{client}, nil } -// NewForConfigOrDie creates a new CoreClient for the given config and +// NewForConfigOrDie creates a new CoreV1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *CoreClient { +func NewForConfigOrDie(c *restclient.Config) *CoreV1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -135,26 +137,26 @@ func NewForConfigOrDie(c *restclient.Config) *CoreClient { return client } -// New creates a new CoreClient for the given RESTClient. -func New(c restclient.Interface) *CoreClient { - return &CoreClient{c} +// New creates a new CoreV1Client for the given RESTClient. +func New(c restclient.Interface) *CoreV1Client { + return &CoreV1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if core group is not registered, return an error - g, err := registered.Group("") + gv, err := unversioned.ParseGroupVersion("/v1") if err != nil { return err } + // if /v1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("/v1 is not enabled") + } config.APIPath = "/api" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -163,7 +165,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CoreClient) RESTClient() restclient.Interface { +func (c *CoreV1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/doc.go index fe27cf5c194..3907c1c81f1 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/endpoints.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/endpoints.go index 2ba9c091b7d..cc970fd318d 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/endpoints.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/endpoints.go @@ -49,7 +49,7 @@ type endpoints struct { } // newEndpoints returns a Endpoints -func newEndpoints(c *CoreClient, namespace string) *endpoints { +func newEndpoints(c *CoreV1Client, namespace string) *endpoints { return &endpoints{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/event.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/event.go index fc9287bc318..6d553a086dd 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/event.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/event.go @@ -49,7 +49,7 @@ type events struct { } // newEvents returns a Events -func newEvents(c *CoreClient, namespace string) *events { +func newEvents(c *CoreV1Client, namespace string) *events { return &events{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/doc.go index 6499875c0b5..3a0baba43e3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_componentstatus.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_componentstatus.go index a02f396b9f0..d3dda3d00dc 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_componentstatus.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_componentstatus.go @@ -27,7 +27,7 @@ import ( // FakeComponentStatuses implements ComponentStatusInterface type FakeComponentStatuses struct { - Fake *FakeCore + Fake *FakeCoreV1 } var componentstatusesResource = unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "componentstatuses"} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_configmap.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_configmap.go index bfb64c9d41c..d9ea0c3e5e2 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_configmap.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_configmap.go @@ -27,7 +27,7 @@ import ( // FakeConfigMaps implements ConfigMapInterface type FakeConfigMaps struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_core_client.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_core_client.go index 7d5fef05ee9..c1c94e93031 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_core_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_core_client.go @@ -22,77 +22,77 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakeCore struct { +type FakeCoreV1 struct { *core.Fake } -func (c *FakeCore) ComponentStatuses() v1.ComponentStatusInterface { +func (c *FakeCoreV1) ComponentStatuses() v1.ComponentStatusInterface { return &FakeComponentStatuses{c} } -func (c *FakeCore) ConfigMaps(namespace string) v1.ConfigMapInterface { +func (c *FakeCoreV1) ConfigMaps(namespace string) v1.ConfigMapInterface { return &FakeConfigMaps{c, namespace} } -func (c *FakeCore) Endpoints(namespace string) v1.EndpointsInterface { +func (c *FakeCoreV1) Endpoints(namespace string) v1.EndpointsInterface { return &FakeEndpoints{c, namespace} } -func (c *FakeCore) Events(namespace string) v1.EventInterface { +func (c *FakeCoreV1) Events(namespace string) v1.EventInterface { return &FakeEvents{c, namespace} } -func (c *FakeCore) LimitRanges(namespace string) v1.LimitRangeInterface { +func (c *FakeCoreV1) LimitRanges(namespace string) v1.LimitRangeInterface { return &FakeLimitRanges{c, namespace} } -func (c *FakeCore) Namespaces() v1.NamespaceInterface { +func (c *FakeCoreV1) Namespaces() v1.NamespaceInterface { return &FakeNamespaces{c} } -func (c *FakeCore) Nodes() v1.NodeInterface { +func (c *FakeCoreV1) Nodes() v1.NodeInterface { return &FakeNodes{c} } -func (c *FakeCore) PersistentVolumes() v1.PersistentVolumeInterface { +func (c *FakeCoreV1) PersistentVolumes() v1.PersistentVolumeInterface { return &FakePersistentVolumes{c} } -func (c *FakeCore) PersistentVolumeClaims(namespace string) v1.PersistentVolumeClaimInterface { +func (c *FakeCoreV1) PersistentVolumeClaims(namespace string) v1.PersistentVolumeClaimInterface { return &FakePersistentVolumeClaims{c, namespace} } -func (c *FakeCore) Pods(namespace string) v1.PodInterface { +func (c *FakeCoreV1) Pods(namespace string) v1.PodInterface { return &FakePods{c, namespace} } -func (c *FakeCore) PodTemplates(namespace string) v1.PodTemplateInterface { +func (c *FakeCoreV1) PodTemplates(namespace string) v1.PodTemplateInterface { return &FakePodTemplates{c, namespace} } -func (c *FakeCore) ReplicationControllers(namespace string) v1.ReplicationControllerInterface { +func (c *FakeCoreV1) ReplicationControllers(namespace string) v1.ReplicationControllerInterface { return &FakeReplicationControllers{c, namespace} } -func (c *FakeCore) ResourceQuotas(namespace string) v1.ResourceQuotaInterface { +func (c *FakeCoreV1) ResourceQuotas(namespace string) v1.ResourceQuotaInterface { return &FakeResourceQuotas{c, namespace} } -func (c *FakeCore) Secrets(namespace string) v1.SecretInterface { +func (c *FakeCoreV1) Secrets(namespace string) v1.SecretInterface { return &FakeSecrets{c, namespace} } -func (c *FakeCore) Services(namespace string) v1.ServiceInterface { +func (c *FakeCoreV1) Services(namespace string) v1.ServiceInterface { return &FakeServices{c, namespace} } -func (c *FakeCore) ServiceAccounts(namespace string) v1.ServiceAccountInterface { +func (c *FakeCoreV1) ServiceAccounts(namespace string) v1.ServiceAccountInterface { return &FakeServiceAccounts{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCore) RESTClient() restclient.Interface { +func (c *FakeCoreV1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_endpoints.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_endpoints.go index 2373f273bf3..94650243b97 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_endpoints.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_endpoints.go @@ -27,7 +27,7 @@ import ( // FakeEndpoints implements EndpointsInterface type FakeEndpoints struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_event.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_event.go index 92ebc96652b..6f53ab4a949 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_event.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_event.go @@ -27,7 +27,7 @@ import ( // FakeEvents implements EventInterface type FakeEvents struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_limitrange.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_limitrange.go index 3f45c68d35a..0b528a65ab1 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_limitrange.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_limitrange.go @@ -27,7 +27,7 @@ import ( // FakeLimitRanges implements LimitRangeInterface type FakeLimitRanges struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_namespace.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_namespace.go index a1ecd209a1e..1b552c340c5 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_namespace.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_namespace.go @@ -27,7 +27,7 @@ import ( // FakeNamespaces implements NamespaceInterface type FakeNamespaces struct { - Fake *FakeCore + Fake *FakeCoreV1 } var namespacesResource = unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "namespaces"} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_node.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_node.go index 0508731c620..1bc3aa3c030 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_node.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_node.go @@ -27,7 +27,7 @@ import ( // FakeNodes implements NodeInterface type FakeNodes struct { - Fake *FakeCore + Fake *FakeCoreV1 } var nodesResource = unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "nodes"} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolume.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolume.go index e787fd973bd..e8e69a579c1 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolume.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolume.go @@ -27,7 +27,7 @@ import ( // FakePersistentVolumes implements PersistentVolumeInterface type FakePersistentVolumes struct { - Fake *FakeCore + Fake *FakeCoreV1 } var persistentvolumesResource = unversioned.GroupVersionResource{Group: "", Version: "v1", Resource: "persistentvolumes"} diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolumeclaim.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolumeclaim.go index 4a1c855e867..5d83e7dd4e2 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolumeclaim.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_persistentvolumeclaim.go @@ -27,7 +27,7 @@ import ( // FakePersistentVolumeClaims implements PersistentVolumeClaimInterface type FakePersistentVolumeClaims struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_pod.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_pod.go index f9da3820e68..37af032576c 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_pod.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_pod.go @@ -27,7 +27,7 @@ import ( // FakePods implements PodInterface type FakePods struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_podtemplate.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_podtemplate.go index 29439de43c2..c0442852529 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_podtemplate.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_podtemplate.go @@ -27,7 +27,7 @@ import ( // FakePodTemplates implements PodTemplateInterface type FakePodTemplates struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_replicationcontroller.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_replicationcontroller.go index 137f586af3d..cbdee11390c 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_replicationcontroller.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_replicationcontroller.go @@ -27,7 +27,7 @@ import ( // FakeReplicationControllers implements ReplicationControllerInterface type FakeReplicationControllers struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_resourcequota.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_resourcequota.go index ee4ddb99d53..9cc49762f90 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_resourcequota.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_resourcequota.go @@ -27,7 +27,7 @@ import ( // FakeResourceQuotas implements ResourceQuotaInterface type FakeResourceQuotas struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_secret.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_secret.go index efec61260a9..d70ff878396 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_secret.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_secret.go @@ -27,7 +27,7 @@ import ( // FakeSecrets implements SecretInterface type FakeSecrets struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_service.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_service.go index e40f670a6bd..6893267c835 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_service.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_service.go @@ -27,7 +27,7 @@ import ( // FakeServices implements ServiceInterface type FakeServices struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_serviceaccount.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_serviceaccount.go index 0ee54c4fca2..b15d85e56a2 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_serviceaccount.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/fake/fake_serviceaccount.go @@ -27,7 +27,7 @@ import ( // FakeServiceAccounts implements ServiceAccountInterface type FakeServiceAccounts struct { - Fake *FakeCore + Fake *FakeCoreV1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/limitrange.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/limitrange.go index a81582b0bf4..ce97cf6a845 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/limitrange.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/limitrange.go @@ -49,7 +49,7 @@ type limitRanges struct { } // newLimitRanges returns a LimitRanges -func newLimitRanges(c *CoreClient, namespace string) *limitRanges { +func newLimitRanges(c *CoreV1Client, namespace string) *limitRanges { return &limitRanges{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/namespace.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/namespace.go index 287a0367191..186799e5be3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/namespace.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/namespace.go @@ -49,7 +49,7 @@ type namespaces struct { } // newNamespaces returns a Namespaces -func newNamespaces(c *CoreClient) *namespaces { +func newNamespaces(c *CoreV1Client) *namespaces { return &namespaces{ client: c.RESTClient(), } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/node.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/node.go index 19823861401..8135a9c15c9 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/node.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/node.go @@ -49,7 +49,7 @@ type nodes struct { } // newNodes returns a Nodes -func newNodes(c *CoreClient) *nodes { +func newNodes(c *CoreV1Client) *nodes { return &nodes{ client: c.RESTClient(), } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolume.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolume.go index d551fe0786c..81ee3a82643 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolume.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolume.go @@ -49,7 +49,7 @@ type persistentVolumes struct { } // newPersistentVolumes returns a PersistentVolumes -func newPersistentVolumes(c *CoreClient) *persistentVolumes { +func newPersistentVolumes(c *CoreV1Client) *persistentVolumes { return &persistentVolumes{ client: c.RESTClient(), } diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolumeclaim.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolumeclaim.go index 85d262c475b..b940d1386b5 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolumeclaim.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/persistentvolumeclaim.go @@ -50,7 +50,7 @@ type persistentVolumeClaims struct { } // newPersistentVolumeClaims returns a PersistentVolumeClaims -func newPersistentVolumeClaims(c *CoreClient, namespace string) *persistentVolumeClaims { +func newPersistentVolumeClaims(c *CoreV1Client, namespace string) *persistentVolumeClaims { return &persistentVolumeClaims{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod.go index 584df2968ad..2ae5c4dbaab 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod.go @@ -50,7 +50,7 @@ type pods struct { } // newPods returns a Pods -func newPods(c *CoreClient, namespace string) *pods { +func newPods(c *CoreV1Client, namespace string) *pods { return &pods{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/podtemplate.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/podtemplate.go index a68f2649be1..97207e7494f 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/podtemplate.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/podtemplate.go @@ -49,7 +49,7 @@ type podTemplates struct { } // newPodTemplates returns a PodTemplates -func newPodTemplates(c *CoreClient, namespace string) *podTemplates { +func newPodTemplates(c *CoreV1Client, namespace string) *podTemplates { return &podTemplates{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/replicationcontroller.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/replicationcontroller.go index 4538db0a0b9..f0913c53c1a 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/replicationcontroller.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/replicationcontroller.go @@ -50,7 +50,7 @@ type replicationControllers struct { } // newReplicationControllers returns a ReplicationControllers -func newReplicationControllers(c *CoreClient, namespace string) *replicationControllers { +func newReplicationControllers(c *CoreV1Client, namespace string) *replicationControllers { return &replicationControllers{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/resourcequota.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/resourcequota.go index 4e3469bdb9f..dea8ad29058 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/resourcequota.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/resourcequota.go @@ -50,7 +50,7 @@ type resourceQuotas struct { } // newResourceQuotas returns a ResourceQuotas -func newResourceQuotas(c *CoreClient, namespace string) *resourceQuotas { +func newResourceQuotas(c *CoreV1Client, namespace string) *resourceQuotas { return &resourceQuotas{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/secret.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/secret.go index c0f7095e01b..e8e5c275dbf 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/secret.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/secret.go @@ -49,7 +49,7 @@ type secrets struct { } // newSecrets returns a Secrets -func newSecrets(c *CoreClient, namespace string) *secrets { +func newSecrets(c *CoreV1Client, namespace string) *secrets { return &secrets{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/service.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/service.go index 4b2fd5bcf68..66ffd66b515 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/service.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/service.go @@ -50,7 +50,7 @@ type services struct { } // newServices returns a Services -func newServices(c *CoreClient, namespace string) *services { +func newServices(c *CoreV1Client, namespace string) *services { return &services{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/serviceaccount.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/serviceaccount.go index 1cabffb903f..39625937780 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/serviceaccount.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/serviceaccount.go @@ -49,7 +49,7 @@ type serviceAccounts struct { } // newServiceAccounts returns a ServiceAccounts -func newServiceAccounts(c *CoreClient, namespace string) *serviceAccounts { +func newServiceAccounts(c *CoreV1Client, namespace string) *serviceAccounts { return &serviceAccounts{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/daemonset.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/daemonset.go index 071e9825349..a1c6f2a2308 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/daemonset.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/daemonset.go @@ -51,7 +51,7 @@ type daemonSets struct { } // newDaemonSets returns a DaemonSets -func newDaemonSets(c *ExtensionsClient, namespace string) *daemonSets { +func newDaemonSets(c *ExtensionsV1beta1Client, namespace string) *daemonSets { return &daemonSets{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/deployment.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/deployment.go index d77fa7931e4..6c8ae763b45 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/deployment.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/deployment.go @@ -51,7 +51,7 @@ type deployments struct { } // newDeployments returns a Deployments -func newDeployments(c *ExtensionsClient, namespace string) *deployments { +func newDeployments(c *ExtensionsV1beta1Client, namespace string) *deployments { return &deployments{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/doc.go index 5616c95d325..77edaa863fd 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1beta1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/extensions_client.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/extensions_client.go index 69a19557f2d..23b12123079 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/extensions_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/extensions_client.go @@ -17,13 +17,15 @@ limitations under the License. package v1beta1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type ExtensionsInterface interface { +type ExtensionsV1beta1Interface interface { RESTClient() restclient.Interface DaemonSetsGetter DeploymentsGetter @@ -35,45 +37,45 @@ type ExtensionsInterface interface { ThirdPartyResourcesGetter } -// ExtensionsClient is used to interact with features provided by the Extensions group. -type ExtensionsClient struct { +// ExtensionsV1beta1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type ExtensionsV1beta1Client struct { restClient restclient.Interface } -func (c *ExtensionsClient) DaemonSets(namespace string) DaemonSetInterface { +func (c *ExtensionsV1beta1Client) DaemonSets(namespace string) DaemonSetInterface { return newDaemonSets(c, namespace) } -func (c *ExtensionsClient) Deployments(namespace string) DeploymentInterface { +func (c *ExtensionsV1beta1Client) Deployments(namespace string) DeploymentInterface { return newDeployments(c, namespace) } -func (c *ExtensionsClient) Ingresses(namespace string) IngressInterface { +func (c *ExtensionsV1beta1Client) Ingresses(namespace string) IngressInterface { return newIngresses(c, namespace) } -func (c *ExtensionsClient) Jobs(namespace string) JobInterface { +func (c *ExtensionsV1beta1Client) Jobs(namespace string) JobInterface { return newJobs(c, namespace) } -func (c *ExtensionsClient) PodSecurityPolicies() PodSecurityPolicyInterface { +func (c *ExtensionsV1beta1Client) PodSecurityPolicies() PodSecurityPolicyInterface { return newPodSecurityPolicies(c) } -func (c *ExtensionsClient) ReplicaSets(namespace string) ReplicaSetInterface { +func (c *ExtensionsV1beta1Client) ReplicaSets(namespace string) ReplicaSetInterface { return newReplicaSets(c, namespace) } -func (c *ExtensionsClient) Scales(namespace string) ScaleInterface { +func (c *ExtensionsV1beta1Client) Scales(namespace string) ScaleInterface { return newScales(c, namespace) } -func (c *ExtensionsClient) ThirdPartyResources() ThirdPartyResourceInterface { +func (c *ExtensionsV1beta1Client) ThirdPartyResources() ThirdPartyResourceInterface { return newThirdPartyResources(c) } -// NewForConfig creates a new ExtensionsClient for the given config. -func NewForConfig(c *restclient.Config) (*ExtensionsClient, error) { +// NewForConfig creates a new ExtensionsV1beta1Client for the given config. +func NewForConfig(c *restclient.Config) (*ExtensionsV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -82,12 +84,12 @@ func NewForConfig(c *restclient.Config) (*ExtensionsClient, error) { if err != nil { return nil, err } - return &ExtensionsClient{client}, nil + return &ExtensionsV1beta1Client{client}, nil } -// NewForConfigOrDie creates a new ExtensionsClient for the given config and +// NewForConfigOrDie creates a new ExtensionsV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *ExtensionsClient { +func NewForConfigOrDie(c *restclient.Config) *ExtensionsV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -95,26 +97,26 @@ func NewForConfigOrDie(c *restclient.Config) *ExtensionsClient { return client } -// New creates a new ExtensionsClient for the given RESTClient. -func New(c restclient.Interface) *ExtensionsClient { - return &ExtensionsClient{c} +// New creates a new ExtensionsV1beta1Client for the given RESTClient. +func New(c restclient.Interface) *ExtensionsV1beta1Client { + return &ExtensionsV1beta1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if extensions group is not registered, return an error - g, err := registered.Group("extensions") + gv, err := unversioned.ParseGroupVersion("extensions/v1beta1") if err != nil { return err } + // if extensions/v1beta1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("extensions/v1beta1 is not enabled") + } config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -123,7 +125,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ExtensionsClient) RESTClient() restclient.Interface { +func (c *ExtensionsV1beta1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/doc.go index 6499875c0b5..3a0baba43e3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go index 816317af7b3..372081663c5 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go @@ -28,7 +28,7 @@ import ( // FakeDaemonSets implements DaemonSetInterface type FakeDaemonSets struct { - Fake *FakeExtensions + Fake *FakeExtensionsV1beta1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go index dfe1b5921d6..7df64acb30c 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go @@ -28,7 +28,7 @@ import ( // FakeDeployments implements DeploymentInterface type FakeDeployments struct { - Fake *FakeExtensions + Fake *FakeExtensionsV1beta1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go index 6095ff2c65f..fe663bdd2cb 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go @@ -22,45 +22,45 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakeExtensions struct { +type FakeExtensionsV1beta1 struct { *core.Fake } -func (c *FakeExtensions) DaemonSets(namespace string) v1beta1.DaemonSetInterface { +func (c *FakeExtensionsV1beta1) DaemonSets(namespace string) v1beta1.DaemonSetInterface { return &FakeDaemonSets{c, namespace} } -func (c *FakeExtensions) Deployments(namespace string) v1beta1.DeploymentInterface { +func (c *FakeExtensionsV1beta1) Deployments(namespace string) v1beta1.DeploymentInterface { return &FakeDeployments{c, namespace} } -func (c *FakeExtensions) Ingresses(namespace string) v1beta1.IngressInterface { +func (c *FakeExtensionsV1beta1) Ingresses(namespace string) v1beta1.IngressInterface { return &FakeIngresses{c, namespace} } -func (c *FakeExtensions) Jobs(namespace string) v1beta1.JobInterface { +func (c *FakeExtensionsV1beta1) Jobs(namespace string) v1beta1.JobInterface { return &FakeJobs{c, namespace} } -func (c *FakeExtensions) PodSecurityPolicies() v1beta1.PodSecurityPolicyInterface { +func (c *FakeExtensionsV1beta1) PodSecurityPolicies() v1beta1.PodSecurityPolicyInterface { return &FakePodSecurityPolicies{c} } -func (c *FakeExtensions) ReplicaSets(namespace string) v1beta1.ReplicaSetInterface { +func (c *FakeExtensionsV1beta1) ReplicaSets(namespace string) v1beta1.ReplicaSetInterface { return &FakeReplicaSets{c, namespace} } -func (c *FakeExtensions) Scales(namespace string) v1beta1.ScaleInterface { +func (c *FakeExtensionsV1beta1) Scales(namespace string) v1beta1.ScaleInterface { return &FakeScales{c, namespace} } -func (c *FakeExtensions) ThirdPartyResources() v1beta1.ThirdPartyResourceInterface { +func (c *FakeExtensionsV1beta1) ThirdPartyResources() v1beta1.ThirdPartyResourceInterface { return &FakeThirdPartyResources{c} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeExtensions) RESTClient() restclient.Interface { +func (c *FakeExtensionsV1beta1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go index 04a380a2d73..a82e393cfdd 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go @@ -28,7 +28,7 @@ import ( // FakeIngresses implements IngressInterface type FakeIngresses struct { - Fake *FakeExtensions + Fake *FakeExtensionsV1beta1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_job.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_job.go index 2e60a237206..a35c7aaa772 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_job.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_job.go @@ -28,7 +28,7 @@ import ( // FakeJobs implements JobInterface type FakeJobs struct { - Fake *FakeExtensions + Fake *FakeExtensionsV1beta1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go index a4b17f55bb3..38b10e4bca9 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go @@ -28,7 +28,7 @@ import ( // FakePodSecurityPolicies implements PodSecurityPolicyInterface type FakePodSecurityPolicies struct { - Fake *FakeExtensions + Fake *FakeExtensionsV1beta1 } var podsecuritypoliciesResource = unversioned.GroupVersionResource{Group: "extensions", Version: "v1beta1", Resource: "podsecuritypolicies"} diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go index a16cb9cfbb9..75a4c2cd8b1 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go @@ -28,7 +28,7 @@ import ( // FakeReplicaSets implements ReplicaSetInterface type FakeReplicaSets struct { - Fake *FakeExtensions + Fake *FakeExtensionsV1beta1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_scale.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_scale.go index 0179e4edce4..7e77279c3c2 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_scale.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_scale.go @@ -18,6 +18,6 @@ package fake // FakeScales implements ScaleInterface type FakeScales struct { - Fake *FakeExtensions + Fake *FakeExtensionsV1beta1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go index e16bb2ba690..a87ba06dd24 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go @@ -28,7 +28,7 @@ import ( // FakeThirdPartyResources implements ThirdPartyResourceInterface type FakeThirdPartyResources struct { - Fake *FakeExtensions + Fake *FakeExtensionsV1beta1 } var thirdpartyresourcesResource = unversioned.GroupVersionResource{Group: "extensions", Version: "v1beta1", Resource: "thirdpartyresources"} diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/ingress.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/ingress.go index 287fbba9493..f09456cf08e 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/ingress.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/ingress.go @@ -51,7 +51,7 @@ type ingresses struct { } // newIngresses returns a Ingresses -func newIngresses(c *ExtensionsClient, namespace string) *ingresses { +func newIngresses(c *ExtensionsV1beta1Client, namespace string) *ingresses { return &ingresses{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/job.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/job.go index 513850f38be..dead9eeb88c 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/job.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/job.go @@ -51,7 +51,7 @@ type jobs struct { } // newJobs returns a Jobs -func newJobs(c *ExtensionsClient, namespace string) *jobs { +func newJobs(c *ExtensionsV1beta1Client, namespace string) *jobs { return &jobs{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/podsecuritypolicy.go index 9b38e8c2781..7833903c4ce 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/podsecuritypolicy.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/podsecuritypolicy.go @@ -49,7 +49,7 @@ type podSecurityPolicies struct { } // newPodSecurityPolicies returns a PodSecurityPolicies -func newPodSecurityPolicies(c *ExtensionsClient) *podSecurityPolicies { +func newPodSecurityPolicies(c *ExtensionsV1beta1Client) *podSecurityPolicies { return &podSecurityPolicies{ client: c.RESTClient(), } diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/replicaset.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/replicaset.go index c3de95de5f5..00ef2d746a2 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/replicaset.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/replicaset.go @@ -51,7 +51,7 @@ type replicaSets struct { } // newReplicaSets returns a ReplicaSets -func newReplicaSets(c *ExtensionsClient, namespace string) *replicaSets { +func newReplicaSets(c *ExtensionsV1beta1Client, namespace string) *replicaSets { return &replicaSets{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/scale.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/scale.go index 8ba905c6424..b005d4d5b0b 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/scale.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/scale.go @@ -38,7 +38,7 @@ type scales struct { } // newScales returns a Scales -func newScales(c *ExtensionsClient, namespace string) *scales { +func newScales(c *ExtensionsV1beta1Client, namespace string) *scales { return &scales{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/thirdpartyresource.go b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/thirdpartyresource.go index 924967c6655..951e388b879 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/thirdpartyresource.go +++ b/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1/thirdpartyresource.go @@ -49,7 +49,7 @@ type thirdPartyResources struct { } // newThirdPartyResources returns a ThirdPartyResources -func newThirdPartyResources(c *ExtensionsClient) *thirdPartyResources { +func newThirdPartyResources(c *ExtensionsV1beta1Client) *thirdPartyResources { return &thirdPartyResources{ client: c.RESTClient(), } diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/BUILD b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/BUILD index dc7188f5daf..fefa72e78dc 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/BUILD +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/BUILD @@ -21,6 +21,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/policy/v1alpha1:go_default_library", diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/doc.go index 0c1ca41facc..0eb10bf4809 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1alpha1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/doc.go index 6499875c0b5..3a0baba43e3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_poddisruptionbudget.go b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_poddisruptionbudget.go index 1f9661f30cf..76229748a01 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_poddisruptionbudget.go +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_poddisruptionbudget.go @@ -28,7 +28,7 @@ import ( // FakePodDisruptionBudgets implements PodDisruptionBudgetInterface type FakePodDisruptionBudgets struct { - Fake *FakePolicy + Fake *FakePolicyV1alpha1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_policy_client.go b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_policy_client.go index 993f2873b3b..2fae350e1e9 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_policy_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/fake/fake_policy_client.go @@ -22,17 +22,17 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakePolicy struct { +type FakePolicyV1alpha1 struct { *core.Fake } -func (c *FakePolicy) PodDisruptionBudgets(namespace string) v1alpha1.PodDisruptionBudgetInterface { +func (c *FakePolicyV1alpha1) PodDisruptionBudgets(namespace string) v1alpha1.PodDisruptionBudgetInterface { return &FakePodDisruptionBudgets{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakePolicy) RESTClient() restclient.Interface { +func (c *FakePolicyV1alpha1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/poddisruptionbudget.go b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/poddisruptionbudget.go index 3e348ced90f..63e9848359c 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/poddisruptionbudget.go +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/poddisruptionbudget.go @@ -51,7 +51,7 @@ type podDisruptionBudgets struct { } // newPodDisruptionBudgets returns a PodDisruptionBudgets -func newPodDisruptionBudgets(c *PolicyClient, namespace string) *podDisruptionBudgets { +func newPodDisruptionBudgets(c *PolicyV1alpha1Client, namespace string) *podDisruptionBudgets { return &podDisruptionBudgets{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/policy_client.go b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/policy_client.go index aa2f41005a2..f72b3871ecb 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/policy_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/policy/v1alpha1/policy_client.go @@ -17,28 +17,30 @@ limitations under the License. package v1alpha1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type PolicyInterface interface { +type PolicyV1alpha1Interface interface { RESTClient() restclient.Interface PodDisruptionBudgetsGetter } -// PolicyClient is used to interact with features provided by the Policy group. -type PolicyClient struct { +// PolicyV1alpha1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type PolicyV1alpha1Client struct { restClient restclient.Interface } -func (c *PolicyClient) PodDisruptionBudgets(namespace string) PodDisruptionBudgetInterface { +func (c *PolicyV1alpha1Client) PodDisruptionBudgets(namespace string) PodDisruptionBudgetInterface { return newPodDisruptionBudgets(c, namespace) } -// NewForConfig creates a new PolicyClient for the given config. -func NewForConfig(c *restclient.Config) (*PolicyClient, error) { +// NewForConfig creates a new PolicyV1alpha1Client for the given config. +func NewForConfig(c *restclient.Config) (*PolicyV1alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -47,12 +49,12 @@ func NewForConfig(c *restclient.Config) (*PolicyClient, error) { if err != nil { return nil, err } - return &PolicyClient{client}, nil + return &PolicyV1alpha1Client{client}, nil } -// NewForConfigOrDie creates a new PolicyClient for the given config and +// NewForConfigOrDie creates a new PolicyV1alpha1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *PolicyClient { +func NewForConfigOrDie(c *restclient.Config) *PolicyV1alpha1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -60,26 +62,26 @@ func NewForConfigOrDie(c *restclient.Config) *PolicyClient { return client } -// New creates a new PolicyClient for the given RESTClient. -func New(c restclient.Interface) *PolicyClient { - return &PolicyClient{c} +// New creates a new PolicyV1alpha1Client for the given RESTClient. +func New(c restclient.Interface) *PolicyV1alpha1Client { + return &PolicyV1alpha1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if policy group is not registered, return an error - g, err := registered.Group("policy") + gv, err := unversioned.ParseGroupVersion("policy/v1alpha1") if err != nil { return err } + // if policy/v1alpha1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("policy/v1alpha1 is not enabled") + } config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -88,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *PolicyClient) RESTClient() restclient.Interface { +func (c *PolicyV1alpha1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/BUILD b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/BUILD index 2ab1ca4c019..7a02349207a 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/BUILD +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/BUILD @@ -24,6 +24,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/rbac/v1alpha1:go_default_library", diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrole.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrole.go index 2e5604bcd31..11b401e1d43 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrole.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrole.go @@ -49,7 +49,7 @@ type clusterRoles struct { } // newClusterRoles returns a ClusterRoles -func newClusterRoles(c *RbacClient) *clusterRoles { +func newClusterRoles(c *RbacV1alpha1Client) *clusterRoles { return &clusterRoles{ client: c.RESTClient(), } diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrolebinding.go index ebe7a967212..9a2d5b7c38a 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrolebinding.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/clusterrolebinding.go @@ -49,7 +49,7 @@ type clusterRoleBindings struct { } // newClusterRoleBindings returns a ClusterRoleBindings -func newClusterRoleBindings(c *RbacClient) *clusterRoleBindings { +func newClusterRoleBindings(c *RbacV1alpha1Client) *clusterRoleBindings { return &clusterRoleBindings{ client: c.RESTClient(), } diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/doc.go index 0c1ca41facc..0eb10bf4809 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1alpha1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/doc.go index 6499875c0b5..3a0baba43e3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_clusterrole.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_clusterrole.go index 47bc733a1c0..084ab43afc7 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_clusterrole.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_clusterrole.go @@ -28,7 +28,7 @@ import ( // FakeClusterRoles implements ClusterRoleInterface type FakeClusterRoles struct { - Fake *FakeRbac + Fake *FakeRbacV1alpha1 } var clusterrolesResource = unversioned.GroupVersionResource{Group: "rbac.authorization.k8s.io", Version: "v1alpha1", Resource: "clusterroles"} diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go index 7d815d349a5..fef8ac3cdf9 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go @@ -28,7 +28,7 @@ import ( // FakeClusterRoleBindings implements ClusterRoleBindingInterface type FakeClusterRoleBindings struct { - Fake *FakeRbac + Fake *FakeRbacV1alpha1 } var clusterrolebindingsResource = unversioned.GroupVersionResource{Group: "rbac.authorization.k8s.io", Version: "v1alpha1", Resource: "clusterrolebindings"} diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_rbac_client.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_rbac_client.go index f132a415f1b..aaa0db74ec1 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_rbac_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_rbac_client.go @@ -22,29 +22,29 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakeRbac struct { +type FakeRbacV1alpha1 struct { *core.Fake } -func (c *FakeRbac) ClusterRoles() v1alpha1.ClusterRoleInterface { +func (c *FakeRbacV1alpha1) ClusterRoles() v1alpha1.ClusterRoleInterface { return &FakeClusterRoles{c} } -func (c *FakeRbac) ClusterRoleBindings() v1alpha1.ClusterRoleBindingInterface { +func (c *FakeRbacV1alpha1) ClusterRoleBindings() v1alpha1.ClusterRoleBindingInterface { return &FakeClusterRoleBindings{c} } -func (c *FakeRbac) Roles(namespace string) v1alpha1.RoleInterface { +func (c *FakeRbacV1alpha1) Roles(namespace string) v1alpha1.RoleInterface { return &FakeRoles{c, namespace} } -func (c *FakeRbac) RoleBindings(namespace string) v1alpha1.RoleBindingInterface { +func (c *FakeRbacV1alpha1) RoleBindings(namespace string) v1alpha1.RoleBindingInterface { return &FakeRoleBindings{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeRbac) RESTClient() restclient.Interface { +func (c *FakeRbacV1alpha1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_role.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_role.go index c60010c9f26..b599913130d 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_role.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_role.go @@ -28,7 +28,7 @@ import ( // FakeRoles implements RoleInterface type FakeRoles struct { - Fake *FakeRbac + Fake *FakeRbacV1alpha1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_rolebinding.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_rolebinding.go index e2501f5abd2..c07ea11a1ef 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_rolebinding.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/fake/fake_rolebinding.go @@ -28,7 +28,7 @@ import ( // FakeRoleBindings implements RoleBindingInterface type FakeRoleBindings struct { - Fake *FakeRbac + Fake *FakeRbacV1alpha1 ns string } diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rbac_client.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rbac_client.go index c702d93f640..1f8ccff198b 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rbac_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rbac_client.go @@ -17,13 +17,15 @@ limitations under the License. package v1alpha1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type RbacInterface interface { +type RbacV1alpha1Interface interface { RESTClient() restclient.Interface ClusterRolesGetter ClusterRoleBindingsGetter @@ -31,29 +33,29 @@ type RbacInterface interface { RoleBindingsGetter } -// RbacClient is used to interact with features provided by the Rbac group. -type RbacClient struct { +// RbacV1alpha1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type RbacV1alpha1Client struct { restClient restclient.Interface } -func (c *RbacClient) ClusterRoles() ClusterRoleInterface { +func (c *RbacV1alpha1Client) ClusterRoles() ClusterRoleInterface { return newClusterRoles(c) } -func (c *RbacClient) ClusterRoleBindings() ClusterRoleBindingInterface { +func (c *RbacV1alpha1Client) ClusterRoleBindings() ClusterRoleBindingInterface { return newClusterRoleBindings(c) } -func (c *RbacClient) Roles(namespace string) RoleInterface { +func (c *RbacV1alpha1Client) Roles(namespace string) RoleInterface { return newRoles(c, namespace) } -func (c *RbacClient) RoleBindings(namespace string) RoleBindingInterface { +func (c *RbacV1alpha1Client) RoleBindings(namespace string) RoleBindingInterface { return newRoleBindings(c, namespace) } -// NewForConfig creates a new RbacClient for the given config. -func NewForConfig(c *restclient.Config) (*RbacClient, error) { +// NewForConfig creates a new RbacV1alpha1Client for the given config. +func NewForConfig(c *restclient.Config) (*RbacV1alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -62,12 +64,12 @@ func NewForConfig(c *restclient.Config) (*RbacClient, error) { if err != nil { return nil, err } - return &RbacClient{client}, nil + return &RbacV1alpha1Client{client}, nil } -// NewForConfigOrDie creates a new RbacClient for the given config and +// NewForConfigOrDie creates a new RbacV1alpha1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *RbacClient { +func NewForConfigOrDie(c *restclient.Config) *RbacV1alpha1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -75,26 +77,26 @@ func NewForConfigOrDie(c *restclient.Config) *RbacClient { return client } -// New creates a new RbacClient for the given RESTClient. -func New(c restclient.Interface) *RbacClient { - return &RbacClient{c} +// New creates a new RbacV1alpha1Client for the given RESTClient. +func New(c restclient.Interface) *RbacV1alpha1Client { + return &RbacV1alpha1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if rbac group is not registered, return an error - g, err := registered.Group("rbac.authorization.k8s.io") + gv, err := unversioned.ParseGroupVersion("rbac.authorization.k8s.io/v1alpha1") if err != nil { return err } + // if rbac.authorization.k8s.io/v1alpha1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("rbac.authorization.k8s.io/v1alpha1 is not enabled") + } config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -103,7 +105,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *RbacClient) RESTClient() restclient.Interface { +func (c *RbacV1alpha1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/role.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/role.go index ae1600d0edd..c02ff1df768 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/role.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/role.go @@ -50,7 +50,7 @@ type roles struct { } // newRoles returns a Roles -func newRoles(c *RbacClient, namespace string) *roles { +func newRoles(c *RbacV1alpha1Client, namespace string) *roles { return &roles{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rolebinding.go b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rolebinding.go index a83c1f9008c..906812b1069 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rolebinding.go +++ b/pkg/client/clientset_generated/release_1_5/typed/rbac/v1alpha1/rolebinding.go @@ -50,7 +50,7 @@ type roleBindings struct { } // newRoleBindings returns a RoleBindings -func newRoleBindings(c *RbacClient, namespace string) *roleBindings { +func newRoleBindings(c *RbacV1alpha1Client, namespace string) *roleBindings { return &roleBindings{ client: c.RESTClient(), ns: namespace, diff --git a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/BUILD b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/BUILD index dac65c912b5..51c87078a42 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/BUILD +++ b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/BUILD @@ -21,6 +21,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", diff --git a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/doc.go b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/doc.go index 5616c95d325..77edaa863fd 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // This package has the automatically generated typed clients. package v1beta1 diff --git a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/doc.go b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/doc.go index 6499875c0b5..3a0baba43e3 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/doc.go +++ b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] +// This package is generated by client-gen with arguments: --clientset-name=release_1_5 --input=[api/v1,apps/v1alpha1,authentication/v1beta1,authorization/v1beta1,autoscaling/v1,batch/v1,batch/v2alpha1,certificates/v1alpha1,extensions/v1beta1,policy/v1alpha1,rbac/v1alpha1,storage/v1beta1] // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/fake_storage_client.go b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/fake_storage_client.go index b145ba06cdc..904fe803a70 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/fake_storage_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/fake_storage_client.go @@ -22,17 +22,17 @@ import ( core "k8s.io/kubernetes/pkg/client/testing/core" ) -type FakeStorage struct { +type FakeStorageV1beta1 struct { *core.Fake } -func (c *FakeStorage) StorageClasses() v1beta1.StorageClassInterface { +func (c *FakeStorageV1beta1) StorageClasses() v1beta1.StorageClassInterface { return &FakeStorageClasses{c} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeStorage) RESTClient() restclient.Interface { +func (c *FakeStorageV1beta1) RESTClient() restclient.Interface { var ret *restclient.RESTClient return ret } diff --git a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/fake_storageclass.go b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/fake_storageclass.go index f90eff6f99e..58f209ff89c 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/fake_storageclass.go +++ b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/fake/fake_storageclass.go @@ -28,7 +28,7 @@ import ( // FakeStorageClasses implements StorageClassInterface type FakeStorageClasses struct { - Fake *FakeStorage + Fake *FakeStorageV1beta1 } var storageclassesResource = unversioned.GroupVersionResource{Group: "storage.k8s.io", Version: "v1beta1", Resource: "storageclasses"} diff --git a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storage_client.go b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storage_client.go index 75addfddbb4..e757c23894b 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storage_client.go +++ b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storage_client.go @@ -17,28 +17,30 @@ limitations under the License. package v1beta1 import ( + fmt "fmt" api "k8s.io/kubernetes/pkg/api" + unversioned "k8s.io/kubernetes/pkg/api/unversioned" registered "k8s.io/kubernetes/pkg/apimachinery/registered" restclient "k8s.io/kubernetes/pkg/client/restclient" serializer "k8s.io/kubernetes/pkg/runtime/serializer" ) -type StorageInterface interface { +type StorageV1beta1Interface interface { RESTClient() restclient.Interface StorageClassesGetter } -// StorageClient is used to interact with features provided by the Storage group. -type StorageClient struct { +// StorageV1beta1Client is used to interact with features provided by the k8s.io/kubernetes/pkg/apimachinery/registered.Group group. +type StorageV1beta1Client struct { restClient restclient.Interface } -func (c *StorageClient) StorageClasses() StorageClassInterface { +func (c *StorageV1beta1Client) StorageClasses() StorageClassInterface { return newStorageClasses(c) } -// NewForConfig creates a new StorageClient for the given config. -func NewForConfig(c *restclient.Config) (*StorageClient, error) { +// NewForConfig creates a new StorageV1beta1Client for the given config. +func NewForConfig(c *restclient.Config) (*StorageV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -47,12 +49,12 @@ func NewForConfig(c *restclient.Config) (*StorageClient, error) { if err != nil { return nil, err } - return &StorageClient{client}, nil + return &StorageV1beta1Client{client}, nil } -// NewForConfigOrDie creates a new StorageClient for the given config and +// NewForConfigOrDie creates a new StorageV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *restclient.Config) *StorageClient { +func NewForConfigOrDie(c *restclient.Config) *StorageV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -60,26 +62,26 @@ func NewForConfigOrDie(c *restclient.Config) *StorageClient { return client } -// New creates a new StorageClient for the given RESTClient. -func New(c restclient.Interface) *StorageClient { - return &StorageClient{c} +// New creates a new StorageV1beta1Client for the given RESTClient. +func New(c restclient.Interface) *StorageV1beta1Client { + return &StorageV1beta1Client{c} } func setConfigDefaults(config *restclient.Config) error { - // if storage group is not registered, return an error - g, err := registered.Group("storage.k8s.io") + gv, err := unversioned.ParseGroupVersion("storage.k8s.io/v1beta1") if err != nil { return err } + // if storage.k8s.io/v1beta1 is not enabled, return an error + if !registered.IsEnabledVersion(gv) { + return fmt.Errorf("storage.k8s.io/v1beta1 is not enabled") + } config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion + copyGroupVersion := gv config.GroupVersion = ©GroupVersion - //} config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} @@ -88,7 +90,7 @@ func setConfigDefaults(config *restclient.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *StorageClient) RESTClient() restclient.Interface { +func (c *StorageV1beta1Client) RESTClient() restclient.Interface { if c == nil { return nil } diff --git a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storageclass.go b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storageclass.go index f85b0f5f996..74a0925b52a 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storageclass.go +++ b/pkg/client/clientset_generated/release_1_5/typed/storage/v1beta1/storageclass.go @@ -49,7 +49,7 @@ type storageClasses struct { } // newStorageClasses returns a StorageClasses -func newStorageClasses(c *StorageClient) *storageClasses { +func newStorageClasses(c *StorageV1beta1Client) *storageClasses { return &storageClasses{ client: c.RESTClient(), } diff --git a/pkg/client/unversioned/BUILD b/pkg/client/unversioned/BUILD index 81c8c1cf2d6..190c1cbdebf 100644 --- a/pkg/client/unversioned/BUILD +++ b/pkg/client/unversioned/BUILD @@ -25,10 +25,10 @@ go_library( "//pkg/apis/apps:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/apps/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/batch/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/util/wait:go_default_library", "//pkg/watch:go_default_library", diff --git a/pkg/client/unversioned/conditions.go b/pkg/client/unversioned/conditions.go index 7eb4048148e..ee39add8d25 100644 --- a/pkg/client/unversioned/conditions.go +++ b/pkg/client/unversioned/conditions.go @@ -25,10 +25,10 @@ import ( "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" - appsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned" - batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" - extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" + appsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" + batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/watch" ) diff --git a/pkg/controller/BUILD b/pkg/controller/BUILD index 64364a5525e..26d93d511f0 100644 --- a/pkg/controller/BUILD +++ b/pkg/controller/BUILD @@ -29,7 +29,7 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/fields:go_default_library", diff --git a/pkg/controller/certificates/BUILD b/pkg/controller/certificates/BUILD index e7a5f7ab238..8a421f833bc 100644 --- a/pkg/controller/certificates/BUILD +++ b/pkg/controller/certificates/BUILD @@ -23,7 +23,7 @@ go_library( "//pkg/apis/certificates:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/controller:go_default_library", "//pkg/runtime:go_default_library", diff --git a/pkg/controller/certificates/controller.go b/pkg/controller/certificates/controller.go index 64e72e22b67..f8f771638b9 100644 --- a/pkg/controller/certificates/controller.go +++ b/pkg/controller/certificates/controller.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/client_builder.go b/pkg/controller/client_builder.go index 1478fabaae9..d5e1aca3737 100644 --- a/pkg/controller/client_builder.go +++ b/pkg/controller/client_builder.go @@ -24,7 +24,7 @@ import ( apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/daemon/BUILD b/pkg/controller/daemon/BUILD index 2c3aeef1541..7e594c2dbda 100644 --- a/pkg/controller/daemon/BUILD +++ b/pkg/controller/daemon/BUILD @@ -23,8 +23,8 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", diff --git a/pkg/controller/daemon/daemoncontroller.go b/pkg/controller/daemon/daemoncontroller.go index 47bf7ab9b9a..2e000138322 100644 --- a/pkg/controller/daemon/daemoncontroller.go +++ b/pkg/controller/daemon/daemoncontroller.go @@ -28,8 +28,8 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" - unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/informers" diff --git a/pkg/controller/deployment/BUILD b/pkg/controller/deployment/BUILD index 45259437431..508df1fda44 100644 --- a/pkg/controller/deployment/BUILD +++ b/pkg/controller/deployment/BUILD @@ -27,7 +27,7 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/client/retry:go_default_library", "//pkg/controller:go_default_library", diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index f04c872ed2f..009741abd35 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/deployment/util" diff --git a/pkg/controller/disruption/BUILD b/pkg/controller/disruption/BUILD index dba5b975d14..03aeab2f177 100644 --- a/pkg/controller/disruption/BUILD +++ b/pkg/controller/disruption/BUILD @@ -21,8 +21,8 @@ go_library( "//pkg/apis/policy:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/policy/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/controller:go_default_library", "//pkg/runtime:go_default_library", diff --git a/pkg/controller/disruption/disruption.go b/pkg/controller/disruption/disruption.go index 2b3736f031b..db74ec79ab9 100644 --- a/pkg/controller/disruption/disruption.go +++ b/pkg/controller/disruption/disruption.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" - policyclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + policyclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/job/BUILD b/pkg/controller/job/BUILD index db0176aa3dc..b7ada0fa7a7 100644 --- a/pkg/controller/job/BUILD +++ b/pkg/controller/job/BUILD @@ -24,7 +24,7 @@ go_library( "//pkg/apis/batch:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", diff --git a/pkg/controller/job/jobcontroller.go b/pkg/controller/job/jobcontroller.go index 6fac1ffb9df..0d6f746767f 100644 --- a/pkg/controller/job/jobcontroller.go +++ b/pkg/controller/job/jobcontroller.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/informers" diff --git a/pkg/controller/node/BUILD b/pkg/controller/node/BUILD index 610ffd874c0..1a7c64ebe56 100644 --- a/pkg/controller/node/BUILD +++ b/pkg/controller/node/BUILD @@ -31,7 +31,7 @@ go_library( "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/controller/informers:go_default_library", diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 7c914fd06cf..587a7d104ed 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller/informers" diff --git a/pkg/controller/node/test_utils.go b/pkg/controller/node/test_utils.go index 062294a01c1..72584e8ee37 100644 --- a/pkg/controller/node/test_utils.go +++ b/pkg/controller/node/test_utils.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/clock" utilnode "k8s.io/kubernetes/pkg/util/node" diff --git a/pkg/controller/petset/BUILD b/pkg/controller/petset/BUILD index da6d42b1621..be0508f5fb0 100644 --- a/pkg/controller/petset/BUILD +++ b/pkg/controller/petset/BUILD @@ -30,8 +30,8 @@ go_library( "//pkg/apis/apps:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/apps/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/controller:go_default_library", "//pkg/runtime:go_default_library", @@ -62,8 +62,8 @@ go_test( "//pkg/apis/apps:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/apps/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake:go_default_library", "//pkg/controller:go_default_library", "//pkg/util/errors:go_default_library", "//pkg/util/sets:go_default_library", diff --git a/pkg/controller/petset/pet_set.go b/pkg/controller/petset/pet_set.go index c338ce694e7..4800bb0bcfc 100644 --- a/pkg/controller/petset/pet_set.go +++ b/pkg/controller/petset/pet_set.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/petset/pet_set_test.go b/pkg/controller/petset/pet_set_test.go index 4f869c1f331..da98e6e955a 100644 --- a/pkg/controller/petset/pet_set_test.go +++ b/pkg/controller/petset/pet_set_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/client/cache" fake_internal "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/fake" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/util/errors" ) @@ -285,7 +285,7 @@ type fakeClient struct { statefulsetClient *fakeStatefulSetClient } -func (c *fakeClient) Apps() unversioned.AppsInterface { +func (c *fakeClient) Apps() internalversion.AppsInterface { return &fakeApps{c, &fake.FakeApps{}} } @@ -294,7 +294,7 @@ type fakeApps struct { *fake.FakeApps } -func (c *fakeApps) StatefulSets(namespace string) unversioned.StatefulSetInterface { +func (c *fakeApps) StatefulSets(namespace string) internalversion.StatefulSetInterface { c.statefulsetClient.Namespace = namespace return c.statefulsetClient } diff --git a/pkg/controller/petset/pet_set_utils.go b/pkg/controller/petset/pet_set_utils.go index 1b912a4cf6c..95b0f6aa04d 100644 --- a/pkg/controller/petset/pet_set_utils.go +++ b/pkg/controller/petset/pet_set_utils.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/client/cache" - appsclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned" + appsclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" "k8s.io/kubernetes/pkg/controller" "github.com/golang/glog" diff --git a/pkg/controller/podautoscaler/BUILD b/pkg/controller/podautoscaler/BUILD index 94584df9fac..3dd0fbf10b5 100644 --- a/pkg/controller/podautoscaler/BUILD +++ b/pkg/controller/podautoscaler/BUILD @@ -24,9 +24,9 @@ go_library( "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/client/cache:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/controller/podautoscaler/metrics:go_default_library", "//pkg/runtime:go_default_library", @@ -50,7 +50,7 @@ go_test( "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index a5e92e42ed1..30ab629e482 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/pkg/controller/podautoscaler/horizontal.go @@ -29,9 +29,9 @@ import ( "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/cache" - unversionedautoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" - unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" + unversionedautoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/podautoscaler/horizontal_test.go b/pkg/controller/podautoscaler/horizontal_test.go index b0f9d625e19..e59a4ad9240 100644 --- a/pkg/controller/podautoscaler/horizontal_test.go +++ b/pkg/controller/podautoscaler/horizontal_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/pkg/controller/replicaset/BUILD b/pkg/controller/replicaset/BUILD index e580041bd9a..7a0a154bd1b 100644 --- a/pkg/controller/replicaset/BUILD +++ b/pkg/controller/replicaset/BUILD @@ -26,8 +26,8 @@ go_library( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", diff --git a/pkg/controller/replicaset/replica_set.go b/pkg/controller/replicaset/replica_set.go index bb359a14acc..7624e9c8c76 100644 --- a/pkg/controller/replicaset/replica_set.go +++ b/pkg/controller/replicaset/replica_set.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/informers" diff --git a/pkg/controller/replicaset/replica_set_utils.go b/pkg/controller/replicaset/replica_set_utils.go index 77067aaf509..76a7c3608b5 100644 --- a/pkg/controller/replicaset/replica_set_utils.go +++ b/pkg/controller/replicaset/replica_set_utils.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" + unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" ) // updateReplicaCount attempts to update the Status.Replicas of the given ReplicaSet, with a single GET/PUT retry. diff --git a/pkg/controller/replication/BUILD b/pkg/controller/replication/BUILD index 746a4650cbe..9a4b476266c 100644 --- a/pkg/controller/replication/BUILD +++ b/pkg/controller/replication/BUILD @@ -25,7 +25,7 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/informers:go_default_library", diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index 8b857d6695e..3a6223863fe 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/informers" diff --git a/pkg/controller/replication/replication_controller_utils.go b/pkg/controller/replication/replication_controller_utils.go index d3924ee6c5a..2cffb5e32da 100644 --- a/pkg/controller/replication/replication_controller_utils.go +++ b/pkg/controller/replication/replication_controller_utils.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" ) // updateReplicaCount attempts to update the Status.Replicas of the given controller, with a single GET/PUT retry. diff --git a/pkg/controller/scheduledjob/BUILD b/pkg/controller/scheduledjob/BUILD index e0406475f81..8b8bffde7bb 100644 --- a/pkg/controller/scheduledjob/BUILD +++ b/pkg/controller/scheduledjob/BUILD @@ -25,7 +25,7 @@ go_library( "//pkg/api/unversioned:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/controller/job:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/controller/scheduledjob/controller.go b/pkg/controller/scheduledjob/controller.go index ba7e744cf21..5397afdea5a 100644 --- a/pkg/controller/scheduledjob/controller.go +++ b/pkg/controller/scheduledjob/controller.go @@ -39,7 +39,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/batch" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller/job" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/service/BUILD b/pkg/controller/service/BUILD index a2f81d1b5d2..61dc1e5d4d5 100644 --- a/pkg/controller/service/BUILD +++ b/pkg/controller/service/BUILD @@ -22,7 +22,7 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/controller:go_default_library", diff --git a/pkg/controller/service/servicecontroller.go b/pkg/controller/service/servicecontroller.go index 4ab3a925a4b..441c481dde8 100644 --- a/pkg/controller/service/servicecontroller.go +++ b/pkg/controller/service/servicecontroller.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversioned_core "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversioned_core "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/volume/persistentvolume/BUILD b/pkg/controller/volume/persistentvolume/BUILD index caea3f31db2..fb998828424 100644 --- a/pkg/controller/volume/persistentvolume/BUILD +++ b/pkg/controller/volume/persistentvolume/BUILD @@ -28,7 +28,7 @@ go_library( "//pkg/apis/storage/util:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/conversion:go_default_library", diff --git a/pkg/controller/volume/persistentvolume/pv_controller_base.go b/pkg/controller/volume/persistentvolume/pv_controller_base.go index 14292a39b55..d786b67241b 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller_base.go +++ b/pkg/controller/volume/persistentvolume/pv_controller_base.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversioned_core "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversioned_core "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/conversion" diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 20e6fb47c5c..b12394951f7 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -71,10 +71,10 @@ go_library( "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/util:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/apps/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/batch/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/retry:go_default_library", "//pkg/client/unversioned:go_default_library", @@ -153,9 +153,9 @@ go_test( "//pkg/apis/storage:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/batch/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/client/unversioned/fake:go_default_library", diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 2e7af4039e2..a0743ebbd21 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -70,7 +70,7 @@ go_library( "//pkg/apis/batch/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", diff --git a/pkg/kubectl/cmd/attach.go b/pkg/kubectl/cmd/attach.go index cdacd01fc3b..2dbbb0b8c08 100644 --- a/pkg/kubectl/cmd/attach.go +++ b/pkg/kubectl/cmd/attach.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/unversioned/remotecommand" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" diff --git a/pkg/kubectl/cmd/exec.go b/pkg/kubectl/cmd/exec.go index 6674cb89328..bc840d33431 100644 --- a/pkg/kubectl/cmd/exec.go +++ b/pkg/kubectl/cmd/exec.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/unversioned/remotecommand" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" diff --git a/pkg/kubectl/cmd/portforward.go b/pkg/kubectl/cmd/portforward.go index b00f81fa775..add05b23a68 100644 --- a/pkg/kubectl/cmd/portforward.go +++ b/pkg/kubectl/cmd/portforward.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/unversioned/portforward" "k8s.io/kubernetes/pkg/client/unversioned/remotecommand" diff --git a/pkg/kubectl/cmd/run.go b/pkg/kubectl/cmd/run.go index bd937656ec4..1430727a266 100644 --- a/pkg/kubectl/cmd/run.go +++ b/pkg/kubectl/cmd/run.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" conditions "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" diff --git a/pkg/kubectl/cmd/top_node.go b/pkg/kubectl/cmd/top_node.go index b02b15ada67..8dd2982b713 100644 --- a/pkg/kubectl/cmd/top_node.go +++ b/pkg/kubectl/cmd/top_node.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/metricsutil" diff --git a/pkg/kubectl/cmd/top_pod.go b/pkg/kubectl/cmd/top_pod.go index c4931de0ab2..74f7fbcf3fc 100644 --- a/pkg/kubectl/cmd/top_pod.go +++ b/pkg/kubectl/cmd/top_pod.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/metricsutil" diff --git a/pkg/kubectl/cmd/util/BUILD b/pkg/kubectl/cmd/util/BUILD index 8c9f649abaf..3a9b4d53344 100644 --- a/pkg/kubectl/cmd/util/BUILD +++ b/pkg/kubectl/cmd/util/BUILD @@ -36,7 +36,7 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", "//pkg/client/typed/dynamic:go_default_library", diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index 287a89e6c1d..f9049857e0f 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -51,7 +51,7 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/discovery" "k8s.io/kubernetes/pkg/client/typed/dynamic" diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index d96ba6466f1..f9685561cc0 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -43,8 +43,8 @@ import ( "k8s.io/kubernetes/pkg/apis/storage" storageutil "k8s.io/kubernetes/pkg/apis/storage/util" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" - extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/fieldpath" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/kubectl/metricsutil/BUILD b/pkg/kubectl/metricsutil/BUILD index 3be3250284f..a3e7f36a633 100644 --- a/pkg/kubectl/metricsutil/BUILD +++ b/pkg/kubectl/metricsutil/BUILD @@ -22,7 +22,7 @@ go_library( "//pkg/api/resource:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/kubectl:go_default_library", "//pkg/labels:go_default_library", "//vendor:k8s.io/heapster/metrics/apis/metrics/v1alpha1", diff --git a/pkg/kubectl/metricsutil/metrics_client.go b/pkg/kubectl/metricsutil/metrics_client.go index 6f2a59cb7ee..370b8ebf110 100644 --- a/pkg/kubectl/metricsutil/metrics_client.go +++ b/pkg/kubectl/metricsutil/metrics_client.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/validation" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/labels" ) diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index c779aa5fffd..76c14d976f2 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/unversioned" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/retry" client "k8s.io/kubernetes/pkg/client/unversioned" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" diff --git a/pkg/kubectl/rollout_status.go b/pkg/kubectl/rollout_status.go index b719cb3baf6..bb6c477fba0 100644 --- a/pkg/kubectl/rollout_status.go +++ b/pkg/kubectl/rollout_status.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" + extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" "k8s.io/kubernetes/pkg/controller/deployment/util" ) diff --git a/pkg/kubectl/scale.go b/pkg/kubectl/scale.go index f97a5d4af10..3abf2e7c907 100644 --- a/pkg/kubectl/scale.go +++ b/pkg/kubectl/scale.go @@ -28,10 +28,10 @@ import ( "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - appsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned" - batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" - extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" + appsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" + batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/util/wait" diff --git a/pkg/kubectl/scale_test.go b/pkg/kubectl/scale_test.go index e7295e294d1..1460de215cd 100644 --- a/pkg/kubectl/scale_test.go +++ b/pkg/kubectl/scale_test.go @@ -25,9 +25,9 @@ import ( "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" - extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" + batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" testcore "k8s.io/kubernetes/pkg/client/testing/core" ) diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go index 90eea0c9cbc..67feaafdee5 100644 --- a/pkg/kubectl/stop.go +++ b/pkg/kubectl/stop.go @@ -29,10 +29,10 @@ import ( "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - appsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned" - batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" - extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" + appsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" + batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/kubectl/stop_test.go b/pkg/kubectl/stop_test.go index 430158b8727..54c62a148b1 100644 --- a/pkg/kubectl/stop_test.go +++ b/pkg/kubectl/stop_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" testcore "k8s.io/kubernetes/pkg/client/testing/core" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/kubelet/client/BUILD b/pkg/kubelet/client/BUILD index 5dd2146430f..97c356d4468 100644 --- a/pkg/kubelet/client/BUILD +++ b/pkg/kubelet/client/BUILD @@ -33,7 +33,7 @@ go_test( "skip", ], deps = [ - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", ], ) diff --git a/pkg/kubelet/client/kubelet_client_test.go b/pkg/kubelet/client/kubelet_client_test.go index 6ef2ad3913c..c2be5581299 100644 --- a/pkg/kubelet/client/kubelet_client_test.go +++ b/pkg/kubelet/client/kubelet_client_test.go @@ -19,13 +19,13 @@ package client import ( "testing" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/restclient" ) // Ensure a node client can be used as a NodeGetter. // This allows anyone with a node client to easily construct a NewNodeConnectionInfoGetter. -var _ = NodeGetter(unversioned.NodeInterface(nil)) +var _ = NodeGetter(internalversion.NodeInterface(nil)) func TestMakeTransportInvalid(t *testing.T) { config := &KubeletClientConfig{ diff --git a/pkg/kubelet/util/csr/BUILD b/pkg/kubelet/util/csr/BUILD index de005395d50..a8ab9b15365 100644 --- a/pkg/kubelet/util/csr/BUILD +++ b/pkg/kubelet/util/csr/BUILD @@ -18,7 +18,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/apis/certificates:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion:go_default_library", "//pkg/fields:go_default_library", "//pkg/types:go_default_library", "//pkg/util/cert:go_default_library", diff --git a/pkg/kubelet/util/csr/csr.go b/pkg/kubelet/util/csr/csr.go index 6a2c519cfd0..e68576fe093 100644 --- a/pkg/kubelet/util/csr/csr.go +++ b/pkg/kubelet/util/csr/csr.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/certificates" - unversionedcertificates "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned" + unversionedcertificates "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/types" certutil "k8s.io/kubernetes/pkg/util/cert" diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 0d64305027d..ecacb9fb6b7 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -59,7 +59,7 @@ go_library( "//pkg/apis/storage/install:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", "//pkg/apiserver:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/genericapiserver:go_default_library", "//pkg/healthz:go_default_library", "//pkg/kubelet/client:go_default_library", diff --git a/pkg/master/controller.go b/pkg/master/controller.go index 578c87b2834..880d1fdfa6f 100644 --- a/pkg/master/controller.go +++ b/pkg/master/controller.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api/endpoints" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/registry/core/namespace" "k8s.io/kubernetes/pkg/registry/core/rangeallocation" diff --git a/pkg/master/master.go b/pkg/master/master.go index f3672c71e51..6c8913f81c5 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -48,7 +48,7 @@ import ( "k8s.io/kubernetes/pkg/apis/storage" storageapiv1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" "k8s.io/kubernetes/pkg/apiserver" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/healthz" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" diff --git a/pkg/registry/core/pod/etcd/BUILD b/pkg/registry/core/pod/etcd/BUILD index f4617d1d87b..243d432f15d 100644 --- a/pkg/registry/core/pod/etcd/BUILD +++ b/pkg/registry/core/pod/etcd/BUILD @@ -25,7 +25,7 @@ go_library( "//pkg/api/unversioned:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apis/policy:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/policy/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/cachesize:go_default_library", diff --git a/pkg/registry/core/pod/etcd/etcd.go b/pkg/registry/core/pod/etcd/etcd.go index 189457694ea..f71972821a9 100644 --- a/pkg/registry/core/pod/etcd/etcd.go +++ b/pkg/registry/core/pod/etcd/etcd.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/validation" - policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned" + policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/pod" diff --git a/pkg/registry/core/pod/etcd/eviction.go b/pkg/registry/core/pod/etcd/eviction.go index 96d6da890f6..4dc1c7a965f 100644 --- a/pkg/registry/core/pod/etcd/eviction.go +++ b/pkg/registry/core/pod/etcd/eviction.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/policy" - policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned" + policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/registry/core/rest/BUILD b/pkg/registry/core/rest/BUILD index bbb366e62ed..014de0ed469 100644 --- a/pkg/registry/core/rest/BUILD +++ b/pkg/registry/core/rest/BUILD @@ -20,7 +20,7 @@ go_library( "//pkg/api/unversioned:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apiserver:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/policy/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/genericapiserver:go_default_library", "//pkg/kubelet/client:go_default_library", diff --git a/pkg/registry/core/rest/storage_core.go b/pkg/registry/core/rest/storage_core.go index d67a1918cd6..18fb4610738 100644 --- a/pkg/registry/core/rest/storage_core.go +++ b/pkg/registry/core/rest/storage_core.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apiserver" - policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/unversioned" + policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/genericapiserver" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" diff --git a/pkg/registry/extensions/rest/BUILD b/pkg/registry/extensions/rest/BUILD index 4daa261ee89..9de90bf39c0 100644 --- a/pkg/registry/extensions/rest/BUILD +++ b/pkg/registry/extensions/rest/BUILD @@ -22,7 +22,7 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/genericapiserver:go_default_library", "//pkg/registry/autoscaling/horizontalpodautoscaler/etcd:go_default_library", "//pkg/registry/batch/job/etcd:go_default_library", diff --git a/pkg/registry/extensions/rest/storage_extensions.go b/pkg/registry/extensions/rest/storage_extensions.go index 7ed1eb7cc81..f7e4497b5ed 100644 --- a/pkg/registry/extensions/rest/storage_extensions.go +++ b/pkg/registry/extensions/rest/storage_extensions.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" + extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" "k8s.io/kubernetes/pkg/genericapiserver" horizontalpodautoscaleretcd "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/etcd" jobetcd "k8s.io/kubernetes/pkg/registry/batch/job/etcd" diff --git a/pkg/registry/extensions/rest/thirdparty_controller.go b/pkg/registry/extensions/rest/thirdparty_controller.go index 36eb0f04192..bc55adaa611 100644 --- a/pkg/registry/extensions/rest/thirdparty_controller.go +++ b/pkg/registry/extensions/rest/thirdparty_controller.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" + extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/sets" diff --git a/pkg/registry/rbac/rest/BUILD b/pkg/registry/rbac/rest/BUILD index 7459fe4b144..85ce58fad74 100644 --- a/pkg/registry/rbac/rest/BUILD +++ b/pkg/registry/rbac/rest/BUILD @@ -20,7 +20,7 @@ go_library( "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/v1alpha1:go_default_library", "//pkg/apis/rbac/validation:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion:go_default_library", "//pkg/genericapiserver:go_default_library", "//pkg/registry/rbac/clusterrole:go_default_library", "//pkg/registry/rbac/clusterrole/etcd:go_default_library", diff --git a/pkg/registry/rbac/rest/storage_rbac.go b/pkg/registry/rbac/rest/storage_rbac.go index 32427553a82..264744c4cbe 100644 --- a/pkg/registry/rbac/rest/storage_rbac.go +++ b/pkg/registry/rbac/rest/storage_rbac.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/apis/rbac" rbacapiv1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" rbacvalidation "k8s.io/kubernetes/pkg/apis/rbac/validation" - rbacclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned" + rbacclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion" "k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/registry/rbac/clusterrole" clusterroleetcd "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/etcd" diff --git a/pkg/util/pod/BUILD b/pkg/util/pod/BUILD index 1f2476e43fa..147e0ff47ed 100644 --- a/pkg/util/pod/BUILD +++ b/pkg/util/pod/BUILD @@ -20,7 +20,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/util/errors:go_default_library", "//pkg/util/hash:go_default_library", "//pkg/util/wait:go_default_library", diff --git a/pkg/util/pod/pod.go b/pkg/util/pod/pod.go index 06e48c51128..a6864e36021 100644 --- a/pkg/util/pod/pod.go +++ b/pkg/util/pod/pod.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" errorsutil "k8s.io/kubernetes/pkg/util/errors" hashutil "k8s.io/kubernetes/pkg/util/hash" "k8s.io/kubernetes/pkg/util/wait" diff --git a/pkg/util/replicaset/BUILD b/pkg/util/replicaset/BUILD index ca6efddb48c..9bf563be553 100644 --- a/pkg/util/replicaset/BUILD +++ b/pkg/util/replicaset/BUILD @@ -19,7 +19,7 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/labels:go_default_library", "//pkg/util/errors:go_default_library", "//pkg/util/labels:go_default_library", diff --git a/pkg/util/replicaset/replicaset.go b/pkg/util/replicaset/replicaset.go index 7570f2bfad6..c11693f5d99 100644 --- a/pkg/util/replicaset/replicaset.go +++ b/pkg/util/replicaset/replicaset.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" + unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" "k8s.io/kubernetes/pkg/labels" errorsutil "k8s.io/kubernetes/pkg/util/errors" labelsutil "k8s.io/kubernetes/pkg/util/labels" diff --git a/plugin/cmd/kube-scheduler/app/BUILD b/plugin/cmd/kube-scheduler/app/BUILD index e69fe5130f1..98fc091ab8f 100644 --- a/plugin/cmd/kube-scheduler/app/BUILD +++ b/plugin/cmd/kube-scheduler/app/BUILD @@ -17,7 +17,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/leaderelection:go_default_library", "//pkg/client/leaderelection/resourcelock:go_default_library", "//pkg/client/record:go_default_library", diff --git a/plugin/cmd/kube-scheduler/app/server.go b/plugin/cmd/kube-scheduler/app/server.go index 018025de3d3..766d0be2754 100644 --- a/plugin/cmd/kube-scheduler/app/server.go +++ b/plugin/cmd/kube-scheduler/app/server.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/leaderelection" "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" "k8s.io/kubernetes/pkg/client/record" diff --git a/plugin/pkg/auth/authenticator/token/webhook/BUILD b/plugin/pkg/auth/authenticator/token/webhook/BUILD index ca0c98fe2ad..f86acf2be11 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/BUILD +++ b/plugin/pkg/auth/authenticator/token/webhook/BUILD @@ -21,7 +21,7 @@ go_library( "//pkg/apis/authentication/v1beta1:go_default_library", "//pkg/auth/authenticator:go_default_library", "//pkg/auth/user:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion:go_default_library", "//pkg/util/cache:go_default_library", "//plugin/pkg/webhook:go_default_library", ], diff --git a/plugin/pkg/auth/authenticator/token/webhook/webhook.go b/plugin/pkg/auth/authenticator/token/webhook/webhook.go index def6c03ce06..86157f0459e 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/webhook.go +++ b/plugin/pkg/auth/authenticator/token/webhook/webhook.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/user" - authenticationclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned" + authenticationclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion" "k8s.io/kubernetes/pkg/util/cache" "k8s.io/kubernetes/plugin/pkg/webhook" ) diff --git a/plugin/pkg/auth/authorizer/webhook/BUILD b/plugin/pkg/auth/authorizer/webhook/BUILD index 7268326249c..19d6ca05938 100644 --- a/plugin/pkg/auth/authorizer/webhook/BUILD +++ b/plugin/pkg/auth/authorizer/webhook/BUILD @@ -20,7 +20,7 @@ go_library( "//pkg/apis/authorization/install:go_default_library", "//pkg/apis/authorization/v1beta1:go_default_library", "//pkg/auth/authorizer:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion:go_default_library", "//pkg/util/cache:go_default_library", "//plugin/pkg/webhook:go_default_library", "//vendor:github.com/golang/glog", diff --git a/plugin/pkg/auth/authorizer/webhook/webhook.go b/plugin/pkg/auth/authorizer/webhook/webhook.go index 8c4efce6420..96a53a34094 100644 --- a/plugin/pkg/auth/authorizer/webhook/webhook.go +++ b/plugin/pkg/auth/authorizer/webhook/webhook.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/apis/authorization" "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" "k8s.io/kubernetes/pkg/auth/authorizer" - authorizationclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned" + authorizationclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion" "k8s.io/kubernetes/pkg/util/cache" "k8s.io/kubernetes/plugin/pkg/webhook" diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 833447d61ee..aa464bf5dcd 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -118,13 +118,14 @@ go_library( "//pkg/apis/apps:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/apis/batch/v2alpha1:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/util:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/transport:go_default_library", diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index 4dc3e7e8653..0f2c791234f 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -40,7 +40,7 @@ go_library( "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/typed/discovery:go_default_library", diff --git a/test/e2e/framework/networking_utils.go b/test/e2e/framework/networking_utils.go index 91308483e78..f8248103aab 100644 --- a/test/e2e/framework/networking_utils.go +++ b/test/e2e/framework/networking_utils.go @@ -27,7 +27,7 @@ import ( api "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apimachinery/registered" - coreclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/rand" diff --git a/test/e2e/framework/pods.go b/test/e2e/framework/pods.go index ce390729a64..263900e690c 100644 --- a/test/e2e/framework/pods.go +++ b/test/e2e/framework/pods.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/wait" diff --git a/test/e2e/generated_clientset.go b/test/e2e/generated_clientset.go index 9ec05d6b174..b99a1fcf9b8 100644 --- a/test/e2e/generated_clientset.go +++ b/test/e2e/generated_clientset.go @@ -22,6 +22,7 @@ import ( clientv1 "k8s.io/client-go/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/intstr" @@ -85,14 +86,14 @@ func testingPod(name, value string) v1.Pod { } } -func observePodCreation(w watch.Interface) { +func observeCreation(w watch.Interface) { select { case event, _ := <-w.ResultChan(): if event.Type != watch.Added { - framework.Failf("Failed to observe pod creation: %v", event) + framework.Failf("Failed to observe the creation: %v", event) } - case <-time.After(framework.PodStartTimeout): - framework.Failf("Timeout while waiting for pod creation") + case <-time.After(30 * time.Second): + framework.Failf("Timeout while waiting for observing the creation") } } @@ -161,7 +162,7 @@ var _ = framework.KubeDescribe("Generated release_1_5 clientset", func() { Expect(len(pods.Items)).To(Equal(1)) By("verifying pod creation was observed") - observePodCreation(w) + observeCreation(w) // We need to wait for the pod to be scheduled, otherwise the deletion // will be carried out immediately rather than gracefully. @@ -187,6 +188,113 @@ var _ = framework.KubeDescribe("Generated release_1_5 clientset", func() { }) }) +func newTestingScheduledJob(name string, value string) *v2alpha1.ScheduledJob { + parallelism := int32(1) + completions := int32(1) + return &v2alpha1.ScheduledJob{ + ObjectMeta: v1.ObjectMeta{ + Name: name, + Labels: map[string]string{ + "time": value, + }, + }, + Spec: v2alpha1.ScheduledJobSpec{ + Schedule: "*/1 * * * ?", + ConcurrencyPolicy: v2alpha1.AllowConcurrent, + JobTemplate: v2alpha1.JobTemplateSpec{ + Spec: v2alpha1.JobSpec{ + Parallelism: ¶llelism, + Completions: &completions, + Template: v1.PodTemplateSpec{ + Spec: v1.PodSpec{ + RestartPolicy: v1.RestartPolicyOnFailure, + Volumes: []v1.Volume{ + { + Name: "data", + VolumeSource: v1.VolumeSource{ + EmptyDir: &v1.EmptyDirVolumeSource{}, + }, + }, + }, + Containers: []v1.Container{ + { + Name: "c", + Image: "gcr.io/google_containers/busybox:1.24", + VolumeMounts: []v1.VolumeMount{ + { + MountPath: "/data", + Name: "data", + }, + }, + }, + }, + }, + }, + }, + }, + }, + } +} + +var _ = framework.KubeDescribe("Generated release_1_5 clientset", func() { + f := framework.NewDefaultFramework("clientset") + It("should create v2alpha1 scheduleJobs, delete scheduleJobs, watch scheduleJobs", func() { + scheduleJobClient := f.ClientSet_1_5.BatchV2alpha1().ScheduledJobs(f.Namespace.Name) + By("constructing the scheduledJob") + name := "scheduledjob" + string(uuid.NewUUID()) + value := strconv.Itoa(time.Now().Nanosecond()) + scheduledJob := newTestingScheduledJob(name, value) + By("setting up watch") + selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value})).String() + options := v1.ListOptions{LabelSelector: selector} + scheduleJobs, err := scheduleJobClient.List(options) + if err != nil { + framework.Failf("Failed to query for scheduleJobs: %v", err) + } + Expect(len(scheduleJobs.Items)).To(Equal(0)) + options = v1.ListOptions{ + LabelSelector: selector, + ResourceVersion: scheduleJobs.ListMeta.ResourceVersion, + } + w, err := scheduleJobClient.Watch(options) + if err != nil { + framework.Failf("Failed to set up watch: %v", err) + } + + By("creating the scheduledJob") + scheduledJob, err = scheduleJobClient.Create(scheduledJob) + if err != nil { + framework.Failf("Failed to create scheduledJob: %v", err) + } + + By("verifying the scheduledJob is in kubernetes") + options = v1.ListOptions{ + LabelSelector: selector, + ResourceVersion: scheduledJob.ResourceVersion, + } + scheduleJobs, err = scheduleJobClient.List(options) + if err != nil { + framework.Failf("Failed to query for scheduleJobs: %v", err) + } + Expect(len(scheduleJobs.Items)).To(Equal(1)) + + By("verifying scheduledJob creation was observed") + observeCreation(w) + + By("deleting the scheduledJob") + if err := scheduleJobClient.Delete(scheduledJob.Name, nil); err != nil { + framework.Failf("Failed to delete scheduledJob: %v", err) + } + + options = v1.ListOptions{LabelSelector: selector} + scheduleJobs, err = scheduleJobClient.List(options) + if err != nil { + framework.Failf("Failed to list scheduleJobs to verify deletion: %v", err) + } + Expect(len(scheduleJobs.Items)).To(Equal(0)) + }) +}) + var _ = framework.KubeDescribe("Staging client repo client", func() { f := framework.NewDefaultFramework("clientset") It("should create pods, delete pods, watch pods", func() { diff --git a/test/e2e/node_problem_detector.go b/test/e2e/node_problem_detector.go index 7f303fa9c6e..ebd9b46a0c0 100644 --- a/test/e2e/node_problem_detector.go +++ b/test/e2e/node_problem_detector.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - coreclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + coreclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/system" diff --git a/test/e2e/pd.go b/test/e2e/pd.go index 4c55e5258f8..7f1a70c14d2 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apimachinery/registered" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" awscloud "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce" "k8s.io/kubernetes/pkg/types" diff --git a/test/integration/examples/apiserver_test.go b/test/integration/examples/apiserver_test.go index 0cf54a492a7..8bed495c60e 100644 --- a/test/integration/examples/apiserver_test.go +++ b/test/integration/examples/apiserver_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1" + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1" "github.com/golang/glog" "github.com/stretchr/testify/assert" diff --git a/test/integration/scheduler/extender_test.go b/test/integration/scheduler/extender_test.go index 6b289aaba73..bc2b81f0fba 100644 --- a/test/integration/scheduler/extender_test.go +++ b/test/integration/scheduler/extender_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apimachinery/registered" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/util/wait" diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/scheduler/scheduler_test.go index 58523bf27fc..6cb354c3e75 100644 --- a/test/integration/scheduler/scheduler_test.go +++ b/test/integration/scheduler/scheduler_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/util/wait" diff --git a/test/integration/scheduler_perf/BUILD b/test/integration/scheduler_perf/BUILD index 0a1f4b79f5c..7a18e2619c1 100644 --- a/test/integration/scheduler_perf/BUILD +++ b/test/integration/scheduler_perf/BUILD @@ -18,7 +18,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/core/unversioned:go_default_library", + "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/record:go_default_library", "//pkg/client/restclient:go_default_library", "//plugin/pkg/scheduler:go_default_library", diff --git a/test/integration/scheduler_perf/util.go b/test/integration/scheduler_perf/util.go index 66a941fe94a..2c212d99007 100644 --- a/test/integration/scheduler_perf/util.go +++ b/test/integration/scheduler_perf/util.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apimachinery/registered" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" + unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/plugin/pkg/scheduler" diff --git a/test/test_owners.csv b/test/test_owners.csv index da936f0d929..68bf8d455c7 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -149,7 +149,8 @@ Garbage collector should delete pods created by rc when not orphaning,justinsb,1 Garbage collector should orphan pods created by rc if delete options say so,fabioy,1 Garbage collector should orphan pods created by rc if deleteOptions.OrphanDependents is nil,zmerlynn,1 "Generated release_1_5 clientset should create pods, delete pods, watch pods",ghodss,1 -HA-master pods survive addition/removal,davidopp,1 +"Generated release_1_5 clientset should create v2alpha1 scheduleJobs, delete scheduleJobs, watch scheduleJobs",caesarxuchao,0 +HA-master pods survive addition/removal,roberthbailey,1 Hazelcast should create and scale hazelcast,mikedanese,1 Horizontal pod autoscaling (scale resource: CPU) Deployment Should scale from 1 pod to 3 pods and from 3 to 5,jszczepkowski,0 Horizontal pod autoscaling (scale resource: CPU) Deployment Should scale from 5 pods to 3 pods and from 3 to 1,jszczepkowski,0 @@ -456,7 +457,7 @@ k8s.io/kubernetes/cmd/kubeadm/app/cmd,davidopp,1 k8s.io/kubernetes/cmd/kubeadm/app/images,saad-ali,1 k8s.io/kubernetes/cmd/kubeadm/app/util,eparis,1 k8s.io/kubernetes/cmd/kubelet/app,hurf,1 -k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned,eparis,1 +k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types,caesarxuchao,0 k8s.io/kubernetes/cmd/libs/go2idl/go-to-protobuf/protobuf,smarterclayton,0 k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen/generators,davidopp,1 k8s.io/kubernetes/cmd/mungedocs,mwielgus,1