diff --git a/cmd/libs/go2idl/client-gen/generators/BUILD b/cmd/libs/go2idl/client-gen/generators/BUILD index ee6b53ebc366..d6af96b66e18 100644 --- a/cmd/libs/go2idl/client-gen/generators/BUILD +++ b/cmd/libs/go2idl/client-gen/generators/BUILD @@ -14,6 +14,7 @@ go_library( "generator_for_clientset.go", "generator_for_expansion.go", "generator_for_group.go", + "generator_for_scheme.go", "generator_for_type.go", "tags.go", ], diff --git a/cmd/libs/go2idl/client-gen/generators/client_generator.go b/cmd/libs/go2idl/client-gen/generators/client_generator.go index b0f56d247cf5..b8363c810706 100644 --- a/cmd/libs/go2idl/client-gen/generators/client_generator.go +++ b/cmd/libs/go2idl/client-gen/generators/client_generator.go @@ -61,11 +61,11 @@ 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 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())) +func packageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clientsetPackage string, apiPath string, srcTreePath string, inputPackage string, boilerplate []byte, generatedBy string) generator.Package { + groupVersionClientPackage := strings.ToLower(filepath.Join(clientsetPackage, "typed", gv.Group.NonEmpty(), gv.Version.NonEmpty())) return &generator.DefaultPackage{ PackageName: strings.ToLower(gv.Version.NonEmpty()), - PackagePath: outputPackagePath, + PackagePath: groupVersionClientPackage, HeaderText: boilerplate, PackageDocumentation: []byte( generatedBy + @@ -85,11 +85,12 @@ func packageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, pac DefaultGen: generator.DefaultGen{ OptionalName: strings.ToLower(c.Namers["private"].Name(t)), }, - outputPackage: outputPackagePath, - group: gv.Group.NonEmpty(), - version: gv.Version.String(), - typeToMatch: t, - imports: generator.NewImportTracker(), + outputPackage: groupVersionClientPackage, + clientsetPackage: clientsetPackage, + group: gv.Group.NonEmpty(), + version: gv.Version.String(), + typeToMatch: t, + imports: generator.NewImportTracker(), }) } @@ -97,18 +98,19 @@ func packageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, pac DefaultGen: generator.DefaultGen{ OptionalName: gv.Group.NonEmpty() + "_client", }, - outputPackage: outputPackagePath, - inputPacakge: inputPath, - group: gv.Group.NonEmpty(), - version: gv.Version.String(), - apiPath: apiPath, - types: typeList, - imports: generator.NewImportTracker(), + outputPackage: groupVersionClientPackage, + inputPackage: inputPackage, + clientsetPackage: clientsetPackage, + group: gv.Group.NonEmpty(), + version: gv.Version.String(), + apiPath: apiPath, + types: typeList, + imports: generator.NewImportTracker(), }) expansionFileName := "generated_expansion" generators = append(generators, &genExpansion{ - groupPath: filepath.Join(srcTreePath, outputPackagePath), + groupPackagePath: filepath.Join(srcTreePath, groupVersionClientPackage), DefaultGen: generator.DefaultGen{ OptionalName: expansionFileName, }, @@ -123,10 +125,10 @@ func packageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, pac } } -func packageForClientset(customArgs clientgenargs.Args, typedClientBasePath string, boilerplate []byte, generatedBy string) generator.Package { +func packageForClientset(customArgs clientgenargs.Args, clientsetPackage string, boilerplate []byte, generatedBy string) generator.Package { return &generator.DefaultPackage{ PackageName: customArgs.ClientsetName, - PackagePath: filepath.Join(customArgs.ClientsetOutputPath, customArgs.ClientsetName), + PackagePath: clientsetPackage, HeaderText: boilerplate, PackageDocumentation: []byte( generatedBy + @@ -143,10 +145,43 @@ func packageForClientset(customArgs clientgenargs.Args, typedClientBasePath stri DefaultGen: generator.DefaultGen{ OptionalName: "clientset", }, - groups: customArgs.Groups, - typedClientPath: typedClientBasePath, - outputPackage: customArgs.ClientsetName, - imports: generator.NewImportTracker(), + groups: customArgs.Groups, + clientsetPackage: clientsetPackage, + outputPackage: customArgs.ClientsetName, + imports: generator.NewImportTracker(), + }, + } + return generators + }, + } +} + +func packageForScheme(customArgs clientgenargs.Args, clientsetPackage string, srcTreePath string, boilerplate []byte, generatedBy string) generator.Package { + schemePackage := filepath.Join(clientsetPackage, "scheme") + return &generator.DefaultPackage{ + PackageName: "scheme", + PackagePath: schemePackage, + HeaderText: boilerplate, + PackageDocumentation: []byte( + generatedBy + + `// This package contains the scheme of the automatically generated clientset. +`), + // GeneratorFunc returns a list of generators. Each generator generates a + // single file. + GeneratorFunc: func(c *generator.Context) (generators []generator.Generator) { + generators = []generator.Generator{ + // Always generate a "doc.go" file. + generator.DefaultGen{OptionalName: "doc"}, + + &genScheme{ + DefaultGen: generator.DefaultGen{ + OptionalName: "register", + }, + inputPackages: customArgs.GroupVersionToInputPath, + outputPackage: schemePackage, + outputPath: filepath.Join(srcTreePath, schemePackage), + groups: customArgs.Groups, + imports: generator.NewImportTracker(), }, } return generators @@ -201,11 +236,12 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat } var packageList []generator.Package - typedClientBasePath := filepath.Join(customArgs.ClientsetOutputPath, customArgs.ClientsetName, "typed") + clientsetPackage := filepath.Join(customArgs.ClientsetOutputPath, customArgs.ClientsetName) - packageList = append(packageList, packageForClientset(customArgs, typedClientBasePath, boilerplate, generatedBy)) + packageList = append(packageList, packageForClientset(customArgs, clientsetPackage, boilerplate, generatedBy)) + packageList = append(packageList, packageForScheme(customArgs, clientsetPackage, arguments.OutputBase, boilerplate, generatedBy)) if customArgs.FakeClient { - packageList = append(packageList, fake.PackageForClientset(customArgs, typedClientBasePath, boilerplate, generatedBy)) + packageList = append(packageList, fake.PackageForClientset(customArgs, clientsetPackage, boilerplate, generatedBy)) } // If --clientset-only=true, we don't regenerate the individual typed clients. @@ -219,9 +255,9 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat 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)) + packageList = append(packageList, packageForGroup(gv, orderer.OrderTypes(types), clientsetPackage, 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)) + packageList = append(packageList, fake.PackageForGroup(gv, orderer.OrderTypes(types), clientsetPackage, inputPath, boilerplate, generatedBy)) } } } 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 8decba1e4341..7fe315796e5c 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 @@ -28,13 +28,13 @@ import ( clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types" ) -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")) +func PackageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, clientsetPackage string, inputPackage string, boilerplate []byte, generatedBy string) generator.Package { + outputPackage := strings.ToLower(filepath.Join(clientsetPackage, "typed", 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.NonEmpty(), gv.Version.NonEmpty()) + realClientPackage := filepath.Join(clientsetPackage, "typed", gv.Group.NonEmpty(), gv.Version.NonEmpty()) return &generator.DefaultPackage{ PackageName: "fake", - PackagePath: outputPackagePath, + PackagePath: outputPackage, HeaderText: boilerplate, PackageDocumentation: []byte( generatedBy + @@ -54,10 +54,10 @@ func PackageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, pac DefaultGen: generator.DefaultGen{ OptionalName: "fake_" + strings.ToLower(c.Namers["private"].Name(t)), }, - outputPackage: outputPackagePath, + outputPackage: outputPackage, + inputPackage: inputPackage, group: gv.Group.NonEmpty(), version: gv.Version.String(), - inputPackage: inputPath, typeToMatch: t, imports: generator.NewImportTracker(), }) @@ -67,12 +67,12 @@ func PackageForGroup(gv clientgentypes.GroupVersion, typeList []*types.Type, pac DefaultGen: generator.DefaultGen{ OptionalName: "fake_" + gv.Group.NonEmpty() + "_client", }, - outputPackage: outputPackagePath, - realClientPath: realClientPath, - group: gv.Group.NonEmpty(), - version: gv.Version.String(), - types: typeList, - imports: generator.NewImportTracker(), + outputPackage: outputPackage, + realClientPackage: realClientPackage, + group: gv.Group.NonEmpty(), + version: gv.Version.String(), + types: typeList, + imports: generator.NewImportTracker(), }) return generators }, @@ -90,12 +90,12 @@ func extractBoolTagOrDie(key string, lines []string) bool { return val } -func PackageForClientset(customArgs clientgenargs.Args, typedClientBasePath string, boilerplate []byte, generatedBy string) generator.Package { +func PackageForClientset(customArgs clientgenargs.Args, fakeClientsetPackage string, boilerplate []byte, generatedBy string) generator.Package { return &generator.DefaultPackage{ // TODO: we'll generate fake clientset for different release in the future. // Package name and path are hard coded for now. PackageName: "fake", - PackagePath: filepath.Join(customArgs.ClientsetOutputPath, customArgs.ClientsetName, "fake"), + PackagePath: filepath.Join(fakeClientsetPackage, "fake"), HeaderText: boilerplate, PackageDocumentation: []byte( generatedBy + @@ -112,11 +112,11 @@ func PackageForClientset(customArgs clientgenargs.Args, typedClientBasePath stri DefaultGen: generator.DefaultGen{ OptionalName: "clientset_generated", }, - groups: customArgs.Groups, - typedClientPath: typedClientBasePath, - outputPackage: "fake", - imports: generator.NewImportTracker(), - clientsetPath: filepath.Join(customArgs.ClientsetOutputPath, customArgs.ClientsetName), + groups: customArgs.Groups, + fakeClientsetPackage: fakeClientsetPackage, + outputPackage: "fake", + imports: generator.NewImportTracker(), + realClientsetPackage: filepath.Join(customArgs.ClientsetOutputPath, customArgs.ClientsetName), }, } return generators 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 a9420b712d64..e3c4205f39c3 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 @@ -31,13 +31,13 @@ import ( // genClientset generates a package for a clientset. type genClientset struct { generator.DefaultGen - groups []clientgentypes.GroupVersions - typedClientPath string - outputPackage string - imports namer.ImportTracker - clientsetGenerated bool + groups []clientgentypes.GroupVersions + fakeClientsetPackage string + outputPackage string + imports namer.ImportTracker + clientsetGenerated bool // the import path of the generated real clientset. - clientsetPath string + realClientsetPackage string } var _ generator.Generator = &genClientset{} @@ -59,14 +59,15 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) { imports = append(imports, g.imports.ImportLines()...) 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))) + groupClientPackage := filepath.Join(g.fakeClientsetPackage, "typed", group.Group.NonEmpty(), version.NonEmpty()) + fakeGroupClientPackage := filepath.Join(groupClientPackage, "fake") + + imports = append(imports, strings.ToLower(fmt.Sprintf("%s%s \"%s\"", group.Group.NonEmpty(), version.NonEmpty(), groupClientPackage))) + imports = append(imports, strings.ToLower(fmt.Sprintf("fake%s%s \"%s\"", group.Group.NonEmpty(), version.NonEmpty(), fakeGroupClientPackage))) } } // the package that has the clientset Interface - imports = append(imports, fmt.Sprintf("clientset \"%s\"", g.clientsetPath)) + imports = append(imports, fmt.Sprintf("clientset \"%s\"", g.realClientsetPackage)) // imports for the code in commonTemplate imports = append(imports, "k8s.io/kubernetes/pkg/api", @@ -85,12 +86,11 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr // perhaps we can adapt the go2ild framework to this kind of usage. sw := generator.NewSnippetWriter(w, c, "$", "$") - sw.Do(common, nil) + allGroups := clientgentypes.ToGroupVersionPackages(g.groups) + sw.Do(common, nil) sw.Do(checkImpl, nil) - allGroups := clientgentypes.ToGroupVersionPackages(g.groups) - for _, g := range allGroups { sw.Do(clientsetInterfaceImplTemplate, g) // don't generated the default method if generating internalversion clientset 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 42d1f4ee2eec..0b1409dd750e 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 @@ -30,10 +30,10 @@ import ( // genFakeForGroup produces a file for a group client, e.g. ExtensionsClient for the extension group. type genFakeForGroup struct { generator.DefaultGen - outputPackage string - realClientPath string - group string - version string + outputPackage string + realClientPackage string + group string + version string // types in this group types []*types.Type imports namer.ImportTracker @@ -53,27 +53,27 @@ func (g *genFakeForGroup) Namers(c *generator.Context) namer.NameSystems { } func (g *genFakeForGroup) Imports(c *generator.Context) (imports []string) { - imports = append(g.imports.ImportLines(), strings.ToLower(fmt.Sprintf("%s \"%s\"", filepath.Base(g.realClientPath), g.realClientPath))) + imports = append(g.imports.ImportLines(), strings.ToLower(fmt.Sprintf("%s \"%s\"", filepath.Base(g.realClientPackage), g.realClientPackage))) return imports } func (g *genFakeForGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error { sw := generator.NewSnippetWriter(w, c, "$", "$") - const pkgTestingCore = "k8s.io/client-go/testing" - const pkgRESTClient = "k8s.io/client-go/rest" + m := map[string]interface{}{ "group": 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"}), + "Fake": c.Universe.Type(types.Name{Package: "k8s.io/client-go/testing", Name: "Fake"}), + "RESTClientInterface": c.Universe.Type(types.Name{Package: "k8s.io/client-go/rest", Name: "Interface"}), + "RESTClient": c.Universe.Type(types.Name{Package: "k8s.io/client-go/rest", Name: "RESTClient"}), } + sw.Do(groupClientTemplate, m) for _, t := range g.types { wrapper := map[string]interface{}{ "type": t, "GroupVersion": namer.IC(g.group) + namer.IC(g.version), - "realClientPackage": strings.ToLower(filepath.Base(g.realClientPath)), + "realClientPackage": strings.ToLower(filepath.Base(g.realClientPackage)), } namespaced := !extractBoolTagOrDie("nonNamespaced", t.SecondClosestCommentLines) if namespaced { 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 cdb50a0f4bc0..d8b4a344e8ba 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 @@ -87,7 +87,6 @@ func hasObjectMeta(t *types.Type) bool { func (g *genFakeForType) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error { sw := generator.NewSnippetWriter(w, c, "$", "$") pkg := filepath.Base(t.Name.Package) - const pkgTestingCore = "k8s.io/client-go/testing" namespaced := !extractBoolTagOrDie("nonNamespaced", t.SecondClosestCommentLines) canonicalGroup := g.group if canonicalGroup == "core" { @@ -105,6 +104,7 @@ func (g *genFakeForType) GenerateType(c *generator.Context, t *types.Type, w io. groupName = override[0] } + const pkgClientGoTesting = "k8s.io/client-go/testing" m := map[string]interface{}{ "type": t, "package": pkg, @@ -123,27 +123,27 @@ func (g *genFakeForType) GenerateType(c *generator.Context, t *types.Type, w io. "PatchType": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/types", Name: "PatchType"}), "watchInterface": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/watch", Name: "Interface"}), - "NewRootListAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewRootListAction"}), - "NewListAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewListAction"}), - "NewRootGetAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewRootGetAction"}), - "NewGetAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewGetAction"}), - "NewRootDeleteAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewRootDeleteAction"}), - "NewDeleteAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewDeleteAction"}), - "NewRootDeleteCollectionAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewRootDeleteCollectionAction"}), - "NewDeleteCollectionAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewDeleteCollectionAction"}), - "NewRootUpdateAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewRootUpdateAction"}), - "NewUpdateAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewUpdateAction"}), - "NewRootCreateAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewRootCreateAction"}), - "NewCreateAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewCreateAction"}), - "NewRootWatchAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewRootWatchAction"}), - "NewWatchAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewWatchAction"}), - "NewUpdateSubresourceAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewUpdateSubresourceAction"}), - "NewRootUpdateSubresourceAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewRootUpdateSubresourceAction"}), - "NewRootPatchAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewRootPatchAction"}), - "NewPatchAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewPatchAction"}), - "NewRootPatchSubresourceAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewRootPatchSubresourceAction"}), - "NewPatchSubresourceAction": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "NewPatchSubresourceAction"}), - "ExtractFromListOptions": c.Universe.Function(types.Name{Package: pkgTestingCore, Name: "ExtractFromListOptions"}), + "NewRootListAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewRootListAction"}), + "NewListAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewListAction"}), + "NewRootGetAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewRootGetAction"}), + "NewGetAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewGetAction"}), + "NewRootDeleteAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewRootDeleteAction"}), + "NewDeleteAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewDeleteAction"}), + "NewRootDeleteCollectionAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewRootDeleteCollectionAction"}), + "NewDeleteCollectionAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewDeleteCollectionAction"}), + "NewRootUpdateAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewRootUpdateAction"}), + "NewUpdateAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewUpdateAction"}), + "NewRootCreateAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewRootCreateAction"}), + "NewCreateAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewCreateAction"}), + "NewRootWatchAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewRootWatchAction"}), + "NewWatchAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewWatchAction"}), + "NewUpdateSubresourceAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewUpdateSubresourceAction"}), + "NewRootUpdateSubresourceAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewRootUpdateSubresourceAction"}), + "NewRootPatchAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewRootPatchAction"}), + "NewPatchAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewPatchAction"}), + "NewRootPatchSubresourceAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewRootPatchSubresourceAction"}), + "NewPatchSubresourceAction": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "NewPatchSubresourceAction"}), + "ExtractFromListOptions": c.Universe.Function(types.Name{Package: pkgClientGoTesting, Name: "ExtractFromListOptions"}), } noMethods := extractBoolTagOrDie("noMethods", t.SecondClosestCommentLines) == true 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 f92d9bc4b495..4a22ac79c91e 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go @@ -32,7 +32,7 @@ import ( type genClientset struct { generator.DefaultGen groups []clientgentypes.GroupVersions - typedClientPath string + clientsetPackage string outputPackage string imports namer.ImportTracker clientsetGenerated bool @@ -57,12 +57,10 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) { imports = append(imports, g.imports.ImportLines()...) 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))) + typedClientPath := filepath.Join(g.clientsetPackage, "typed", group.Group.NonEmpty(), version.NonEmpty()) + imports = append(imports, strings.ToLower(fmt.Sprintf("%s%s \"%s\"", group.Group.NonEmpty(), version.NonEmpty(), typedClientPath))) } } - imports = append(imports, "github.com/golang/glog") - imports = append(imports, "k8s.io/client-go/util/flowcontrol") return } @@ -70,21 +68,21 @@ func (g *genClientset) GenerateType(c *generator.Context, t *types.Type, w io.Wr // TODO: We actually don't need any type information to generate the clientset, // perhaps we can adapt the go2ild framework to this kind of usage. sw := generator.NewSnippetWriter(w, c, "$", "$") - const pkgDiscovery = "k8s.io/client-go/discovery" - const pkgRESTClient = "k8s.io/client-go/rest" allGroups := clientgentypes.ToGroupVersionPackages(g.groups) m := map[string]interface{}{ - "allGroups": allGroups, - "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"}), - "DiscoveryInterface": c.Universe.Type(types.Name{Package: pkgDiscovery, Name: "DiscoveryInterface"}), - "DiscoveryClient": c.Universe.Type(types.Name{Package: pkgDiscovery, Name: "DiscoveryClient"}), - "NewDiscoveryClientForConfig": c.Universe.Function(types.Name{Package: pkgDiscovery, Name: "NewDiscoveryClientForConfig"}), - "NewDiscoveryClientForConfigOrDie": c.Universe.Function(types.Name{Package: pkgDiscovery, Name: "NewDiscoveryClientForConfigOrDie"}), - "NewDiscoveryClient": c.Universe.Function(types.Name{Package: pkgDiscovery, Name: "NewDiscoveryClient"}), + "allGroups": allGroups, + "Config": c.Universe.Type(types.Name{Package: "k8s.io/client-go/rest", Name: "Config"}), + "DefaultKubernetesUserAgent": c.Universe.Function(types.Name{Package: "k8s.io/client-go/rest", Name: "DefaultKubernetesUserAgent"}), + "RESTClientInterface": c.Universe.Type(types.Name{Package: "k8s.io/client-go/rest", Name: "Interface"}), + "DiscoveryInterface": c.Universe.Type(types.Name{Package: "k8s.io/client-go/discovery", Name: "DiscoveryInterface"}), + "DiscoveryClient": c.Universe.Type(types.Name{Package: "k8s.io/client-go/discovery", Name: "DiscoveryClient"}), + "NewDiscoveryClientForConfig": c.Universe.Function(types.Name{Package: "k8s.io/client-go/discovery", Name: "NewDiscoveryClientForConfig"}), + "NewDiscoveryClientForConfigOrDie": c.Universe.Function(types.Name{Package: "k8s.io/client-go/discovery", Name: "NewDiscoveryClientForConfigOrDie"}), + "NewDiscoveryClient": c.Universe.Function(types.Name{Package: "k8s.io/client-go/discovery", Name: "NewDiscoveryClient"}), + "flowcontrolNewTokenBucketRateLimiter": c.Universe.Function(types.Name{Package: "k8s.io/client-go/util/flowcontrol", Name: "NewTokenBucketRateLimiter"}), + "glogErrorf": c.Universe.Function(types.Name{Package: "github.com/golang/glog", Name: "Errorf"}), } sw.Do(clientsetInterface, m) sw.Do(clientsetTemplate, m) @@ -108,8 +106,8 @@ type Interface interface { Discovery() $.DiscoveryInterface|raw$ $range .allGroups$$.GroupVersion$() $.PackageName$.$.GroupVersion$Interface $if .IsDefaultVersion$// Deprecated: please explicitly pick a version if possible. - $.Group$() $.PackageName$.$.GroupVersion$Interface$end$ - $end$ + $.Group$() $.PackageName$.$.GroupVersion$Interface + $end$$end$ } ` @@ -159,7 +157,7 @@ var newClientsetForConfigTemplate = ` func NewForConfig(c *$.Config|raw$) (*Clientset, error) { configShallowCopy := *c if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 { - configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst) + configShallowCopy.RateLimiter = $.flowcontrolNewTokenBucketRateLimiter|raw$(configShallowCopy.QPS, configShallowCopy.Burst) } var cs Clientset var err error @@ -170,7 +168,7 @@ $range .allGroups$ cs.$.GroupVersion$Client, err =$.PackageName$.NewForConfig $end$ cs.DiscoveryClient, err = $.NewDiscoveryClientForConfig|raw$(&configShallowCopy) if err!=nil { - glog.Errorf("failed to create the DiscoveryClient: %v", err) + $.glogErrorf|raw$("failed to create the DiscoveryClient: %v", err) return nil, err } return &cs, nil diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_expansion.go b/cmd/libs/go2idl/client-gen/generators/generator_for_expansion.go index 4125aaddf35e..67bac65735a8 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_expansion.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_expansion.go @@ -29,7 +29,7 @@ import ( // genExpansion produces a file for a group client, e.g. ExtensionsClient for the extension group. type genExpansion struct { generator.DefaultGen - groupPath string + groupPackagePath string // types in a group types []*types.Type } @@ -42,7 +42,7 @@ func (g *genExpansion) Filter(c *generator.Context, t *types.Type) bool { func (g *genExpansion) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error { sw := generator.NewSnippetWriter(w, c, "$", "$") for _, t := range g.types { - if _, err := os.Stat(filepath.Join(g.groupPath, strings.ToLower(t.Name.Name+"_expansion.go"))); os.IsNotExist(err) { + if _, err := os.Stat(filepath.Join(g.groupPackagePath, strings.ToLower(t.Name.Name+"_expansion.go"))); os.IsNotExist(err) { sw.Do(expansionInterfaceTemplate, t) } } 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 158ab9dbbc95..39de23e52f6e 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_group.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_group.go @@ -18,6 +18,7 @@ package generators import ( "io" + "path/filepath" "k8s.io/gengo/generator" "k8s.io/gengo/namer" @@ -32,9 +33,10 @@ type genGroup struct { version string apiPath string // types in this group - types []*types.Type - imports namer.ImportTracker - inputPacakge string + types []*types.Type + imports namer.ImportTracker + inputPackage string + clientsetPackage string } var _ generator.Generator = &genGroup{} @@ -52,16 +54,12 @@ func (g *genGroup) Namers(c *generator.Context) namer.NameSystems { func (g *genGroup) Imports(c *generator.Context) (imports []string) { imports = append(imports, g.imports.ImportLines()...) + imports = append(imports, filepath.Join(g.clientsetPackage, "scheme")) return } func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error { sw := generator.NewSnippetWriter(w, c, "$", "$") - const pkgRESTClient = "k8s.io/client-go/rest" - const pkgAPI = "k8s.io/kubernetes/pkg/api" - const pkgSerializer = "k8s.io/apimachinery/pkg/runtime/serializer" - const pkgUnversioned = "k8s.io/kubernetes/pkg/api/unversioned" - const pkgSchema = "k8s.io/apimachinery/pkg/runtime/schema" apiPath := func(group string) string { if len(g.apiPath) > 0 { @@ -78,27 +76,26 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer groupName = "" } // allow user to define a group name that's different from the one parsed from the directory. - p := c.Universe.Package(g.inputPacakge) + p := c.Universe.Package(g.inputPackage) if override := types.ExtractCommentTags("+", p.DocComments)["groupName"]; override != nil { groupName = override[0] } m := map[string]interface{}{ - "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"}), - "ParseGroupVersion": c.Universe.Function(types.Name{Package: pkgSchema, Name: "ParseGroupVersion"}), - "apiPath": apiPath(g.group), - "apiRegistry": c.Universe.Variable(types.Name{Package: pkgAPI, Name: "Registry"}), - "codecs": c.Universe.Variable(types.Name{Package: pkgAPI, Name: "Codecs"}), - "directCodecFactory": c.Universe.Variable(types.Name{Package: pkgSerializer, Name: "DirectCodecFactory"}), - "Errorf": c.Universe.Variable(types.Name{Package: "fmt", Name: "Errorf"}), + "group": g.group, + "version": g.version, + "GroupVersion": namer.IC(g.group) + namer.IC(g.version), + "groupName": groupName, + "types": g.types, + "apiPath": apiPath(g.group), + "schemaGroupVersion": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/runtime/schema", Name: "GroupVersion"}), + "runtimeAPIVersionInternal": c.Universe.Variable(types.Name{Package: "k8s.io/apimachinery/pkg/runtime", Name: "APIVersionInternal"}), + "serializerDirectCodecFactory": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/runtime/serializer", Name: "DirectCodecFactory"}), + "restConfig": c.Universe.Type(types.Name{Package: "k8s.io/client-go/rest", Name: "Config"}), + "restDefaultKubernetesUserAgent": c.Universe.Function(types.Name{Package: "k8s.io/client-go/rest", Name: "DefaultKubernetesUserAgent"}), + "restRESTClientInterface": c.Universe.Type(types.Name{Package: "k8s.io/client-go/rest", Name: "Interface"}), + "restRESTClientFor": c.Universe.Function(types.Name{Package: "k8s.io/client-go/rest", Name: "RESTClientFor"}), + "SchemeGroupVersion": c.Universe.Variable(types.Name{Package: g.inputPackage, Name: "SchemeGroupVersion"}), } sw.Do(groupInterfaceTemplate, m) sw.Do(groupClientTemplate, m) @@ -112,7 +109,6 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer sw.Do(getterImplNamespaced, wrapper) } else { sw.Do(getterImplNonNamespaced, wrapper) - } } sw.Do(newClientForConfigTemplate, m) @@ -130,7 +126,7 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer var groupInterfaceTemplate = ` type $.GroupVersion$Interface interface { - RESTClient() $.RESTClientInterface|raw$ + RESTClient() $.restRESTClientInterface|raw$ $range .types$ $.|publicPlural$Getter $end$ } @@ -139,7 +135,7 @@ type $.GroupVersion$Interface interface { var groupClientTemplate = ` // $.GroupVersion$Client is used to interact with features provided by the $.groupName$ group. type $.GroupVersion$Client struct { - restClient $.RESTClientInterface|raw$ + restClient $.restRESTClientInterface|raw$ } ` @@ -157,12 +153,12 @@ func (c *$.GroupVersion$Client) $.type|publicPlural$() $.type|public$Interface { var newClientForConfigTemplate = ` // NewForConfig creates a new $.GroupVersion$Client for the given config. -func NewForConfig(c *$.Config|raw$) (*$.GroupVersion$Client, error) { +func NewForConfig(c *$.restConfig|raw$) (*$.GroupVersion$Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err } - client, err := $.RESTClientFor|raw$(&config) + client, err := $.restRESTClientFor|raw$(&config) if err != nil { return nil, err } @@ -173,7 +169,7 @@ func NewForConfig(c *$.Config|raw$) (*$.GroupVersion$Client, error) { var newClientForConfigOrDieTemplate = ` // 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$) *$.GroupVersion$Client { +func NewForConfigOrDie(c *$.restConfig|raw$) *$.GroupVersion$Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -185,7 +181,7 @@ func NewForConfigOrDie(c *$.Config|raw$) *$.GroupVersion$Client { var getRESTClient = ` // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *$.GroupVersion$Client) RESTClient() $.RESTClientInterface|raw$ { +func (c *$.GroupVersion$Client) RESTClient() $.restRESTClientInterface|raw$ { if c == nil { return nil } @@ -195,26 +191,27 @@ func (c *$.GroupVersion$Client) RESTClient() $.RESTClientInterface|raw$ { var newClientForRESTClientTemplate = ` // New creates a new $.GroupVersion$Client for the given RESTClient. -func New(c $.RESTClientInterface|raw$) *$.GroupVersion$Client { +func New(c $.restRESTClientInterface|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 := $.apiRegistry|raw$.Group("$.groupName$") +func setConfigDefaults(config *$.restConfig|raw$) error { + g, err := scheme.Registry.Group("$.groupName$") if err != nil { return err } + config.APIPath = $.apiPath$ if config.UserAgent == "" { - config.UserAgent = $.DefaultKubernetesUserAgent|raw$() + config.UserAgent = $.restDefaultKubernetesUserAgent|raw$() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = $.codecs|raw$ + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -222,28 +219,21 @@ func setConfigDefaults(config *$.Config|raw$) error { if config.Burst == 0 { config.Burst = 10 } + return nil } ` var setClientDefaultsTemplate = ` -func setConfigDefaults(config *$.Config|raw$) error { - gv, err := $.ParseGroupVersion|raw$("$.groupName$/$.version$") - if err != nil { - return err - } - // if $.groupName$/$.version$ is not enabled, return an error - if ! $.apiRegistry|raw$.IsEnabledVersion(gv) { - return $.Errorf|raw$("$.groupName$/$.version$ is not enabled") - } +func setConfigDefaults(config *$.restConfig|raw$) error { + gv := $.SchemeGroupVersion|raw$ + config.GroupVersion = &gv config.APIPath = $.apiPath$ + config.NegotiatedSerializer = $.serializerDirectCodecFactory|raw${CodecFactory: scheme.Codecs} + if config.UserAgent == "" { - config.UserAgent = $.DefaultKubernetesUserAgent|raw$() + config.UserAgent = $.restDefaultKubernetesUserAgent|raw$() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = $.directCodecFactory|raw${CodecFactory: $.codecs|raw$} return nil } diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_scheme.go b/cmd/libs/go2idl/client-gen/generators/generator_for_scheme.go new file mode 100644 index 000000000000..562381f769df --- /dev/null +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_scheme.go @@ -0,0 +1,175 @@ +/* +Copyright 2017 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 generators + +import ( + "fmt" + "io" + "os" + "path/filepath" + "strings" + + "k8s.io/gengo/generator" + "k8s.io/gengo/namer" + "k8s.io/gengo/types" + clientgentypes "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/types" +) + +// genScheme produces a package for a clientset with the scheme, codecs and parameter codecs. +type genScheme struct { + generator.DefaultGen + outputPackage string + groups []clientgentypes.GroupVersions + inputPackages map[clientgentypes.GroupVersion]string + outputPath string + imports namer.ImportTracker + schemeGenerated bool +} + +func (g *genScheme) Namers(c *generator.Context) namer.NameSystems { + return namer.NameSystems{ + "raw": namer.NewRawNamer(g.outputPackage, g.imports), + } +} + +// We only want to call GenerateType() once. +func (g *genScheme) Filter(c *generator.Context, t *types.Type) bool { + ret := !g.schemeGenerated + g.schemeGenerated = true + return ret +} + +func (g *genScheme) Imports(c *generator.Context) (imports []string) { + imports = append(imports, g.imports.ImportLines()...) + internal := g.internalClientset() + for _, group := range g.groups { + for _, version := range group.Versions { + packagePath := g.inputPackages[clientgentypes.GroupVersion{Group: group.Group, Version: version}] + if internal { + // import the install package for internal clientsets instead of the type package with register.go + if version != "" { + packagePath = filepath.Dir(packagePath) + } + packagePath = filepath.Join(packagePath, "install") + imports = append(imports, strings.ToLower(fmt.Sprintf("%s \"%s\"", group.Group.NonEmpty(), packagePath))) + break + } else { + imports = append(imports, strings.ToLower(fmt.Sprintf("%s%s \"%s\"", group.Group.NonEmpty(), version.NonEmpty(), packagePath))) + } + } + } + return +} + +func (g *genScheme) GenerateType(c *generator.Context, t *types.Type, w io.Writer) error { + sw := generator.NewSnippetWriter(w, c, "$", "$") + + allGroupVersions := clientgentypes.ToGroupVersionPackages(g.groups) + allInstallGroups := clientgentypes.ToGroupInstallPackages(g.groups) + + m := map[string]interface{}{ + "allGroupVersions": allGroupVersions, + "allInstallGroups": allInstallGroups, + "customRegister": false, + "osGetenv": c.Universe.Function(types.Name{Package: "os", Name: "Getenv"}), + "runtimeNewParameterCodec": c.Universe.Function(types.Name{Package: "k8s.io/apimachinery/pkg/runtime", Name: "NewParameterCodec"}), + "runtimeNewScheme": c.Universe.Function(types.Name{Package: "k8s.io/apimachinery/pkg/runtime", Name: "NewScheme"}), + "serializerNewCodecFactory": c.Universe.Function(types.Name{Package: "k8s.io/apimachinery/pkg/runtime/serializer", Name: "NewCodecFactory"}), + "runtimeScheme": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/runtime", Name: "Scheme"}), + "schemaGroupVersion": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/runtime/schema", Name: "GroupVersion"}), + "metav1AddToGroupVersion": c.Universe.Function(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "AddToGroupVersion"}), + "announcedAPIGroupFactoryRegistry": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apimachinery/announced", Name: "APIGroupFactoryRegistry"}), + "registeredNewOrDie": c.Universe.Function(types.Name{Package: "k8s.io/apimachinery/pkg/apimachinery/registered", Name: "NewOrDie"}), + "registeredAPIRegistrationManager": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apimachinery/registered", Name: "APIRegistrationManager"}), + } + sw.Do(globalsTemplate, m) + + if _, err := os.Stat(filepath.Join(g.outputPath, strings.ToLower("register_custom.go"))); err == nil { + m["customRegister"] = true + } + + if g.internalClientset() { + sw.Do(internalRegistration, m) + } else { + sw.Do(registration, m) + } + + return sw.Error() +} + +func (g *genScheme) internalClientset() bool { + for _, group := range g.groups { + for _, v := range group.Versions { + if v == "" { + return true + } + } + } + return false +} + +var globalsTemplate = ` +var Scheme = $.runtimeNewScheme|raw$() +var Codecs = $.serializerNewCodecFactory|raw$(Scheme) +var ParameterCodec = $.runtimeNewParameterCodec|raw$(Scheme) +` + +var internalRegistration = ` +var Registry = $.registeredNewOrDie|raw$($.osGetenv|raw$("KUBE_API_VERSIONS")) +var GroupFactoryRegistry = make($.announcedAPIGroupFactoryRegistry|raw$) + +func init() { + $.metav1AddToGroupVersion|raw$(Scheme, $.schemaGroupVersion|raw${Version: "v1"}) + Install(GroupFactoryRegistry, Registry, Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(groupFactoryRegistry $.announcedAPIGroupFactoryRegistry|raw$, registry *$.registeredAPIRegistrationManager|raw$, scheme *$.runtimeScheme|raw$) { + $range .allInstallGroups$ $.InstallPackageName$.Install(groupFactoryRegistry, registry, scheme) + $end$ + $if .customRegister$ExtraInstall(groupFactoryRegistry, registry, scheme)$end$ +} +` + +var registration = ` + + +func init() { + $.metav1AddToGroupVersion|raw$(Scheme, $.schemaGroupVersion|raw${Version: "v1"}) + AddToScheme(Scheme) +} + +// AddToScheme adds all types of this clientset into the given scheme. This allows composition +// of clientsets, like in: +// +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kuberentes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) +// +// kclientset, _ := kubernetes.NewForConfig(c) +// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// +// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types +// correctly. +func AddToScheme(scheme *$.runtimeScheme|raw$) { + $range .allGroupVersions$ $.PackageName$.AddToScheme(scheme) + $end$ + $if .customRegister$ExtraAddToScheme(scheme)$end$ +} +` 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 76e7fe50331f..986062da04db 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_type.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_type.go @@ -29,11 +29,12 @@ import ( // genClientForType produces a file for each top-level type. type genClientForType struct { generator.DefaultGen - outputPackage string - group string - version string - typeToMatch *types.Type - imports namer.ImportTracker + outputPackage string + clientsetPackage string + group string + version string + typeToMatch *types.Type + imports namer.ImportTracker } var _ generator.Generator = &genClientForType{} @@ -78,19 +79,19 @@ func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w i pkg := filepath.Base(t.Name.Package) namespaced := !extractBoolTagOrDie("nonNamespaced", t.SecondClosestCommentLines) m := map[string]interface{}{ - "type": t, - "package": pkg, - "Package": namer.IC(pkg), - "namespaced": namespaced, - "Group": namer.IC(g.group), - "GroupVersion": namer.IC(g.group) + namer.IC(g.version), - "DeleteOptions": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "DeleteOptions"}), - "ListOptions": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "ListOptions"}), - "GetOptions": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "GetOptions"}), - "PatchType": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/types", Name: "PatchType"}), - "watchInterface": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/watch", Name: "Interface"}), - "RESTClientInterface": c.Universe.Type(types.Name{Package: "k8s.io/client-go/rest", Name: "Interface"}), - "apiParameterCodec": c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "ParameterCodec"}), + "type": t, + "package": pkg, + "Package": namer.IC(pkg), + "namespaced": namespaced, + "Group": namer.IC(g.group), + "GroupVersion": namer.IC(g.group) + namer.IC(g.version), + "DeleteOptions": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "DeleteOptions"}), + "ListOptions": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "ListOptions"}), + "GetOptions": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "GetOptions"}), + "PatchType": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/types", Name: "PatchType"}), + "watchInterface": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/watch", Name: "Interface"}), + "RESTClientInterface": c.Universe.Type(types.Name{Package: "k8s.io/client-go/rest", Name: "Interface"}), + "schemeParameterCodec": c.Universe.Variable(types.Name{Package: filepath.Join(g.clientsetPackage, "scheme"), Name: "ParameterCodec"}), } sw.Do(getterComment, m) @@ -224,7 +225,7 @@ func (c *$.type|privatePlural$) List(opts $.ListOptions|raw$) (result *$.type|ra err = c.client.Get(). $if .namespaced$Namespace(c.ns).$end$ Resource("$.type|allLowercasePlural$"). - VersionedParams(&opts, $.apiParameterCodec|raw$). + VersionedParams(&opts, $.schemeParameterCodec|raw$). Do(). Into(result) return @@ -238,7 +239,7 @@ func (c *$.type|privatePlural$) Get(name string, options $.GetOptions|raw$) (res $if .namespaced$Namespace(c.ns).$end$ Resource("$.type|allLowercasePlural$"). Name(name). - VersionedParams(&options, $.apiParameterCodec|raw$). + VersionedParams(&options, $.schemeParameterCodec|raw$). Do(). Into(result) return @@ -264,7 +265,7 @@ func (c *$.type|privatePlural$) DeleteCollection(options *$.DeleteOptions|raw$, return c.client.Delete(). $if .namespaced$Namespace(c.ns).$end$ Resource("$.type|allLowercasePlural$"). - VersionedParams(&listOptions, $.apiParameterCodec|raw$). + VersionedParams(&listOptions, $.schemeParameterCodec|raw$). Body(options). Do(). Error() @@ -325,7 +326,7 @@ func (c *$.type|privatePlural$) Watch(opts $.ListOptions|raw$) ($.watchInterface Prefix("watch"). $if .namespaced$Namespace(c.ns).$end$ Resource("$.type|allLowercasePlural$"). - VersionedParams(&opts, $.apiParameterCodec|raw$). + VersionedParams(&opts, $.schemeParameterCodec|raw$). Watch() } ` diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/BUILD b/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/BUILD index eceadc59e6d1..98507a7b5d3d 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/BUILD +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/BUILD @@ -15,12 +15,9 @@ go_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", - "//vendor:github.com/golang/glog", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apimachinery", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/util/sets", ], ) diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/install.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/install.go index 013129922399..c7f37c07b37d 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/install.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/install/install.go @@ -19,104 +19,31 @@ limitations under the License. package install import ( - "fmt" - - "github.com/golang/glog" - - "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/apimachinery" + "k8s.io/apimachinery/pkg/apimachinery/announced" + "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/util/sets" "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" ) -const importPrefix = "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup" - -var accessor = meta.NewAccessor() - -const groupName = "testgroup.k8s.io" - -// availableVersions lists all known external versions for this group from most preferred to least preferred -var availableVersions = []schema.GroupVersion{{Group: groupName, Version: "v1"}} - func init() { - externalVersions := availableVersions - api.Registry.RegisterVersions(availableVersions) - - if err := api.Registry.EnableVersions(externalVersions...); err != nil { - glog.V(4).Infof("%v", err) - return - } - if err := enableVersions(externalVersions); err != nil { - glog.V(4).Infof("%v", err) - return - } + Install(api.GroupFactoryRegistry, api.Registry, api.Scheme) } -// TODO: enableVersions should be centralized rather than spread in each API -// group. -// We can combine api.Registry.RegisterVersions, api.Registry.EnableVersions and -// api.Registry.RegisterGroup once we have moved enableVersions there. -func enableVersions(externalVersions []schema.GroupVersion) error { - addVersionsToScheme(externalVersions...) - preferredExternalVersion := externalVersions[0] - - groupMeta := apimachinery.GroupMeta{ - GroupVersion: preferredExternalVersion, - GroupVersions: externalVersions, - RESTMapper: newRESTMapper(externalVersions), - SelfLinker: runtime.SelfLinker(accessor), - InterfacesFor: interfacesFor, - } - - if err := api.Registry.RegisterGroup(groupMeta); err != nil { - return err - } - return nil -} - -func newRESTMapper(externalVersions []schema.GroupVersion) meta.RESTMapper { - // the list of kinds that are scoped at the root of the api hierarchy - // if a kind is not enumerated here, it is assumed to have a namespace scope - rootScoped := sets.NewString() - - ignoredKinds := sets.NewString() - - return meta.NewDefaultRESTMapperFromScheme(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped, api.Scheme) -} - -// InterfacesFor returns the default Codec and ResourceVersioner for a given version -// string, or an error if the version is not known. -func interfacesFor(version schema.GroupVersion) (*meta.VersionInterfaces, error) { - switch version { - case v1.SchemeGroupVersion: - return &meta.VersionInterfaces{ - ObjectConvertor: api.Scheme, - MetadataAccessor: accessor, - }, nil - default: - g, _ := api.Registry.Group(groupName) - return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions) - } -} - -func addVersionsToScheme(externalVersions ...schema.GroupVersion) { - // add the internal version to Scheme - if err := testgroup.AddToScheme(api.Scheme); err != nil { - // Programmer error, detect immediately +// Install registers the API group and adds types to a scheme +func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { + if err := announced.NewGroupMetaFactory( + &announced.GroupMetaFactoryArgs{ + GroupName: testgroup.SchemeGroupVersion.Group, + VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version}, + ImportPrefix: "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup", + AddInternalObjectsToScheme: testgroup.AddToScheme, + }, + announced.VersionToSchemeFunc{ + v1.SchemeGroupVersion.Version: v1.AddToScheme, + }, + ).Announce(groupFactoryRegistry).RegisterAndEnable(registry, scheme); err != nil { panic(err) } - // add the enabled external versions to Scheme - for _, v := range externalVersions { - switch v { - case v1.SchemeGroupVersion: - if err := v1.AddToScheme(api.Scheme); err != nil { - // Programmer error, detect immediately - panic(err) - } - } - } } 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 e8dca8ecf17d..cf8560f80d64 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 @@ -47,6 +47,7 @@ filegroup( srcs = [ ":package-srcs", "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/fake:all-srcs", + "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme:all-srcs", "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion:all-srcs", ], tags = ["automanaged"], 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 a67b103b422d..477ded4dbe60 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 @@ -17,27 +17,27 @@ limitations under the License. package test_internalclientset import ( - "github.com/golang/glog" + glog "github.com/golang/glog" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" - "k8s.io/client-go/util/flowcontrol" - internalversiontestgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" + flowcontrol "k8s.io/client-go/util/flowcontrol" + testgroupinternalversion "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" ) type Interface interface { Discovery() discovery.DiscoveryInterface - Testgroup() internalversiontestgroup.TestgroupInterface + Testgroup() testgroupinternalversion.TestgroupInterface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *internalversiontestgroup.TestgroupClient + *testgroupinternalversion.TestgroupClient } // Testgroup retrieves the TestgroupClient -func (c *Clientset) Testgroup() internalversiontestgroup.TestgroupInterface { +func (c *Clientset) Testgroup() testgroupinternalversion.TestgroupInterface { if c == nil { return nil } @@ -60,7 +60,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.TestgroupClient, err = internalversiontestgroup.NewForConfig(&configShallowCopy) + cs.TestgroupClient, err = testgroupinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -77,7 +77,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset - cs.TestgroupClient = internalversiontestgroup.NewForConfigOrDie(c) + cs.TestgroupClient = testgroupinternalversion.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -86,7 +86,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.TestgroupClient = internalversiontestgroup.New(c) + cs.TestgroupClient = testgroupinternalversion.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs 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 41f924336d61..2b97b40b01eb 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 @@ -23,8 +23,8 @@ import ( fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" clientset "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset" - 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" + testgroupinternalversion "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion" + faketestgroupinternalversion "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/fake" "k8s.io/kubernetes/pkg/api" ) @@ -62,6 +62,6 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} // Testgroup retrieves the TestgroupClient -func (c *Clientset) Testgroup() internalversiontestgroup.TestgroupInterface { - return &fakeinternalversiontestgroup.FakeTestgroup{Fake: &c.Fake} +func (c *Clientset) Testgroup() testgroupinternalversion.TestgroupInterface { + return &faketestgroupinternalversion.FakeTestgroup{Fake: &c.Fake} } diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/BUILD b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/BUILD new file mode 100644 index 000000000000..c7bf860654cc --- /dev/null +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/BUILD @@ -0,0 +1,39 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "doc.go", + "register.go", + ], + tags = ["automanaged"], + deps = [ + "//cmd/libs/go2idl/client-gen/test_apis/testgroup/install:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/federation/client/clientset_generated/federation_internalclientset/import_known_versions.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/doc.go similarity index 70% rename from federation/client/clientset_generated/federation_internalclientset/import_known_versions.go rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/doc.go index aa7329b3916a..5d8ec824f0fb 100644 --- a/federation/client/clientset_generated/federation_internalclientset/import_known_versions.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/doc.go @@ -1,5 +1,5 @@ /* -Copyright 2016 The Kubernetes Authors. +Copyright 2017 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. @@ -14,12 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package federation_internalclientset +// This package is generated by client-gen with custom arguments. -// These imports are the API groups the client will support. -import ( - _ "k8s.io/kubernetes/federation/apis/federation/install" -) - -func init() { -} +// This package contains the scheme of the automatically generated clientset. +package scheme diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/register.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/register.go new file mode 100644 index 000000000000..d59edd0bfcf8 --- /dev/null +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme/register.go @@ -0,0 +1,46 @@ +/* +Copyright 2017 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 scheme + +import ( + announced "k8s.io/apimachinery/pkg/apimachinery/announced" + registered "k8s.io/apimachinery/pkg/apimachinery/registered" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" + serializer "k8s.io/apimachinery/pkg/runtime/serializer" + testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup/install" + os "os" +) + +var Scheme = runtime.NewScheme() +var Codecs = serializer.NewCodecFactory(Scheme) +var ParameterCodec = runtime.NewParameterCodec(Scheme) + +var Registry = registered.NewOrDie(os.Getenv("KUBE_API_VERSIONS")) +var GroupFactoryRegistry = make(announced.APIGroupFactoryRegistry) + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + Install(GroupFactoryRegistry, Registry, Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { + testgroup.Install(groupFactoryRegistry, registry, scheme) + +} 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 index 7c883a185005..ef203b9d6d8d 100644 --- 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 @@ -18,7 +18,7 @@ go_library( tags = ["automanaged"], deps = [ "//cmd/libs/go2idl/client-gen/test_apis/testgroup:go_default_library", - "//pkg/api:go_default_library", + "//cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go index bb2855b51cfd..64c66351b316 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testgroup_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme" ) type TestgroupInterface interface { @@ -64,20 +64,20 @@ func New(c rest.Interface) *TestgroupClient { } func setConfigDefaults(config *rest.Config) error { - // if testgroup group is not registered, return an error - g, err := api.Registry.Group("testgroup.k8s.io") + g, err := scheme.Registry.Group("testgroup.k8s.io") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -85,6 +85,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go index b7466945c290..ed2d237c3297 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup/internalversion/testtype.go @@ -22,7 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" testgroup "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/scheme" ) // TestTypesGetter has a method to return a TestTypeInterface. @@ -116,7 +116,7 @@ func (c *testTypes) DeleteCollection(options *v1.DeleteOptions, listOptions v1.L return c.client.Delete(). Namespace(c.ns). Resource("testtypes"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *testTypes) Get(name string, options v1.GetOptions) (result *testgroup.T Namespace(c.ns). Resource("testtypes"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *testTypes) List(opts v1.ListOptions) (result *testgroup.TestTypeList, e err = c.client.Get(). Namespace(c.ns). Resource("testtypes"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *testTypes) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("testtypes"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/cmd/libs/go2idl/client-gen/types/helpers.go b/cmd/libs/go2idl/client-gen/types/helpers.go index 641026470c47..aad3b538508f 100644 --- a/cmd/libs/go2idl/client-gen/types/helpers.go +++ b/cmd/libs/go2idl/client-gen/types/helpers.go @@ -94,7 +94,7 @@ func ToGroupVersionPackages(groups []GroupVersions) []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()), + PackageName: strings.ToLower(group.Group.NonEmpty() + version.NonEmpty()), IsDefaultVersion: version == defaultVersion && version != "", }) } @@ -102,6 +102,17 @@ func ToGroupVersionPackages(groups []GroupVersions) []GroupVersionPackage { return groupVersionPackages } +func ToGroupInstallPackages(groups []GroupVersions) []GroupInstallPackage { + var groupInstallPackages []GroupInstallPackage + for _, group := range groups { + groupInstallPackages = append(groupInstallPackages, GroupInstallPackage{ + Group: Group(namer.IC(group.Group.NonEmpty())), + InstallPackageName: strings.ToLower(group.Group.NonEmpty()), + }) + } + return groupInstallPackages +} + // 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/types/types.go b/cmd/libs/go2idl/client-gen/types/types.go index 5c515bbd5d49..135ea5a2423f 100644 --- a/cmd/libs/go2idl/client-gen/types/types.go +++ b/cmd/libs/go2idl/client-gen/types/types.go @@ -62,3 +62,8 @@ type GroupVersionPackage struct { GroupVersion string PackageName string } + +type GroupInstallPackage struct { + Group Group + InstallPackageName string +} diff --git a/federation/apis/federation/install/BUILD b/federation/apis/federation/install/BUILD index 4af84a9f2f65..05248622f030 100644 --- a/federation/apis/federation/install/BUILD +++ b/federation/apis/federation/install/BUILD @@ -16,11 +16,9 @@ go_library( "//federation/apis/federation:go_default_library", "//federation/apis/federation/v1beta1:go_default_library", "//pkg/api:go_default_library", - "//vendor:github.com/golang/glog", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apimachinery", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/util/sets", ], ) @@ -34,6 +32,7 @@ go_test( "//federation/apis/federation:go_default_library", "//federation/apis/federation/v1beta1:go_default_library", "//pkg/api:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", ], diff --git a/federation/apis/federation/install/install.go b/federation/apis/federation/install/install.go index 5ce961d4d341..d64bc269b9a2 100644 --- a/federation/apis/federation/install/install.go +++ b/federation/apis/federation/install/install.go @@ -17,117 +17,36 @@ limitations under the License. package install import ( - "fmt" - - "github.com/golang/glog" - - "k8s.io/apimachinery/pkg/api/meta" - "k8s.io/apimachinery/pkg/apimachinery" + "k8s.io/apimachinery/pkg/apimachinery/announced" + "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/federation/apis/federation/v1beta1" - "k8s.io/kubernetes/pkg/api" ) -const importPrefix = "k8s.io/kubernetes/federation/apis/federation" - -var accessor = meta.NewAccessor() - -// availableVersions lists all known external versions for this group from most preferred to least preferred -var availableVersions = []schema.GroupVersion{v1beta1.SchemeGroupVersion} - func init() { - api.Registry.RegisterVersions(availableVersions) - externalVersions := []schema.GroupVersion{} - for _, v := range availableVersions { - if api.Registry.IsAllowedVersion(v) { - externalVersions = append(externalVersions, v) - } - } - if len(externalVersions) == 0 { - glog.V(4).Infof("No version is registered for group %v", federation.GroupName) - return - } - - if err := api.Registry.EnableVersions(externalVersions...); err != nil { - glog.V(4).Infof("%v", err) - return - } - if err := enableVersions(externalVersions); err != nil { - glog.V(4).Infof("%v", err) - return - } + Install(api.GroupFactoryRegistry, api.Registry, api.Scheme) } -// TODO: enableVersions should be centralized rather than spread in each API -// group. -// We can combine api.Registry.RegisterVersions, api.Registry.EnableVersions and -// api.Registry.RegisterGroup once we have moved enableVersions there. -func enableVersions(externalVersions []schema.GroupVersion) error { - addVersionsToScheme(externalVersions...) - preferredExternalVersion := externalVersions[0] - - groupMeta := apimachinery.GroupMeta{ - GroupVersion: preferredExternalVersion, - GroupVersions: externalVersions, - RESTMapper: newRESTMapper(externalVersions), - SelfLinker: runtime.SelfLinker(accessor), - InterfacesFor: interfacesFor, - } - - if err := api.Registry.RegisterGroup(groupMeta); err != nil { - return err - } - return nil -} - -func newRESTMapper(externalVersions []schema.GroupVersion) meta.RESTMapper { - // the list of kinds that are scoped at the root of the api hierarchy - // if a kind is not enumerated here, it is assumed to have a namespace scope - rootScoped := sets.NewString( - "Cluster", - ) - - ignoredKinds := sets.NewString() - - return meta.NewDefaultRESTMapperFromScheme(externalVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped, api.Scheme) -} - -// interfacesFor returns the default Codec and ResourceVersioner for a given version -// string, or an error if the version is not known. -func interfacesFor(version schema.GroupVersion) (*meta.VersionInterfaces, error) { - switch version { - case v1beta1.SchemeGroupVersion: - return &meta.VersionInterfaces{ - ObjectConvertor: api.Scheme, - MetadataAccessor: accessor, - }, nil - default: - g, _ := api.Registry.Group(federation.GroupName) - return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions) - } -} - -func addVersionsToScheme(externalVersions ...schema.GroupVersion) { - // add the internal version to Scheme - if err := federation.AddToScheme(api.Scheme); err != nil { - // Programmer error, detect immediately +// Install registers the API group and adds types to a scheme +func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { + if err := announced.NewGroupMetaFactory( + &announced.GroupMetaFactoryArgs{ + GroupName: federation.GroupName, + VersionPreferenceOrder: []string{v1beta1.SchemeGroupVersion.Version}, + ImportPrefix: "k8s.io/kubernetes/federation/apis/federation", + AddInternalObjectsToScheme: federation.AddToScheme, + RootScopedKinds: sets.NewString( + "Cluster", + ), + }, + announced.VersionToSchemeFunc{ + v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme, + }, + ).Announce(groupFactoryRegistry).RegisterAndEnable(registry, scheme); err != nil { panic(err) } - // add the enabled external versions to Scheme - for _, v := range externalVersions { - if !api.Registry.IsEnabledVersion(v) { - glog.Errorf("Version %s is not enabled, so it will not be added to the Scheme.", v) - continue - } - switch v { - case v1beta1.SchemeGroupVersion: - if err := v1beta1.AddToScheme(api.Scheme); err != nil { - // Programmer error, detect immediately - panic(err) - } - } - } } diff --git a/federation/apis/federation/install/install_test.go b/federation/apis/federation/install/install_test.go index 393bedd25905..9521ae2c34b1 100644 --- a/federation/apis/federation/install/install_test.go +++ b/federation/apis/federation/install/install_test.go @@ -20,6 +20,7 @@ import ( "encoding/json" "testing" + "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/federation/apis/federation" @@ -28,6 +29,7 @@ import ( ) func TestResourceVersioner(t *testing.T) { + accessor := meta.NewAccessor() cluster := federation.Cluster{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "10"}} version, err := accessor.ResourceVersion(&cluster) if err != nil { diff --git a/federation/client/clientset_generated/federation_clientset/BUILD b/federation/client/clientset_generated/federation_clientset/BUILD index 0e5e56ad6702..eb8ce5f8496b 100644 --- a/federation/client/clientset_generated/federation_clientset/BUILD +++ b/federation/client/clientset_generated/federation_clientset/BUILD @@ -41,6 +41,7 @@ filegroup( srcs = [ ":package-srcs", "//federation/client/clientset_generated/federation_clientset/fake:all-srcs", + "//federation/client/clientset_generated/federation_clientset/scheme:all-srcs", "//federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1:all-srcs", "//federation/client/clientset_generated/federation_clientset/typed/batch/v1:all-srcs", "//federation/client/clientset_generated/federation_clientset/typed/core/v1:all-srcs", diff --git a/federation/client/clientset_generated/federation_clientset/clientset.go b/federation/client/clientset_generated/federation_clientset/clientset.go index f611609c639d..af2cb74601d5 100644 --- a/federation/client/clientset_generated/federation_clientset/clientset.go +++ b/federation/client/clientset_generated/federation_clientset/clientset.go @@ -17,49 +17,49 @@ limitations under the License. package federation_clientset import ( - "github.com/golang/glog" + glog "github.com/golang/glog" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" - "k8s.io/client-go/util/flowcontrol" - v1autoscaling "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1" - v1batch "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/batch/v1" - v1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" - v1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1" - v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1" + flowcontrol "k8s.io/client-go/util/flowcontrol" + autoscalingv1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1" + batchv1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/batch/v1" + corev1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" + extensionsv1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1" + federationv1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1" ) type Interface interface { Discovery() discovery.DiscoveryInterface - CoreV1() v1core.CoreV1Interface + CoreV1() corev1.CoreV1Interface // Deprecated: please explicitly pick a version if possible. - Core() v1core.CoreV1Interface - AutoscalingV1() v1autoscaling.AutoscalingV1Interface + Core() corev1.CoreV1Interface + AutoscalingV1() autoscalingv1.AutoscalingV1Interface // Deprecated: please explicitly pick a version if possible. - Autoscaling() v1autoscaling.AutoscalingV1Interface - BatchV1() v1batch.BatchV1Interface + Autoscaling() autoscalingv1.AutoscalingV1Interface + BatchV1() batchv1.BatchV1Interface // Deprecated: please explicitly pick a version if possible. - Batch() v1batch.BatchV1Interface - ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Interface + Batch() batchv1.BatchV1Interface + ExtensionsV1beta1() extensionsv1beta1.ExtensionsV1beta1Interface // Deprecated: please explicitly pick a version if possible. - Extensions() v1beta1extensions.ExtensionsV1beta1Interface - FederationV1beta1() v1beta1federation.FederationV1beta1Interface + Extensions() extensionsv1beta1.ExtensionsV1beta1Interface + FederationV1beta1() federationv1beta1.FederationV1beta1Interface // Deprecated: please explicitly pick a version if possible. - Federation() v1beta1federation.FederationV1beta1Interface + Federation() federationv1beta1.FederationV1beta1Interface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *v1core.CoreV1Client - *v1autoscaling.AutoscalingV1Client - *v1batch.BatchV1Client - *v1beta1extensions.ExtensionsV1beta1Client - *v1beta1federation.FederationV1beta1Client + *corev1.CoreV1Client + *autoscalingv1.AutoscalingV1Client + *batchv1.BatchV1Client + *extensionsv1beta1.ExtensionsV1beta1Client + *federationv1beta1.FederationV1beta1Client } // CoreV1 retrieves the CoreV1Client -func (c *Clientset) CoreV1() v1core.CoreV1Interface { +func (c *Clientset) CoreV1() corev1.CoreV1Interface { if c == nil { return nil } @@ -68,7 +68,7 @@ func (c *Clientset) CoreV1() v1core.CoreV1Interface { // Deprecated: Core retrieves the default version of CoreClient. // Please explicitly pick a version. -func (c *Clientset) Core() v1core.CoreV1Interface { +func (c *Clientset) Core() corev1.CoreV1Interface { if c == nil { return nil } @@ -76,7 +76,7 @@ func (c *Clientset) Core() v1core.CoreV1Interface { } // AutoscalingV1 retrieves the AutoscalingV1Client -func (c *Clientset) AutoscalingV1() v1autoscaling.AutoscalingV1Interface { +func (c *Clientset) AutoscalingV1() autoscalingv1.AutoscalingV1Interface { if c == nil { return nil } @@ -85,7 +85,7 @@ func (c *Clientset) AutoscalingV1() v1autoscaling.AutoscalingV1Interface { // Deprecated: Autoscaling retrieves the default version of AutoscalingClient. // Please explicitly pick a version. -func (c *Clientset) Autoscaling() v1autoscaling.AutoscalingV1Interface { +func (c *Clientset) Autoscaling() autoscalingv1.AutoscalingV1Interface { if c == nil { return nil } @@ -93,7 +93,7 @@ func (c *Clientset) Autoscaling() v1autoscaling.AutoscalingV1Interface { } // BatchV1 retrieves the BatchV1Client -func (c *Clientset) BatchV1() v1batch.BatchV1Interface { +func (c *Clientset) BatchV1() batchv1.BatchV1Interface { if c == nil { return nil } @@ -102,7 +102,7 @@ func (c *Clientset) BatchV1() v1batch.BatchV1Interface { // Deprecated: Batch retrieves the default version of BatchClient. // Please explicitly pick a version. -func (c *Clientset) Batch() v1batch.BatchV1Interface { +func (c *Clientset) Batch() batchv1.BatchV1Interface { if c == nil { return nil } @@ -110,7 +110,7 @@ func (c *Clientset) Batch() v1batch.BatchV1Interface { } // ExtensionsV1beta1 retrieves the ExtensionsV1beta1Client -func (c *Clientset) ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Interface { +func (c *Clientset) ExtensionsV1beta1() extensionsv1beta1.ExtensionsV1beta1Interface { if c == nil { return nil } @@ -119,7 +119,7 @@ func (c *Clientset) ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Inter // Deprecated: Extensions retrieves the default version of ExtensionsClient. // Please explicitly pick a version. -func (c *Clientset) Extensions() v1beta1extensions.ExtensionsV1beta1Interface { +func (c *Clientset) Extensions() extensionsv1beta1.ExtensionsV1beta1Interface { if c == nil { return nil } @@ -127,7 +127,7 @@ func (c *Clientset) Extensions() v1beta1extensions.ExtensionsV1beta1Interface { } // FederationV1beta1 retrieves the FederationV1beta1Client -func (c *Clientset) FederationV1beta1() v1beta1federation.FederationV1beta1Interface { +func (c *Clientset) FederationV1beta1() federationv1beta1.FederationV1beta1Interface { if c == nil { return nil } @@ -136,7 +136,7 @@ func (c *Clientset) FederationV1beta1() v1beta1federation.FederationV1beta1Inter // Deprecated: Federation retrieves the default version of FederationClient. // Please explicitly pick a version. -func (c *Clientset) Federation() v1beta1federation.FederationV1beta1Interface { +func (c *Clientset) Federation() federationv1beta1.FederationV1beta1Interface { if c == nil { return nil } @@ -159,23 +159,23 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.CoreV1Client, err = v1core.NewForConfig(&configShallowCopy) + cs.CoreV1Client, err = corev1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AutoscalingV1Client, err = v1autoscaling.NewForConfig(&configShallowCopy) + cs.AutoscalingV1Client, err = autoscalingv1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.BatchV1Client, err = v1batch.NewForConfig(&configShallowCopy) + cs.BatchV1Client, err = batchv1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.ExtensionsV1beta1Client, err = v1beta1extensions.NewForConfig(&configShallowCopy) + cs.ExtensionsV1beta1Client, err = extensionsv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.FederationV1beta1Client, err = v1beta1federation.NewForConfig(&configShallowCopy) + cs.FederationV1beta1Client, err = federationv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -192,11 +192,11 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset - cs.CoreV1Client = v1core.NewForConfigOrDie(c) - cs.AutoscalingV1Client = v1autoscaling.NewForConfigOrDie(c) - cs.BatchV1Client = v1batch.NewForConfigOrDie(c) - cs.ExtensionsV1beta1Client = v1beta1extensions.NewForConfigOrDie(c) - cs.FederationV1beta1Client = v1beta1federation.NewForConfigOrDie(c) + cs.CoreV1Client = corev1.NewForConfigOrDie(c) + cs.AutoscalingV1Client = autoscalingv1.NewForConfigOrDie(c) + cs.BatchV1Client = batchv1.NewForConfigOrDie(c) + cs.ExtensionsV1beta1Client = extensionsv1beta1.NewForConfigOrDie(c) + cs.FederationV1beta1Client = federationv1beta1.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -205,11 +205,11 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.CoreV1Client = v1core.New(c) - cs.AutoscalingV1Client = v1autoscaling.New(c) - cs.BatchV1Client = v1batch.New(c) - cs.ExtensionsV1beta1Client = v1beta1extensions.New(c) - cs.FederationV1beta1Client = v1beta1federation.New(c) + cs.CoreV1Client = corev1.New(c) + cs.AutoscalingV1Client = autoscalingv1.New(c) + cs.BatchV1Client = batchv1.New(c) + cs.ExtensionsV1beta1Client = extensionsv1beta1.New(c) + cs.FederationV1beta1Client = federationv1beta1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go b/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go index 17e670b748b5..cf7555d810e0 100644 --- a/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go +++ b/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go @@ -23,16 +23,16 @@ import ( fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" - v1autoscaling "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1" - fakev1autoscaling "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake" - v1batch "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/batch/v1" - fakev1batch "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake" - v1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" - fakev1core "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake" - v1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1" - fakev1beta1extensions "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake" - v1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1" - fakev1beta1federation "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake" + autoscalingv1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1" + fakeautoscalingv1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake" + batchv1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/batch/v1" + fakebatchv1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake" + corev1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" + fakecorev1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake" + extensionsv1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1" + fakeextensionsv1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake" + federationv1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1" + fakefederationv1beta1 "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake" "k8s.io/kubernetes/pkg/api" ) @@ -70,51 +70,51 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} // CoreV1 retrieves the CoreV1Client -func (c *Clientset) CoreV1() v1core.CoreV1Interface { - return &fakev1core.FakeCoreV1{Fake: &c.Fake} +func (c *Clientset) CoreV1() corev1.CoreV1Interface { + return &fakecorev1.FakeCoreV1{Fake: &c.Fake} } // Core retrieves the CoreV1Client -func (c *Clientset) Core() v1core.CoreV1Interface { - return &fakev1core.FakeCoreV1{Fake: &c.Fake} +func (c *Clientset) Core() corev1.CoreV1Interface { + return &fakecorev1.FakeCoreV1{Fake: &c.Fake} } // AutoscalingV1 retrieves the AutoscalingV1Client -func (c *Clientset) AutoscalingV1() v1autoscaling.AutoscalingV1Interface { - return &fakev1autoscaling.FakeAutoscalingV1{Fake: &c.Fake} +func (c *Clientset) AutoscalingV1() autoscalingv1.AutoscalingV1Interface { + return &fakeautoscalingv1.FakeAutoscalingV1{Fake: &c.Fake} } // Autoscaling retrieves the AutoscalingV1Client -func (c *Clientset) Autoscaling() v1autoscaling.AutoscalingV1Interface { - return &fakev1autoscaling.FakeAutoscalingV1{Fake: &c.Fake} +func (c *Clientset) Autoscaling() autoscalingv1.AutoscalingV1Interface { + return &fakeautoscalingv1.FakeAutoscalingV1{Fake: &c.Fake} } // BatchV1 retrieves the BatchV1Client -func (c *Clientset) BatchV1() v1batch.BatchV1Interface { - return &fakev1batch.FakeBatchV1{Fake: &c.Fake} +func (c *Clientset) BatchV1() batchv1.BatchV1Interface { + return &fakebatchv1.FakeBatchV1{Fake: &c.Fake} } // Batch retrieves the BatchV1Client -func (c *Clientset) Batch() v1batch.BatchV1Interface { - return &fakev1batch.FakeBatchV1{Fake: &c.Fake} +func (c *Clientset) Batch() batchv1.BatchV1Interface { + return &fakebatchv1.FakeBatchV1{Fake: &c.Fake} } // ExtensionsV1beta1 retrieves the ExtensionsV1beta1Client -func (c *Clientset) ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Interface { - return &fakev1beta1extensions.FakeExtensionsV1beta1{Fake: &c.Fake} +func (c *Clientset) ExtensionsV1beta1() extensionsv1beta1.ExtensionsV1beta1Interface { + return &fakeextensionsv1beta1.FakeExtensionsV1beta1{Fake: &c.Fake} } // Extensions retrieves the ExtensionsV1beta1Client -func (c *Clientset) Extensions() v1beta1extensions.ExtensionsV1beta1Interface { - return &fakev1beta1extensions.FakeExtensionsV1beta1{Fake: &c.Fake} +func (c *Clientset) Extensions() extensionsv1beta1.ExtensionsV1beta1Interface { + return &fakeextensionsv1beta1.FakeExtensionsV1beta1{Fake: &c.Fake} } // FederationV1beta1 retrieves the FederationV1beta1Client -func (c *Clientset) FederationV1beta1() v1beta1federation.FederationV1beta1Interface { - return &fakev1beta1federation.FakeFederationV1beta1{Fake: &c.Fake} +func (c *Clientset) FederationV1beta1() federationv1beta1.FederationV1beta1Interface { + return &fakefederationv1beta1.FakeFederationV1beta1{Fake: &c.Fake} } // Federation retrieves the FederationV1beta1Client -func (c *Clientset) Federation() v1beta1federation.FederationV1beta1Interface { - return &fakev1beta1federation.FakeFederationV1beta1{Fake: &c.Fake} +func (c *Clientset) Federation() federationv1beta1.FederationV1beta1Interface { + return &fakefederationv1beta1.FakeFederationV1beta1{Fake: &c.Fake} } diff --git a/federation/client/clientset_generated/federation_clientset/scheme/BUILD b/federation/client/clientset_generated/federation_clientset/scheme/BUILD new file mode 100644 index 000000000000..94dbadeef7d5 --- /dev/null +++ b/federation/client/clientset_generated/federation_clientset/scheme/BUILD @@ -0,0 +1,41 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "doc.go", + "register.go", + ], + tags = ["automanaged"], + deps = [ + "//federation/apis/federation/v1beta1:go_default_library", + "//pkg/api/v1:go_default_library", + "//pkg/apis/autoscaling/v1:go_default_library", + "//pkg/apis/batch/v1:go_default_library", + "//pkg/apis/extensions/v1beta1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/federation/client/clientset_generated/federation_clientset/scheme/doc.go b/federation/client/clientset_generated/federation_clientset/scheme/doc.go new file mode 100644 index 000000000000..5d8ec824f0fb --- /dev/null +++ b/federation/client/clientset_generated/federation_clientset/scheme/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2017 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 custom arguments. + +// This package contains the scheme of the automatically generated clientset. +package scheme diff --git a/federation/client/clientset_generated/federation_clientset/scheme/register.go b/federation/client/clientset_generated/federation_clientset/scheme/register.go new file mode 100644 index 000000000000..a2100d5d86eb --- /dev/null +++ b/federation/client/clientset_generated/federation_clientset/scheme/register.go @@ -0,0 +1,61 @@ +/* +Copyright 2017 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 scheme + +import ( + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" + serializer "k8s.io/apimachinery/pkg/runtime/serializer" + federationv1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" + corev1 "k8s.io/kubernetes/pkg/api/v1" + autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" + extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" +) + +var Scheme = runtime.NewScheme() +var Codecs = serializer.NewCodecFactory(Scheme) +var ParameterCodec = runtime.NewParameterCodec(Scheme) + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + AddToScheme(Scheme) +} + +// AddToScheme adds all types of this clientset into the given scheme. This allows composition +// of clientsets, like in: +// +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kuberentes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) +// +// kclientset, _ := kubernetes.NewForConfig(c) +// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// +// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types +// correctly. +func AddToScheme(scheme *runtime.Scheme) { + corev1.AddToScheme(scheme) + autoscalingv1.AddToScheme(scheme) + batchv1.AddToScheme(scheme) + extensionsv1beta1.AddToScheme(scheme) + federationv1beta1.AddToScheme(scheme) + +} diff --git a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/BUILD index e736a7144a73..844ba12df6f9 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/BUILD @@ -17,10 +17,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", + "//federation/client/clientset_generated/federation_clientset/scheme:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/autoscaling_client.go b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/autoscaling_client.go index 0b501982096c..2057781ca79e 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/autoscaling_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/autoscaling_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" + v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" ) type AutoscalingV1Interface interface { @@ -67,22 +66,14 @@ func New(c rest.Interface) *AutoscalingV1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("autoscaling/v1") - if err != nil { - return err - } - // if autoscaling/v1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("autoscaling/v1 is not enabled") - } + gv := v1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/horizontalpodautoscaler.go b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/horizontalpodautoscaler.go index c0891dd5f1d5..c34358c23ae8 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/horizontalpodautoscaler.go +++ b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/horizontalpodautoscaler.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" ) @@ -116,7 +116,7 @@ func (c *horizontalPodAutoscalers) DeleteCollection(options *meta_v1.DeleteOptio return c.client.Delete(). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *horizontalPodAutoscalers) Get(name string, options meta_v1.GetOptions) Namespace(c.ns). Resource("horizontalpodautoscalers"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *horizontalPodAutoscalers) List(opts meta_v1.ListOptions) (result *v1.Ho err = c.client.Get(). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *horizontalPodAutoscalers) Watch(opts meta_v1.ListOptions) (watch.Interf Prefix("watch"). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/BUILD index 5cc3bbffc306..3e6605f51a3b 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/BUILD @@ -17,10 +17,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", + "//federation/client/clientset_generated/federation_clientset/scheme:go_default_library", "//pkg/apis/batch/v1:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go index 2c1dba16582e..55ecf11a916b 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" + v1 "k8s.io/kubernetes/pkg/apis/batch/v1" ) type BatchV1Interface interface { @@ -67,22 +66,14 @@ func New(c rest.Interface) *BatchV1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("batch/v1") - if err != nil { - return err - } - // if batch/v1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("batch/v1 is not enabled") - } + gv := v1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go index ad38e23e7f5f..ceea2b6fa89d 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" v1 "k8s.io/kubernetes/pkg/apis/batch/v1" ) @@ -116,7 +116,7 @@ func (c *jobs) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta return c.client.Delete(). Namespace(c.ns). Resource("jobs"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *jobs) Get(name string, options meta_v1.GetOptions) (result *v1.Job, err Namespace(c.ns). Resource("jobs"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *jobs) List(opts meta_v1.ListOptions) (result *v1.JobList, err error) { err = c.client.Get(). Namespace(c.ns). Resource("jobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *jobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("jobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD index 65a5de4c82ac..619a3989331f 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD @@ -22,10 +22,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", + "//federation/client/clientset_generated/federation_clientset/scheme:go_default_library", "//pkg/api/v1:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go index 05ea6339d9d2..3f59b96ae3a6 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" v1 "k8s.io/kubernetes/pkg/api/v1" ) @@ -99,7 +99,7 @@ func (c *configMaps) DeleteCollection(options *meta_v1.DeleteOptions, listOption return c.client.Delete(). Namespace(c.ns). Resource("configmaps"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *configMaps) Get(name string, options meta_v1.GetOptions) (result *v1.Co Namespace(c.ns). Resource("configmaps"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *configMaps) List(opts meta_v1.ListOptions) (result *v1.ConfigMapList, e err = c.client.Get(). Namespace(c.ns). Resource("configmaps"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *configMaps) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("configmaps"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go index ad08c466c650..c4a599f2ed32 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" + v1 "k8s.io/kubernetes/pkg/api/v1" ) type CoreV1Interface interface { @@ -87,22 +86,14 @@ func New(c rest.Interface) *CoreV1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("/v1") - if err != nil { - return err - } - // if /v1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("/v1 is not enabled") - } + gv := v1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/api" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go index 0d103dae22ee..fc8ec6b8966f 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" v1 "k8s.io/kubernetes/pkg/api/v1" ) @@ -99,7 +99,7 @@ func (c *events) DeleteCollection(options *meta_v1.DeleteOptions, listOptions me return c.client.Delete(). Namespace(c.ns). Resource("events"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *events) Get(name string, options meta_v1.GetOptions) (result *v1.Event, Namespace(c.ns). Resource("events"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *events) List(opts meta_v1.ListOptions) (result *v1.EventList, err error err = c.client.Get(). Namespace(c.ns). Resource("events"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *events) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("events"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go index ce3a7a34215a..791b7e70b41b 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" v1 "k8s.io/kubernetes/pkg/api/v1" ) @@ -109,7 +109,7 @@ func (c *namespaces) Delete(name string, options *meta_v1.DeleteOptions) error { func (c *namespaces) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { return c.client.Delete(). Resource("namespaces"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -121,7 +121,7 @@ func (c *namespaces) Get(name string, options meta_v1.GetOptions) (result *v1.Na err = c.client.Get(). Resource("namespaces"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -132,7 +132,7 @@ func (c *namespaces) List(opts meta_v1.ListOptions) (result *v1.NamespaceList, e result = &v1.NamespaceList{} err = c.client.Get(). Resource("namespaces"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -143,7 +143,7 @@ func (c *namespaces) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("namespaces"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go index 2d2bb0fa0e66..53f4ad7fdd63 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" v1 "k8s.io/kubernetes/pkg/api/v1" ) @@ -99,7 +99,7 @@ func (c *secrets) DeleteCollection(options *meta_v1.DeleteOptions, listOptions m return c.client.Delete(). Namespace(c.ns). Resource("secrets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *secrets) Get(name string, options meta_v1.GetOptions) (result *v1.Secre Namespace(c.ns). Resource("secrets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *secrets) List(opts meta_v1.ListOptions) (result *v1.SecretList, err err err = c.client.Get(). Namespace(c.ns). Resource("secrets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *secrets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("secrets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go index 489c0d48a9a0..335c359118a3 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go +++ b/federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" v1 "k8s.io/kubernetes/pkg/api/v1" ) @@ -116,7 +116,7 @@ func (c *services) DeleteCollection(options *meta_v1.DeleteOptions, listOptions return c.client.Delete(). Namespace(c.ns). Resource("services"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *services) Get(name string, options meta_v1.GetOptions) (result *v1.Serv Namespace(c.ns). Resource("services"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *services) List(opts meta_v1.ListOptions) (result *v1.ServiceList, err e err = c.client.Get(). Namespace(c.ns). Resource("services"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *services) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("services"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD index aab8bc9879a9..e4a87f4559a3 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD @@ -21,10 +21,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", + "//federation/client/clientset_generated/federation_clientset/scheme:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go index 54690c482fc4..01a53771bf7f 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" ) @@ -116,7 +116,7 @@ func (c *daemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1. return c.client.Delete(). Namespace(c.ns). Resource("daemonsets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *daemonSets) Get(name string, options v1.GetOptions) (result *v1beta1.Da Namespace(c.ns). Resource("daemonsets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *daemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetList, e err = c.client.Get(). Namespace(c.ns). Resource("daemonsets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *daemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("daemonsets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go index fa78629638b9..f1205cf38a95 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" ) @@ -116,7 +116,7 @@ func (c *deployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1 return c.client.Delete(). Namespace(c.ns). Resource("deployments"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *deployments) Get(name string, options v1.GetOptions) (result *v1beta1.D Namespace(c.ns). Resource("deployments"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *deployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentList, err = c.client.Get(). Namespace(c.ns). Resource("deployments"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *deployments) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("deployments"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go index 893c8d2a7f9a..c62cb9b64fac 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1beta1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" + v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" ) type ExtensionsV1beta1Interface interface { @@ -82,22 +81,14 @@ func New(c rest.Interface) *ExtensionsV1beta1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("extensions/v1beta1") - if err != nil { - return err - } - // if extensions/v1beta1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("extensions/v1beta1 is not enabled") - } + gv := v1beta1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go index 685d1ea7f069..7ab60602edd8 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" ) @@ -116,7 +116,7 @@ func (c *ingresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.L return c.client.Delete(). Namespace(c.ns). Resource("ingresses"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *ingresses) Get(name string, options v1.GetOptions) (result *v1beta1.Ing Namespace(c.ns). Resource("ingresses"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *ingresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, err err = c.client.Get(). Namespace(c.ns). Resource("ingresses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *ingresses) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("ingresses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go index 5069fab5826b..5dc2e1fc9a5d 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" ) @@ -116,7 +116,7 @@ func (c *replicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1 return c.client.Delete(). Namespace(c.ns). Resource("replicasets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *replicaSets) Get(name string, options v1.GetOptions) (result *v1beta1.R Namespace(c.ns). Resource("replicasets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *replicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetList, err = c.client.Get(). Namespace(c.ns). Resource("replicasets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *replicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("replicasets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD index 9cafb8f4967e..bfaec2874cb7 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD @@ -18,9 +18,8 @@ go_library( tags = ["automanaged"], deps = [ "//federation/apis/federation/v1beta1:go_default_library", - "//pkg/api:go_default_library", + "//federation/client/clientset_generated/federation_clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go index 7ca5fc9cd34b..9e1f7a7479c5 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go @@ -22,7 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" ) // ClustersGetter has a method to return a ClusterInterface. @@ -109,7 +109,7 @@ func (c *clusters) Delete(name string, options *v1.DeleteOptions) error { func (c *clusters) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("clusters"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -121,7 +121,7 @@ func (c *clusters) Get(name string, options v1.GetOptions) (result *v1beta1.Clus err = c.client.Get(). Resource("clusters"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -132,7 +132,7 @@ func (c *clusters) List(opts v1.ListOptions) (result *v1beta1.ClusterList, err e result = &v1beta1.ClusterList{} err = c.client.Get(). Resource("clusters"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -143,7 +143,7 @@ func (c *clusters) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("clusters"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go index b51bfda2230b..e5c8d1d04094 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1beta1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" ) type FederationV1beta1Interface interface { @@ -67,22 +66,14 @@ func New(c rest.Interface) *FederationV1beta1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("federation/v1beta1") - if err != nil { - return err - } - // if federation/v1beta1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("federation/v1beta1 is not enabled") - } + gv := v1beta1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/federation/client/clientset_generated/federation_internalclientset/BUILD b/federation/client/clientset_generated/federation_internalclientset/BUILD index ff1c0139729d..60210d2cddb6 100644 --- a/federation/client/clientset_generated/federation_internalclientset/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/BUILD @@ -12,11 +12,9 @@ go_library( srcs = [ "clientset.go", "doc.go", - "import_known_versions.go", ], tags = ["automanaged"], deps = [ - "//federation/apis/federation/install:go_default_library", "//federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion:go_default_library", "//federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion:go_default_library", "//federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion:go_default_library", @@ -41,6 +39,7 @@ filegroup( srcs = [ ":package-srcs", "//federation/client/clientset_generated/federation_internalclientset/fake:all-srcs", + "//federation/client/clientset_generated/federation_internalclientset/scheme:all-srcs", "//federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion:all-srcs", "//federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion:all-srcs", "//federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion:all-srcs", diff --git a/federation/client/clientset_generated/federation_internalclientset/clientset.go b/federation/client/clientset_generated/federation_internalclientset/clientset.go index dd5511d78f66..fe45f3866482 100644 --- a/federation/client/clientset_generated/federation_internalclientset/clientset.go +++ b/federation/client/clientset_generated/federation_internalclientset/clientset.go @@ -17,43 +17,39 @@ limitations under the License. package federation_internalclientset import ( - "github.com/golang/glog" + glog "github.com/golang/glog" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" - "k8s.io/client-go/util/flowcontrol" - internalversionautoscaling "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion" - internalversionbatch "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion" - 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" + flowcontrol "k8s.io/client-go/util/flowcontrol" + autoscalinginternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion" + batchinternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion" + coreinternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion" + extensionsinternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion" + federationinternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion" ) type Interface interface { Discovery() discovery.DiscoveryInterface - Core() internalversioncore.CoreInterface - - Autoscaling() internalversionautoscaling.AutoscalingInterface - - Batch() internalversionbatch.BatchInterface - - Extensions() internalversionextensions.ExtensionsInterface - - Federation() internalversionfederation.FederationInterface + Core() coreinternalversion.CoreInterface + Autoscaling() autoscalinginternalversion.AutoscalingInterface + Batch() batchinternalversion.BatchInterface + Extensions() extensionsinternalversion.ExtensionsInterface + Federation() federationinternalversion.FederationInterface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *internalversioncore.CoreClient - *internalversionautoscaling.AutoscalingClient - *internalversionbatch.BatchClient - *internalversionextensions.ExtensionsClient - *internalversionfederation.FederationClient + *coreinternalversion.CoreClient + *autoscalinginternalversion.AutoscalingClient + *batchinternalversion.BatchClient + *extensionsinternalversion.ExtensionsClient + *federationinternalversion.FederationClient } // Core retrieves the CoreClient -func (c *Clientset) Core() internalversioncore.CoreInterface { +func (c *Clientset) Core() coreinternalversion.CoreInterface { if c == nil { return nil } @@ -61,7 +57,7 @@ func (c *Clientset) Core() internalversioncore.CoreInterface { } // Autoscaling retrieves the AutoscalingClient -func (c *Clientset) Autoscaling() internalversionautoscaling.AutoscalingInterface { +func (c *Clientset) Autoscaling() autoscalinginternalversion.AutoscalingInterface { if c == nil { return nil } @@ -69,7 +65,7 @@ func (c *Clientset) Autoscaling() internalversionautoscaling.AutoscalingInterfac } // Batch retrieves the BatchClient -func (c *Clientset) Batch() internalversionbatch.BatchInterface { +func (c *Clientset) Batch() batchinternalversion.BatchInterface { if c == nil { return nil } @@ -77,7 +73,7 @@ func (c *Clientset) Batch() internalversionbatch.BatchInterface { } // Extensions retrieves the ExtensionsClient -func (c *Clientset) Extensions() internalversionextensions.ExtensionsInterface { +func (c *Clientset) Extensions() extensionsinternalversion.ExtensionsInterface { if c == nil { return nil } @@ -85,7 +81,7 @@ func (c *Clientset) Extensions() internalversionextensions.ExtensionsInterface { } // Federation retrieves the FederationClient -func (c *Clientset) Federation() internalversionfederation.FederationInterface { +func (c *Clientset) Federation() federationinternalversion.FederationInterface { if c == nil { return nil } @@ -108,23 +104,23 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.CoreClient, err = internalversioncore.NewForConfig(&configShallowCopy) + cs.CoreClient, err = coreinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AutoscalingClient, err = internalversionautoscaling.NewForConfig(&configShallowCopy) + cs.AutoscalingClient, err = autoscalinginternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.BatchClient, err = internalversionbatch.NewForConfig(&configShallowCopy) + cs.BatchClient, err = batchinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.ExtensionsClient, err = internalversionextensions.NewForConfig(&configShallowCopy) + cs.ExtensionsClient, err = extensionsinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.FederationClient, err = internalversionfederation.NewForConfig(&configShallowCopy) + cs.FederationClient, err = federationinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -141,11 +137,11 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset - cs.CoreClient = internalversioncore.NewForConfigOrDie(c) - cs.AutoscalingClient = internalversionautoscaling.NewForConfigOrDie(c) - cs.BatchClient = internalversionbatch.NewForConfigOrDie(c) - cs.ExtensionsClient = internalversionextensions.NewForConfigOrDie(c) - cs.FederationClient = internalversionfederation.NewForConfigOrDie(c) + cs.CoreClient = coreinternalversion.NewForConfigOrDie(c) + cs.AutoscalingClient = autoscalinginternalversion.NewForConfigOrDie(c) + cs.BatchClient = batchinternalversion.NewForConfigOrDie(c) + cs.ExtensionsClient = extensionsinternalversion.NewForConfigOrDie(c) + cs.FederationClient = federationinternalversion.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -154,11 +150,11 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.CoreClient = internalversioncore.New(c) - cs.AutoscalingClient = internalversionautoscaling.New(c) - cs.BatchClient = internalversionbatch.New(c) - cs.ExtensionsClient = internalversionextensions.New(c) - cs.FederationClient = internalversionfederation.New(c) + cs.CoreClient = coreinternalversion.New(c) + cs.AutoscalingClient = autoscalinginternalversion.New(c) + cs.BatchClient = batchinternalversion.New(c) + cs.ExtensionsClient = extensionsinternalversion.New(c) + cs.FederationClient = federationinternalversion.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs 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 f3b19f0c1ea7..44d198b53353 100644 --- a/federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go +++ b/federation/client/clientset_generated/federation_internalclientset/fake/clientset_generated.go @@ -23,16 +23,16 @@ import ( fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset" - internalversionautoscaling "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion" - fakeinternalversionautoscaling "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake" - internalversionbatch "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion" - fakeinternalversionbatch "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/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" + autoscalinginternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion" + fakeautoscalinginternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/fake" + batchinternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion" + fakebatchinternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/fake" + coreinternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion" + fakecoreinternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/fake" + extensionsinternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion" + fakeextensionsinternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/fake" + federationinternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion" + fakefederationinternalversion "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/fake" "k8s.io/kubernetes/pkg/api" ) @@ -70,26 +70,26 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} // Core retrieves the CoreClient -func (c *Clientset) Core() internalversioncore.CoreInterface { - return &fakeinternalversioncore.FakeCore{Fake: &c.Fake} +func (c *Clientset) Core() coreinternalversion.CoreInterface { + return &fakecoreinternalversion.FakeCore{Fake: &c.Fake} } // Autoscaling retrieves the AutoscalingClient -func (c *Clientset) Autoscaling() internalversionautoscaling.AutoscalingInterface { - return &fakeinternalversionautoscaling.FakeAutoscaling{Fake: &c.Fake} +func (c *Clientset) Autoscaling() autoscalinginternalversion.AutoscalingInterface { + return &fakeautoscalinginternalversion.FakeAutoscaling{Fake: &c.Fake} } // Batch retrieves the BatchClient -func (c *Clientset) Batch() internalversionbatch.BatchInterface { - return &fakeinternalversionbatch.FakeBatch{Fake: &c.Fake} +func (c *Clientset) Batch() batchinternalversion.BatchInterface { + return &fakebatchinternalversion.FakeBatch{Fake: &c.Fake} } // Extensions retrieves the ExtensionsClient -func (c *Clientset) Extensions() internalversionextensions.ExtensionsInterface { - return &fakeinternalversionextensions.FakeExtensions{Fake: &c.Fake} +func (c *Clientset) Extensions() extensionsinternalversion.ExtensionsInterface { + return &fakeextensionsinternalversion.FakeExtensions{Fake: &c.Fake} } // Federation retrieves the FederationClient -func (c *Clientset) Federation() internalversionfederation.FederationInterface { - return &fakeinternalversionfederation.FakeFederation{Fake: &c.Fake} +func (c *Clientset) Federation() federationinternalversion.FederationInterface { + return &fakefederationinternalversion.FakeFederation{Fake: &c.Fake} } diff --git a/federation/client/clientset_generated/federation_internalclientset/scheme/BUILD b/federation/client/clientset_generated/federation_internalclientset/scheme/BUILD new file mode 100644 index 000000000000..dcedf08ee2fb --- /dev/null +++ b/federation/client/clientset_generated/federation_internalclientset/scheme/BUILD @@ -0,0 +1,43 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "doc.go", + "register.go", + ], + tags = ["automanaged"], + deps = [ + "//federation/apis/federation/install:go_default_library", + "//pkg/api/install:go_default_library", + "//pkg/apis/autoscaling/install:go_default_library", + "//pkg/apis/batch/install:go_default_library", + "//pkg/apis/extensions/install:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/federation/client/clientset_generated/federation_internalclientset/scheme/doc.go b/federation/client/clientset_generated/federation_internalclientset/scheme/doc.go new file mode 100644 index 000000000000..5d8ec824f0fb --- /dev/null +++ b/federation/client/clientset_generated/federation_internalclientset/scheme/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2017 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 custom arguments. + +// This package contains the scheme of the automatically generated clientset. +package scheme diff --git a/federation/client/clientset_generated/federation_internalclientset/scheme/register.go b/federation/client/clientset_generated/federation_internalclientset/scheme/register.go new file mode 100644 index 000000000000..45e19c5c28a1 --- /dev/null +++ b/federation/client/clientset_generated/federation_internalclientset/scheme/register.go @@ -0,0 +1,54 @@ +/* +Copyright 2017 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 scheme + +import ( + announced "k8s.io/apimachinery/pkg/apimachinery/announced" + registered "k8s.io/apimachinery/pkg/apimachinery/registered" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" + serializer "k8s.io/apimachinery/pkg/runtime/serializer" + federation "k8s.io/kubernetes/federation/apis/federation/install" + core "k8s.io/kubernetes/pkg/api/install" + autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/install" + batch "k8s.io/kubernetes/pkg/apis/batch/install" + extensions "k8s.io/kubernetes/pkg/apis/extensions/install" + os "os" +) + +var Scheme = runtime.NewScheme() +var Codecs = serializer.NewCodecFactory(Scheme) +var ParameterCodec = runtime.NewParameterCodec(Scheme) + +var Registry = registered.NewOrDie(os.Getenv("KUBE_API_VERSIONS")) +var GroupFactoryRegistry = make(announced.APIGroupFactoryRegistry) + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + Install(GroupFactoryRegistry, Registry, Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { + core.Install(groupFactoryRegistry, registry, scheme) + autoscaling.Install(groupFactoryRegistry, registry, scheme) + batch.Install(groupFactoryRegistry, registry, scheme) + extensions.Install(groupFactoryRegistry, registry, scheme) + federation.Install(groupFactoryRegistry, registry, scheme) + +} diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/BUILD index a4e32ff48978..f29ea8c1cbb8 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/BUILD @@ -17,7 +17,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/scheme:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/autoscaling_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/autoscaling_client.go index 325e11ba0209..0316c20c1cd8 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/autoscaling_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/autoscaling_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" ) type AutoscalingInterface interface { @@ -64,20 +64,20 @@ func New(c rest.Interface) *AutoscalingClient { } func setConfigDefaults(config *rest.Config) error { - // if autoscaling group is not registered, return an error - g, err := api.Registry.Group("autoscaling") + g, err := scheme.Registry.Group("autoscaling") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -85,6 +85,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go index e0b8b0b17f2f..5291f3d33f56 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" ) @@ -116,7 +116,7 @@ func (c *horizontalPodAutoscalers) DeleteCollection(options *v1.DeleteOptions, l return c.client.Delete(). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *horizontalPodAutoscalers) Get(name string, options v1.GetOptions) (resu Namespace(c.ns). Resource("horizontalpodautoscalers"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *horizontalPodAutoscalers) List(opts v1.ListOptions) (result *autoscalin err = c.client.Get(). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *horizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interface, Prefix("watch"). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/BUILD index c71f24eeed08..7d943ff7b1f7 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/BUILD @@ -17,7 +17,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/scheme:go_default_library", "//pkg/apis/batch:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/batch_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/batch_client.go index 613297f3c8ff..b24e1f6f823d 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/batch_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/batch_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" ) type BatchInterface interface { @@ -64,20 +64,20 @@ func New(c rest.Interface) *BatchClient { } func setConfigDefaults(config *rest.Config) error { - // if batch group is not registered, return an error - g, err := api.Registry.Group("batch") + g, err := scheme.Registry.Group("batch") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -85,6 +85,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/job.go b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/job.go index 2b0c4a7d233d..e33b82fa8267 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/job.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion/job.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" batch "k8s.io/kubernetes/pkg/apis/batch" ) @@ -116,7 +116,7 @@ func (c *jobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOp return c.client.Delete(). Namespace(c.ns). Resource("jobs"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *jobs) Get(name string, options v1.GetOptions) (result *batch.Job, err e Namespace(c.ns). Resource("jobs"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *jobs) List(opts v1.ListOptions) (result *batch.JobList, err error) { err = c.client.Get(). Namespace(c.ns). Resource("jobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *jobs) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("jobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD index 50951d4a44b3..cc5fc683a3e9 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/BUILD @@ -22,6 +22,7 @@ go_library( ], tags = ["automanaged"], deps = [ + "//federation/client/clientset_generated/federation_internalclientset/scheme:go_default_library", "//pkg/api:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go index cf9b31f0eb7a..aa986f5b8fbf 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/configmap.go @@ -21,6 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" api "k8s.io/kubernetes/pkg/api" ) @@ -98,7 +99,7 @@ func (c *configMaps) DeleteCollection(options *v1.DeleteOptions, listOptions v1. return c.client.Delete(). Namespace(c.ns). Resource("configmaps"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -111,7 +112,7 @@ func (c *configMaps) Get(name string, options v1.GetOptions) (result *api.Config Namespace(c.ns). Resource("configmaps"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -123,7 +124,7 @@ func (c *configMaps) List(opts v1.ListOptions) (result *api.ConfigMapList, err e err = c.client.Get(). Namespace(c.ns). Resource("configmaps"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -135,7 +136,7 @@ func (c *configMaps) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("configmaps"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go index ea41ad9d7c92..11fd2e26a8d9 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/core_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" ) type CoreInterface interface { @@ -84,20 +84,20 @@ func New(c rest.Interface) *CoreClient { } func setConfigDefaults(config *rest.Config) error { - // if core group is not registered, return an error - g, err := api.Registry.Group("") + g, err := scheme.Registry.Group("") if err != nil { return err } + config.APIPath = "/api" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -105,6 +105,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go index 1159ca37b2bc..29600534c11f 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/event.go @@ -21,6 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" api "k8s.io/kubernetes/pkg/api" ) @@ -98,7 +99,7 @@ func (c *events) DeleteCollection(options *v1.DeleteOptions, listOptions v1.List return c.client.Delete(). Namespace(c.ns). Resource("events"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -111,7 +112,7 @@ func (c *events) Get(name string, options v1.GetOptions) (result *api.Event, err Namespace(c.ns). Resource("events"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -123,7 +124,7 @@ func (c *events) List(opts v1.ListOptions) (result *api.EventList, err error) { err = c.client.Get(). Namespace(c.ns). Resource("events"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -135,7 +136,7 @@ func (c *events) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("events"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go index fbcdd1407639..8203d06c8e5e 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/namespace.go @@ -21,6 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" api "k8s.io/kubernetes/pkg/api" ) @@ -108,7 +109,7 @@ func (c *namespaces) Delete(name string, options *v1.DeleteOptions) error { func (c *namespaces) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("namespaces"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -120,7 +121,7 @@ func (c *namespaces) Get(name string, options v1.GetOptions) (result *api.Namesp err = c.client.Get(). Resource("namespaces"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -131,7 +132,7 @@ func (c *namespaces) List(opts v1.ListOptions) (result *api.NamespaceList, err e result = &api.NamespaceList{} err = c.client.Get(). Resource("namespaces"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -142,7 +143,7 @@ func (c *namespaces) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("namespaces"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go index d91f0d9d6b4e..80ddce717b04 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/secret.go @@ -21,6 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" api "k8s.io/kubernetes/pkg/api" ) @@ -98,7 +99,7 @@ func (c *secrets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.Lis return c.client.Delete(). Namespace(c.ns). Resource("secrets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -111,7 +112,7 @@ func (c *secrets) Get(name string, options v1.GetOptions) (result *api.Secret, e Namespace(c.ns). Resource("secrets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -123,7 +124,7 @@ func (c *secrets) List(opts v1.ListOptions) (result *api.SecretList, err error) err = c.client.Get(). Namespace(c.ns). Resource("secrets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -135,7 +136,7 @@ func (c *secrets) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("secrets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go index abb74194196f..73af4cbbd5a9 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion/service.go @@ -21,6 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" api "k8s.io/kubernetes/pkg/api" ) @@ -115,7 +116,7 @@ func (c *services) DeleteCollection(options *v1.DeleteOptions, listOptions v1.Li return c.client.Delete(). Namespace(c.ns). Resource("services"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -128,7 +129,7 @@ func (c *services) Get(name string, options v1.GetOptions) (result *api.Service, Namespace(c.ns). Resource("services"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -140,7 +141,7 @@ func (c *services) List(opts v1.ListOptions) (result *api.ServiceList, err error err = c.client.Get(). Namespace(c.ns). Resource("services"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -152,7 +153,7 @@ func (c *services) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("services"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD index bf69571a1083..e4b2f41e2f8a 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/BUILD @@ -20,7 +20,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/scheme:go_default_library", "//pkg/apis/extensions:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go index e172f810bfc3..51e77a482f5a 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/daemonset.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" extensions "k8s.io/kubernetes/pkg/apis/extensions" ) @@ -116,7 +116,7 @@ func (c *daemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1. return c.client.Delete(). Namespace(c.ns). Resource("daemonsets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *daemonSets) Get(name string, options v1.GetOptions) (result *extensions Namespace(c.ns). Resource("daemonsets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *daemonSets) List(opts v1.ListOptions) (result *extensions.DaemonSetList err = c.client.Get(). Namespace(c.ns). Resource("daemonsets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *daemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("daemonsets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go index cb525a953c82..8fe0d190fe96 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/deployment.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" extensions "k8s.io/kubernetes/pkg/apis/extensions" ) @@ -116,7 +116,7 @@ func (c *deployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1 return c.client.Delete(). Namespace(c.ns). Resource("deployments"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *deployments) Get(name string, options v1.GetOptions) (result *extension Namespace(c.ns). Resource("deployments"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *deployments) List(opts v1.ListOptions) (result *extensions.DeploymentLi err = c.client.Get(). Namespace(c.ns). Resource("deployments"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *deployments) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("deployments"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go index 9f37c172c82d..b2be0682a1bd 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/extensions_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" ) type ExtensionsInterface interface { @@ -79,20 +79,20 @@ func New(c rest.Interface) *ExtensionsClient { } func setConfigDefaults(config *rest.Config) error { - // if extensions group is not registered, return an error - g, err := api.Registry.Group("extensions") + g, err := scheme.Registry.Group("extensions") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -100,6 +100,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go index e1db937b03a2..26e79034cd04 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/ingress.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" extensions "k8s.io/kubernetes/pkg/apis/extensions" ) @@ -116,7 +116,7 @@ func (c *ingresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.L return c.client.Delete(). Namespace(c.ns). Resource("ingresses"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *ingresses) Get(name string, options v1.GetOptions) (result *extensions. Namespace(c.ns). Resource("ingresses"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *ingresses) List(opts v1.ListOptions) (result *extensions.IngressList, e err = c.client.Get(). Namespace(c.ns). Resource("ingresses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *ingresses) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("ingresses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go index 35ad547e0c47..8298c5476d67 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion/replicaset.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" extensions "k8s.io/kubernetes/pkg/apis/extensions" ) @@ -116,7 +116,7 @@ func (c *replicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1 return c.client.Delete(). Namespace(c.ns). Resource("replicasets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *replicaSets) Get(name string, options v1.GetOptions) (result *extension Namespace(c.ns). Resource("replicasets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *replicaSets) List(opts v1.ListOptions) (result *extensions.ReplicaSetLi err = c.client.Get(). Namespace(c.ns). Resource("replicasets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *replicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("replicasets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD index 2a4c6bcad47b..74fa60f26b9f 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/BUILD @@ -18,7 +18,7 @@ go_library( tags = ["automanaged"], deps = [ "//federation/apis/federation:go_default_library", - "//pkg/api:go_default_library", + "//federation/client/clientset_generated/federation_internalclientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go index 7355ae26b4f8..4d319f1e6f35 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/cluster.go @@ -22,7 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" federation "k8s.io/kubernetes/federation/apis/federation" - api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" ) // ClustersGetter has a method to return a ClusterInterface. @@ -109,7 +109,7 @@ func (c *clusters) Delete(name string, options *v1.DeleteOptions) error { func (c *clusters) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("clusters"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -121,7 +121,7 @@ func (c *clusters) Get(name string, options v1.GetOptions) (result *federation.C err = c.client.Get(). Resource("clusters"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -132,7 +132,7 @@ func (c *clusters) List(opts v1.ListOptions) (result *federation.ClusterList, er result = &federation.ClusterList{} err = c.client.Get(). Resource("clusters"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -143,7 +143,7 @@ func (c *clusters) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("clusters"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go index e9108f0f7fed..fa23649cef4f 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion/federation_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/scheme" ) type FederationInterface interface { @@ -64,20 +64,20 @@ func New(c rest.Interface) *FederationClient { } func setConfigDefaults(config *rest.Config) error { - // if federation group is not registered, return an error - g, err := api.Registry.Group("federation") + g, err := scheme.Registry.Group("federation") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -85,6 +85,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/pkg/client/clientset_generated/clientset/BUILD b/pkg/client/clientset_generated/clientset/BUILD index 4fe7dbb77cf9..9c7145e514bc 100644 --- a/pkg/client/clientset_generated/clientset/BUILD +++ b/pkg/client/clientset_generated/clientset/BUILD @@ -63,6 +63,7 @@ filegroup( srcs = [ ":package-srcs", "//pkg/client/clientset_generated/clientset/fake:all-srcs", + "//pkg/client/clientset_generated/clientset/scheme:all-srcs", "//pkg/client/clientset_generated/clientset/typed/apps/v1beta1:all-srcs", "//pkg/client/clientset_generated/clientset/typed/authentication/v1:all-srcs", "//pkg/client/clientset_generated/clientset/typed/authentication/v1beta1:all-srcs", diff --git a/pkg/client/clientset_generated/clientset/clientset.go b/pkg/client/clientset_generated/clientset/clientset.go index a099377de710..f6644a0cd630 100644 --- a/pkg/client/clientset_generated/clientset/clientset.go +++ b/pkg/client/clientset_generated/clientset/clientset.go @@ -17,99 +17,94 @@ limitations under the License. package clientset import ( - "github.com/golang/glog" + glog "github.com/golang/glog" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" - "k8s.io/client-go/util/flowcontrol" - v1beta1apps "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/apps/v1beta1" - v1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1" - v1beta1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" - v1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1" - v1beta1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1" - v1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v1" - v2alpha1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1" - v1batch "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v1" - v2alpha1batch "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1" - v1beta1certificates "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1" - v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" - v1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" - v1beta1policy "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/policy/v1beta1" - v1alpha1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1" - v1beta1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1" - v1beta1storage "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1" + flowcontrol "k8s.io/client-go/util/flowcontrol" + appsv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/apps/v1beta1" + authenticationv1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1" + authenticationv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" + authorizationv1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1" + authorizationv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1" + autoscalingv1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v1" + autoscalingv2alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1" + batchv1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v1" + batchv2alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1" + certificatesv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1" + corev1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" + extensionsv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" + policyv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/policy/v1beta1" + rbacv1alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1" + rbacv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1" + storagev1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1" ) type Interface interface { Discovery() discovery.DiscoveryInterface - CoreV1() v1core.CoreV1Interface + CoreV1() corev1.CoreV1Interface // Deprecated: please explicitly pick a version if possible. - Core() v1core.CoreV1Interface - AppsV1beta1() v1beta1apps.AppsV1beta1Interface + Core() corev1.CoreV1Interface + AppsV1beta1() appsv1beta1.AppsV1beta1Interface // Deprecated: please explicitly pick a version if possible. - Apps() v1beta1apps.AppsV1beta1Interface - AuthenticationV1() v1authentication.AuthenticationV1Interface + Apps() appsv1beta1.AppsV1beta1Interface + AuthenticationV1() authenticationv1.AuthenticationV1Interface // Deprecated: please explicitly pick a version if possible. - Authentication() v1authentication.AuthenticationV1Interface - AuthenticationV1beta1() v1beta1authentication.AuthenticationV1beta1Interface - - AuthorizationV1() v1authorization.AuthorizationV1Interface + Authentication() authenticationv1.AuthenticationV1Interface + AuthenticationV1beta1() authenticationv1beta1.AuthenticationV1beta1Interface + AuthorizationV1() authorizationv1.AuthorizationV1Interface // Deprecated: please explicitly pick a version if possible. - Authorization() v1authorization.AuthorizationV1Interface - AuthorizationV1beta1() v1beta1authorization.AuthorizationV1beta1Interface - - AutoscalingV1() v1autoscaling.AutoscalingV1Interface + Authorization() authorizationv1.AuthorizationV1Interface + AuthorizationV1beta1() authorizationv1beta1.AuthorizationV1beta1Interface + AutoscalingV1() autoscalingv1.AutoscalingV1Interface // Deprecated: please explicitly pick a version if possible. - Autoscaling() v1autoscaling.AutoscalingV1Interface - AutoscalingV2alpha1() v2alpha1autoscaling.AutoscalingV2alpha1Interface - - BatchV1() v1batch.BatchV1Interface + Autoscaling() autoscalingv1.AutoscalingV1Interface + AutoscalingV2alpha1() autoscalingv2alpha1.AutoscalingV2alpha1Interface + BatchV1() batchv1.BatchV1Interface // Deprecated: please explicitly pick a version if possible. - Batch() v1batch.BatchV1Interface - BatchV2alpha1() v2alpha1batch.BatchV2alpha1Interface - - CertificatesV1beta1() v1beta1certificates.CertificatesV1beta1Interface + Batch() batchv1.BatchV1Interface + BatchV2alpha1() batchv2alpha1.BatchV2alpha1Interface + CertificatesV1beta1() certificatesv1beta1.CertificatesV1beta1Interface // Deprecated: please explicitly pick a version if possible. - Certificates() v1beta1certificates.CertificatesV1beta1Interface - ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Interface + Certificates() certificatesv1beta1.CertificatesV1beta1Interface + ExtensionsV1beta1() extensionsv1beta1.ExtensionsV1beta1Interface // Deprecated: please explicitly pick a version if possible. - Extensions() v1beta1extensions.ExtensionsV1beta1Interface - PolicyV1beta1() v1beta1policy.PolicyV1beta1Interface + Extensions() extensionsv1beta1.ExtensionsV1beta1Interface + PolicyV1beta1() policyv1beta1.PolicyV1beta1Interface // Deprecated: please explicitly pick a version if possible. - Policy() v1beta1policy.PolicyV1beta1Interface - RbacV1beta1() v1beta1rbac.RbacV1beta1Interface + Policy() policyv1beta1.PolicyV1beta1Interface + RbacV1beta1() rbacv1beta1.RbacV1beta1Interface // Deprecated: please explicitly pick a version if possible. - Rbac() v1beta1rbac.RbacV1beta1Interface - RbacV1alpha1() v1alpha1rbac.RbacV1alpha1Interface - - StorageV1beta1() v1beta1storage.StorageV1beta1Interface + Rbac() rbacv1beta1.RbacV1beta1Interface + RbacV1alpha1() rbacv1alpha1.RbacV1alpha1Interface + StorageV1beta1() storagev1beta1.StorageV1beta1Interface // Deprecated: please explicitly pick a version if possible. - Storage() v1beta1storage.StorageV1beta1Interface + Storage() storagev1beta1.StorageV1beta1Interface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *v1core.CoreV1Client - *v1beta1apps.AppsV1beta1Client - *v1authentication.AuthenticationV1Client - *v1beta1authentication.AuthenticationV1beta1Client - *v1authorization.AuthorizationV1Client - *v1beta1authorization.AuthorizationV1beta1Client - *v1autoscaling.AutoscalingV1Client - *v2alpha1autoscaling.AutoscalingV2alpha1Client - *v1batch.BatchV1Client - *v2alpha1batch.BatchV2alpha1Client - *v1beta1certificates.CertificatesV1beta1Client - *v1beta1extensions.ExtensionsV1beta1Client - *v1beta1policy.PolicyV1beta1Client - *v1beta1rbac.RbacV1beta1Client - *v1alpha1rbac.RbacV1alpha1Client - *v1beta1storage.StorageV1beta1Client + *corev1.CoreV1Client + *appsv1beta1.AppsV1beta1Client + *authenticationv1.AuthenticationV1Client + *authenticationv1beta1.AuthenticationV1beta1Client + *authorizationv1.AuthorizationV1Client + *authorizationv1beta1.AuthorizationV1beta1Client + *autoscalingv1.AutoscalingV1Client + *autoscalingv2alpha1.AutoscalingV2alpha1Client + *batchv1.BatchV1Client + *batchv2alpha1.BatchV2alpha1Client + *certificatesv1beta1.CertificatesV1beta1Client + *extensionsv1beta1.ExtensionsV1beta1Client + *policyv1beta1.PolicyV1beta1Client + *rbacv1beta1.RbacV1beta1Client + *rbacv1alpha1.RbacV1alpha1Client + *storagev1beta1.StorageV1beta1Client } // CoreV1 retrieves the CoreV1Client -func (c *Clientset) CoreV1() v1core.CoreV1Interface { +func (c *Clientset) CoreV1() corev1.CoreV1Interface { if c == nil { return nil } @@ -118,7 +113,7 @@ func (c *Clientset) CoreV1() v1core.CoreV1Interface { // Deprecated: Core retrieves the default version of CoreClient. // Please explicitly pick a version. -func (c *Clientset) Core() v1core.CoreV1Interface { +func (c *Clientset) Core() corev1.CoreV1Interface { if c == nil { return nil } @@ -126,7 +121,7 @@ func (c *Clientset) Core() v1core.CoreV1Interface { } // AppsV1beta1 retrieves the AppsV1beta1Client -func (c *Clientset) AppsV1beta1() v1beta1apps.AppsV1beta1Interface { +func (c *Clientset) AppsV1beta1() appsv1beta1.AppsV1beta1Interface { if c == nil { return nil } @@ -135,7 +130,7 @@ func (c *Clientset) AppsV1beta1() v1beta1apps.AppsV1beta1Interface { // Deprecated: Apps retrieves the default version of AppsClient. // Please explicitly pick a version. -func (c *Clientset) Apps() v1beta1apps.AppsV1beta1Interface { +func (c *Clientset) Apps() appsv1beta1.AppsV1beta1Interface { if c == nil { return nil } @@ -143,7 +138,7 @@ func (c *Clientset) Apps() v1beta1apps.AppsV1beta1Interface { } // AuthenticationV1 retrieves the AuthenticationV1Client -func (c *Clientset) AuthenticationV1() v1authentication.AuthenticationV1Interface { +func (c *Clientset) AuthenticationV1() authenticationv1.AuthenticationV1Interface { if c == nil { return nil } @@ -152,7 +147,7 @@ func (c *Clientset) AuthenticationV1() v1authentication.AuthenticationV1Interfac // Deprecated: Authentication retrieves the default version of AuthenticationClient. // Please explicitly pick a version. -func (c *Clientset) Authentication() v1authentication.AuthenticationV1Interface { +func (c *Clientset) Authentication() authenticationv1.AuthenticationV1Interface { if c == nil { return nil } @@ -160,7 +155,7 @@ func (c *Clientset) Authentication() v1authentication.AuthenticationV1Interface } // AuthenticationV1beta1 retrieves the AuthenticationV1beta1Client -func (c *Clientset) AuthenticationV1beta1() v1beta1authentication.AuthenticationV1beta1Interface { +func (c *Clientset) AuthenticationV1beta1() authenticationv1beta1.AuthenticationV1beta1Interface { if c == nil { return nil } @@ -168,7 +163,7 @@ func (c *Clientset) AuthenticationV1beta1() v1beta1authentication.Authentication } // AuthorizationV1 retrieves the AuthorizationV1Client -func (c *Clientset) AuthorizationV1() v1authorization.AuthorizationV1Interface { +func (c *Clientset) AuthorizationV1() authorizationv1.AuthorizationV1Interface { if c == nil { return nil } @@ -177,7 +172,7 @@ func (c *Clientset) AuthorizationV1() v1authorization.AuthorizationV1Interface { // Deprecated: Authorization retrieves the default version of AuthorizationClient. // Please explicitly pick a version. -func (c *Clientset) Authorization() v1authorization.AuthorizationV1Interface { +func (c *Clientset) Authorization() authorizationv1.AuthorizationV1Interface { if c == nil { return nil } @@ -185,7 +180,7 @@ func (c *Clientset) Authorization() v1authorization.AuthorizationV1Interface { } // AuthorizationV1beta1 retrieves the AuthorizationV1beta1Client -func (c *Clientset) AuthorizationV1beta1() v1beta1authorization.AuthorizationV1beta1Interface { +func (c *Clientset) AuthorizationV1beta1() authorizationv1beta1.AuthorizationV1beta1Interface { if c == nil { return nil } @@ -193,7 +188,7 @@ func (c *Clientset) AuthorizationV1beta1() v1beta1authorization.AuthorizationV1b } // AutoscalingV1 retrieves the AutoscalingV1Client -func (c *Clientset) AutoscalingV1() v1autoscaling.AutoscalingV1Interface { +func (c *Clientset) AutoscalingV1() autoscalingv1.AutoscalingV1Interface { if c == nil { return nil } @@ -202,7 +197,7 @@ func (c *Clientset) AutoscalingV1() v1autoscaling.AutoscalingV1Interface { // Deprecated: Autoscaling retrieves the default version of AutoscalingClient. // Please explicitly pick a version. -func (c *Clientset) Autoscaling() v1autoscaling.AutoscalingV1Interface { +func (c *Clientset) Autoscaling() autoscalingv1.AutoscalingV1Interface { if c == nil { return nil } @@ -210,7 +205,7 @@ func (c *Clientset) Autoscaling() v1autoscaling.AutoscalingV1Interface { } // AutoscalingV2alpha1 retrieves the AutoscalingV2alpha1Client -func (c *Clientset) AutoscalingV2alpha1() v2alpha1autoscaling.AutoscalingV2alpha1Interface { +func (c *Clientset) AutoscalingV2alpha1() autoscalingv2alpha1.AutoscalingV2alpha1Interface { if c == nil { return nil } @@ -218,7 +213,7 @@ func (c *Clientset) AutoscalingV2alpha1() v2alpha1autoscaling.AutoscalingV2alpha } // BatchV1 retrieves the BatchV1Client -func (c *Clientset) BatchV1() v1batch.BatchV1Interface { +func (c *Clientset) BatchV1() batchv1.BatchV1Interface { if c == nil { return nil } @@ -227,7 +222,7 @@ func (c *Clientset) BatchV1() v1batch.BatchV1Interface { // Deprecated: Batch retrieves the default version of BatchClient. // Please explicitly pick a version. -func (c *Clientset) Batch() v1batch.BatchV1Interface { +func (c *Clientset) Batch() batchv1.BatchV1Interface { if c == nil { return nil } @@ -235,7 +230,7 @@ func (c *Clientset) Batch() v1batch.BatchV1Interface { } // BatchV2alpha1 retrieves the BatchV2alpha1Client -func (c *Clientset) BatchV2alpha1() v2alpha1batch.BatchV2alpha1Interface { +func (c *Clientset) BatchV2alpha1() batchv2alpha1.BatchV2alpha1Interface { if c == nil { return nil } @@ -243,7 +238,7 @@ func (c *Clientset) BatchV2alpha1() v2alpha1batch.BatchV2alpha1Interface { } // CertificatesV1beta1 retrieves the CertificatesV1beta1Client -func (c *Clientset) CertificatesV1beta1() v1beta1certificates.CertificatesV1beta1Interface { +func (c *Clientset) CertificatesV1beta1() certificatesv1beta1.CertificatesV1beta1Interface { if c == nil { return nil } @@ -252,7 +247,7 @@ func (c *Clientset) CertificatesV1beta1() v1beta1certificates.CertificatesV1beta // Deprecated: Certificates retrieves the default version of CertificatesClient. // Please explicitly pick a version. -func (c *Clientset) Certificates() v1beta1certificates.CertificatesV1beta1Interface { +func (c *Clientset) Certificates() certificatesv1beta1.CertificatesV1beta1Interface { if c == nil { return nil } @@ -260,7 +255,7 @@ func (c *Clientset) Certificates() v1beta1certificates.CertificatesV1beta1Interf } // ExtensionsV1beta1 retrieves the ExtensionsV1beta1Client -func (c *Clientset) ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Interface { +func (c *Clientset) ExtensionsV1beta1() extensionsv1beta1.ExtensionsV1beta1Interface { if c == nil { return nil } @@ -269,7 +264,7 @@ func (c *Clientset) ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Inter // Deprecated: Extensions retrieves the default version of ExtensionsClient. // Please explicitly pick a version. -func (c *Clientset) Extensions() v1beta1extensions.ExtensionsV1beta1Interface { +func (c *Clientset) Extensions() extensionsv1beta1.ExtensionsV1beta1Interface { if c == nil { return nil } @@ -277,7 +272,7 @@ func (c *Clientset) Extensions() v1beta1extensions.ExtensionsV1beta1Interface { } // PolicyV1beta1 retrieves the PolicyV1beta1Client -func (c *Clientset) PolicyV1beta1() v1beta1policy.PolicyV1beta1Interface { +func (c *Clientset) PolicyV1beta1() policyv1beta1.PolicyV1beta1Interface { if c == nil { return nil } @@ -286,7 +281,7 @@ func (c *Clientset) PolicyV1beta1() v1beta1policy.PolicyV1beta1Interface { // Deprecated: Policy retrieves the default version of PolicyClient. // Please explicitly pick a version. -func (c *Clientset) Policy() v1beta1policy.PolicyV1beta1Interface { +func (c *Clientset) Policy() policyv1beta1.PolicyV1beta1Interface { if c == nil { return nil } @@ -294,7 +289,7 @@ func (c *Clientset) Policy() v1beta1policy.PolicyV1beta1Interface { } // RbacV1beta1 retrieves the RbacV1beta1Client -func (c *Clientset) RbacV1beta1() v1beta1rbac.RbacV1beta1Interface { +func (c *Clientset) RbacV1beta1() rbacv1beta1.RbacV1beta1Interface { if c == nil { return nil } @@ -303,7 +298,7 @@ func (c *Clientset) RbacV1beta1() v1beta1rbac.RbacV1beta1Interface { // Deprecated: Rbac retrieves the default version of RbacClient. // Please explicitly pick a version. -func (c *Clientset) Rbac() v1beta1rbac.RbacV1beta1Interface { +func (c *Clientset) Rbac() rbacv1beta1.RbacV1beta1Interface { if c == nil { return nil } @@ -311,7 +306,7 @@ func (c *Clientset) Rbac() v1beta1rbac.RbacV1beta1Interface { } // RbacV1alpha1 retrieves the RbacV1alpha1Client -func (c *Clientset) RbacV1alpha1() v1alpha1rbac.RbacV1alpha1Interface { +func (c *Clientset) RbacV1alpha1() rbacv1alpha1.RbacV1alpha1Interface { if c == nil { return nil } @@ -319,7 +314,7 @@ func (c *Clientset) RbacV1alpha1() v1alpha1rbac.RbacV1alpha1Interface { } // StorageV1beta1 retrieves the StorageV1beta1Client -func (c *Clientset) StorageV1beta1() v1beta1storage.StorageV1beta1Interface { +func (c *Clientset) StorageV1beta1() storagev1beta1.StorageV1beta1Interface { if c == nil { return nil } @@ -328,7 +323,7 @@ func (c *Clientset) StorageV1beta1() v1beta1storage.StorageV1beta1Interface { // Deprecated: Storage retrieves the default version of StorageClient. // Please explicitly pick a version. -func (c *Clientset) Storage() v1beta1storage.StorageV1beta1Interface { +func (c *Clientset) Storage() storagev1beta1.StorageV1beta1Interface { if c == nil { return nil } @@ -351,67 +346,67 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.CoreV1Client, err = v1core.NewForConfig(&configShallowCopy) + cs.CoreV1Client, err = corev1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AppsV1beta1Client, err = v1beta1apps.NewForConfig(&configShallowCopy) + cs.AppsV1beta1Client, err = appsv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AuthenticationV1Client, err = v1authentication.NewForConfig(&configShallowCopy) + cs.AuthenticationV1Client, err = authenticationv1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AuthenticationV1beta1Client, err = v1beta1authentication.NewForConfig(&configShallowCopy) + cs.AuthenticationV1beta1Client, err = authenticationv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AuthorizationV1Client, err = v1authorization.NewForConfig(&configShallowCopy) + cs.AuthorizationV1Client, err = authorizationv1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AuthorizationV1beta1Client, err = v1beta1authorization.NewForConfig(&configShallowCopy) + cs.AuthorizationV1beta1Client, err = authorizationv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AutoscalingV1Client, err = v1autoscaling.NewForConfig(&configShallowCopy) + cs.AutoscalingV1Client, err = autoscalingv1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AutoscalingV2alpha1Client, err = v2alpha1autoscaling.NewForConfig(&configShallowCopy) + cs.AutoscalingV2alpha1Client, err = autoscalingv2alpha1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.BatchV1Client, err = v1batch.NewForConfig(&configShallowCopy) + cs.BatchV1Client, err = batchv1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.BatchV2alpha1Client, err = v2alpha1batch.NewForConfig(&configShallowCopy) + cs.BatchV2alpha1Client, err = batchv2alpha1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.CertificatesV1beta1Client, err = v1beta1certificates.NewForConfig(&configShallowCopy) + cs.CertificatesV1beta1Client, err = certificatesv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.ExtensionsV1beta1Client, err = v1beta1extensions.NewForConfig(&configShallowCopy) + cs.ExtensionsV1beta1Client, err = extensionsv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.PolicyV1beta1Client, err = v1beta1policy.NewForConfig(&configShallowCopy) + cs.PolicyV1beta1Client, err = policyv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.RbacV1beta1Client, err = v1beta1rbac.NewForConfig(&configShallowCopy) + cs.RbacV1beta1Client, err = rbacv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.RbacV1alpha1Client, err = v1alpha1rbac.NewForConfig(&configShallowCopy) + cs.RbacV1alpha1Client, err = rbacv1alpha1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.StorageV1beta1Client, err = v1beta1storage.NewForConfig(&configShallowCopy) + cs.StorageV1beta1Client, err = storagev1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -428,22 +423,22 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset - cs.CoreV1Client = v1core.NewForConfigOrDie(c) - cs.AppsV1beta1Client = v1beta1apps.NewForConfigOrDie(c) - cs.AuthenticationV1Client = v1authentication.NewForConfigOrDie(c) - cs.AuthenticationV1beta1Client = v1beta1authentication.NewForConfigOrDie(c) - cs.AuthorizationV1Client = v1authorization.NewForConfigOrDie(c) - cs.AuthorizationV1beta1Client = v1beta1authorization.NewForConfigOrDie(c) - cs.AutoscalingV1Client = v1autoscaling.NewForConfigOrDie(c) - cs.AutoscalingV2alpha1Client = v2alpha1autoscaling.NewForConfigOrDie(c) - cs.BatchV1Client = v1batch.NewForConfigOrDie(c) - cs.BatchV2alpha1Client = v2alpha1batch.NewForConfigOrDie(c) - cs.CertificatesV1beta1Client = v1beta1certificates.NewForConfigOrDie(c) - cs.ExtensionsV1beta1Client = v1beta1extensions.NewForConfigOrDie(c) - cs.PolicyV1beta1Client = v1beta1policy.NewForConfigOrDie(c) - cs.RbacV1beta1Client = v1beta1rbac.NewForConfigOrDie(c) - cs.RbacV1alpha1Client = v1alpha1rbac.NewForConfigOrDie(c) - cs.StorageV1beta1Client = v1beta1storage.NewForConfigOrDie(c) + cs.CoreV1Client = corev1.NewForConfigOrDie(c) + cs.AppsV1beta1Client = appsv1beta1.NewForConfigOrDie(c) + cs.AuthenticationV1Client = authenticationv1.NewForConfigOrDie(c) + cs.AuthenticationV1beta1Client = authenticationv1beta1.NewForConfigOrDie(c) + cs.AuthorizationV1Client = authorizationv1.NewForConfigOrDie(c) + cs.AuthorizationV1beta1Client = authorizationv1beta1.NewForConfigOrDie(c) + cs.AutoscalingV1Client = autoscalingv1.NewForConfigOrDie(c) + cs.AutoscalingV2alpha1Client = autoscalingv2alpha1.NewForConfigOrDie(c) + cs.BatchV1Client = batchv1.NewForConfigOrDie(c) + cs.BatchV2alpha1Client = batchv2alpha1.NewForConfigOrDie(c) + cs.CertificatesV1beta1Client = certificatesv1beta1.NewForConfigOrDie(c) + cs.ExtensionsV1beta1Client = extensionsv1beta1.NewForConfigOrDie(c) + cs.PolicyV1beta1Client = policyv1beta1.NewForConfigOrDie(c) + cs.RbacV1beta1Client = rbacv1beta1.NewForConfigOrDie(c) + cs.RbacV1alpha1Client = rbacv1alpha1.NewForConfigOrDie(c) + cs.StorageV1beta1Client = storagev1beta1.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -452,22 +447,22 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.CoreV1Client = v1core.New(c) - cs.AppsV1beta1Client = v1beta1apps.New(c) - cs.AuthenticationV1Client = v1authentication.New(c) - cs.AuthenticationV1beta1Client = v1beta1authentication.New(c) - cs.AuthorizationV1Client = v1authorization.New(c) - cs.AuthorizationV1beta1Client = v1beta1authorization.New(c) - cs.AutoscalingV1Client = v1autoscaling.New(c) - cs.AutoscalingV2alpha1Client = v2alpha1autoscaling.New(c) - cs.BatchV1Client = v1batch.New(c) - cs.BatchV2alpha1Client = v2alpha1batch.New(c) - cs.CertificatesV1beta1Client = v1beta1certificates.New(c) - cs.ExtensionsV1beta1Client = v1beta1extensions.New(c) - cs.PolicyV1beta1Client = v1beta1policy.New(c) - cs.RbacV1beta1Client = v1beta1rbac.New(c) - cs.RbacV1alpha1Client = v1alpha1rbac.New(c) - cs.StorageV1beta1Client = v1beta1storage.New(c) + cs.CoreV1Client = corev1.New(c) + cs.AppsV1beta1Client = appsv1beta1.New(c) + cs.AuthenticationV1Client = authenticationv1.New(c) + cs.AuthenticationV1beta1Client = authenticationv1beta1.New(c) + cs.AuthorizationV1Client = authorizationv1.New(c) + cs.AuthorizationV1beta1Client = authorizationv1beta1.New(c) + cs.AutoscalingV1Client = autoscalingv1.New(c) + cs.AutoscalingV2alpha1Client = autoscalingv2alpha1.New(c) + cs.BatchV1Client = batchv1.New(c) + cs.BatchV2alpha1Client = batchv2alpha1.New(c) + cs.CertificatesV1beta1Client = certificatesv1beta1.New(c) + cs.ExtensionsV1beta1Client = extensionsv1beta1.New(c) + cs.PolicyV1beta1Client = policyv1beta1.New(c) + cs.RbacV1beta1Client = rbacv1beta1.New(c) + cs.RbacV1alpha1Client = rbacv1alpha1.New(c) + cs.StorageV1beta1Client = storagev1beta1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/pkg/client/clientset_generated/clientset/fake/clientset_generated.go b/pkg/client/clientset_generated/clientset/fake/clientset_generated.go index 0127d375d10f..6642b0186ddf 100644 --- a/pkg/client/clientset_generated/clientset/fake/clientset_generated.go +++ b/pkg/client/clientset_generated/clientset/fake/clientset_generated.go @@ -24,38 +24,38 @@ import ( "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - v1beta1apps "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/apps/v1beta1" - fakev1beta1apps "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake" - v1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1" - fakev1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1/fake" - v1beta1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" - fakev1beta1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake" - v1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1" - fakev1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake" - v1beta1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1" - fakev1beta1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake" - v1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v1" - fakev1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake" - v2alpha1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1" - fakev2alpha1autoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/fake" - v1batch "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v1" - fakev1batch "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v1/fake" - v2alpha1batch "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1" - fakev2alpha1batch "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake" - v1beta1certificates "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1" - fakev1beta1certificates "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake" - v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" - fakev1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1/fake" - v1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" - fakev1beta1extensions "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake" - v1beta1policy "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/policy/v1beta1" - fakev1beta1policy "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake" - v1alpha1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1" - fakev1alpha1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake" - v1beta1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1" - fakev1beta1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake" - v1beta1storage "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1" - fakev1beta1storage "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake" + appsv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/apps/v1beta1" + fakeappsv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake" + authenticationv1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1" + fakeauthenticationv1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1/fake" + authenticationv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1" + fakeauthenticationv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake" + authorizationv1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1" + fakeauthorizationv1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake" + authorizationv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1" + fakeauthorizationv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake" + autoscalingv1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v1" + fakeautoscalingv1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake" + autoscalingv2alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1" + fakeautoscalingv2alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/fake" + batchv1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v1" + fakebatchv1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v1/fake" + batchv2alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1" + fakebatchv2alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake" + certificatesv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1" + fakecertificatesv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake" + corev1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" + fakecorev1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1/fake" + extensionsv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" + fakeextensionsv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake" + policyv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/policy/v1beta1" + fakepolicyv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake" + rbacv1alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1" + fakerbacv1alpha1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake" + rbacv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1" + fakerbacv1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake" + storagev1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1" + fakestoragev1beta1 "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. @@ -92,136 +92,136 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} // CoreV1 retrieves the CoreV1Client -func (c *Clientset) CoreV1() v1core.CoreV1Interface { - return &fakev1core.FakeCoreV1{Fake: &c.Fake} +func (c *Clientset) CoreV1() corev1.CoreV1Interface { + return &fakecorev1.FakeCoreV1{Fake: &c.Fake} } // Core retrieves the CoreV1Client -func (c *Clientset) Core() v1core.CoreV1Interface { - return &fakev1core.FakeCoreV1{Fake: &c.Fake} +func (c *Clientset) Core() corev1.CoreV1Interface { + return &fakecorev1.FakeCoreV1{Fake: &c.Fake} } // AppsV1beta1 retrieves the AppsV1beta1Client -func (c *Clientset) AppsV1beta1() v1beta1apps.AppsV1beta1Interface { - return &fakev1beta1apps.FakeAppsV1beta1{Fake: &c.Fake} +func (c *Clientset) AppsV1beta1() appsv1beta1.AppsV1beta1Interface { + return &fakeappsv1beta1.FakeAppsV1beta1{Fake: &c.Fake} } // Apps retrieves the AppsV1beta1Client -func (c *Clientset) Apps() v1beta1apps.AppsV1beta1Interface { - return &fakev1beta1apps.FakeAppsV1beta1{Fake: &c.Fake} +func (c *Clientset) Apps() appsv1beta1.AppsV1beta1Interface { + return &fakeappsv1beta1.FakeAppsV1beta1{Fake: &c.Fake} } // AuthenticationV1 retrieves the AuthenticationV1Client -func (c *Clientset) AuthenticationV1() v1authentication.AuthenticationV1Interface { - return &fakev1authentication.FakeAuthenticationV1{Fake: &c.Fake} +func (c *Clientset) AuthenticationV1() authenticationv1.AuthenticationV1Interface { + return &fakeauthenticationv1.FakeAuthenticationV1{Fake: &c.Fake} } // Authentication retrieves the AuthenticationV1Client -func (c *Clientset) Authentication() v1authentication.AuthenticationV1Interface { - return &fakev1authentication.FakeAuthenticationV1{Fake: &c.Fake} +func (c *Clientset) Authentication() authenticationv1.AuthenticationV1Interface { + return &fakeauthenticationv1.FakeAuthenticationV1{Fake: &c.Fake} } // AuthenticationV1beta1 retrieves the AuthenticationV1beta1Client -func (c *Clientset) AuthenticationV1beta1() v1beta1authentication.AuthenticationV1beta1Interface { - return &fakev1beta1authentication.FakeAuthenticationV1beta1{Fake: &c.Fake} +func (c *Clientset) AuthenticationV1beta1() authenticationv1beta1.AuthenticationV1beta1Interface { + return &fakeauthenticationv1beta1.FakeAuthenticationV1beta1{Fake: &c.Fake} } // AuthorizationV1 retrieves the AuthorizationV1Client -func (c *Clientset) AuthorizationV1() v1authorization.AuthorizationV1Interface { - return &fakev1authorization.FakeAuthorizationV1{Fake: &c.Fake} +func (c *Clientset) AuthorizationV1() authorizationv1.AuthorizationV1Interface { + return &fakeauthorizationv1.FakeAuthorizationV1{Fake: &c.Fake} } // Authorization retrieves the AuthorizationV1Client -func (c *Clientset) Authorization() v1authorization.AuthorizationV1Interface { - return &fakev1authorization.FakeAuthorizationV1{Fake: &c.Fake} +func (c *Clientset) Authorization() authorizationv1.AuthorizationV1Interface { + return &fakeauthorizationv1.FakeAuthorizationV1{Fake: &c.Fake} } // AuthorizationV1beta1 retrieves the AuthorizationV1beta1Client -func (c *Clientset) AuthorizationV1beta1() v1beta1authorization.AuthorizationV1beta1Interface { - return &fakev1beta1authorization.FakeAuthorizationV1beta1{Fake: &c.Fake} +func (c *Clientset) AuthorizationV1beta1() authorizationv1beta1.AuthorizationV1beta1Interface { + return &fakeauthorizationv1beta1.FakeAuthorizationV1beta1{Fake: &c.Fake} } // AutoscalingV1 retrieves the AutoscalingV1Client -func (c *Clientset) AutoscalingV1() v1autoscaling.AutoscalingV1Interface { - return &fakev1autoscaling.FakeAutoscalingV1{Fake: &c.Fake} +func (c *Clientset) AutoscalingV1() autoscalingv1.AutoscalingV1Interface { + return &fakeautoscalingv1.FakeAutoscalingV1{Fake: &c.Fake} } // Autoscaling retrieves the AutoscalingV1Client -func (c *Clientset) Autoscaling() v1autoscaling.AutoscalingV1Interface { - return &fakev1autoscaling.FakeAutoscalingV1{Fake: &c.Fake} +func (c *Clientset) Autoscaling() autoscalingv1.AutoscalingV1Interface { + return &fakeautoscalingv1.FakeAutoscalingV1{Fake: &c.Fake} } // AutoscalingV2alpha1 retrieves the AutoscalingV2alpha1Client -func (c *Clientset) AutoscalingV2alpha1() v2alpha1autoscaling.AutoscalingV2alpha1Interface { - return &fakev2alpha1autoscaling.FakeAutoscalingV2alpha1{Fake: &c.Fake} +func (c *Clientset) AutoscalingV2alpha1() autoscalingv2alpha1.AutoscalingV2alpha1Interface { + return &fakeautoscalingv2alpha1.FakeAutoscalingV2alpha1{Fake: &c.Fake} } // BatchV1 retrieves the BatchV1Client -func (c *Clientset) BatchV1() v1batch.BatchV1Interface { - return &fakev1batch.FakeBatchV1{Fake: &c.Fake} +func (c *Clientset) BatchV1() batchv1.BatchV1Interface { + return &fakebatchv1.FakeBatchV1{Fake: &c.Fake} } // Batch retrieves the BatchV1Client -func (c *Clientset) Batch() v1batch.BatchV1Interface { - return &fakev1batch.FakeBatchV1{Fake: &c.Fake} +func (c *Clientset) Batch() batchv1.BatchV1Interface { + return &fakebatchv1.FakeBatchV1{Fake: &c.Fake} } // BatchV2alpha1 retrieves the BatchV2alpha1Client -func (c *Clientset) BatchV2alpha1() v2alpha1batch.BatchV2alpha1Interface { - return &fakev2alpha1batch.FakeBatchV2alpha1{Fake: &c.Fake} +func (c *Clientset) BatchV2alpha1() batchv2alpha1.BatchV2alpha1Interface { + return &fakebatchv2alpha1.FakeBatchV2alpha1{Fake: &c.Fake} } // CertificatesV1beta1 retrieves the CertificatesV1beta1Client -func (c *Clientset) CertificatesV1beta1() v1beta1certificates.CertificatesV1beta1Interface { - return &fakev1beta1certificates.FakeCertificatesV1beta1{Fake: &c.Fake} +func (c *Clientset) CertificatesV1beta1() certificatesv1beta1.CertificatesV1beta1Interface { + return &fakecertificatesv1beta1.FakeCertificatesV1beta1{Fake: &c.Fake} } // Certificates retrieves the CertificatesV1beta1Client -func (c *Clientset) Certificates() v1beta1certificates.CertificatesV1beta1Interface { - return &fakev1beta1certificates.FakeCertificatesV1beta1{Fake: &c.Fake} +func (c *Clientset) Certificates() certificatesv1beta1.CertificatesV1beta1Interface { + return &fakecertificatesv1beta1.FakeCertificatesV1beta1{Fake: &c.Fake} } // ExtensionsV1beta1 retrieves the ExtensionsV1beta1Client -func (c *Clientset) ExtensionsV1beta1() v1beta1extensions.ExtensionsV1beta1Interface { - return &fakev1beta1extensions.FakeExtensionsV1beta1{Fake: &c.Fake} +func (c *Clientset) ExtensionsV1beta1() extensionsv1beta1.ExtensionsV1beta1Interface { + return &fakeextensionsv1beta1.FakeExtensionsV1beta1{Fake: &c.Fake} } // Extensions retrieves the ExtensionsV1beta1Client -func (c *Clientset) Extensions() v1beta1extensions.ExtensionsV1beta1Interface { - return &fakev1beta1extensions.FakeExtensionsV1beta1{Fake: &c.Fake} +func (c *Clientset) Extensions() extensionsv1beta1.ExtensionsV1beta1Interface { + return &fakeextensionsv1beta1.FakeExtensionsV1beta1{Fake: &c.Fake} } // PolicyV1beta1 retrieves the PolicyV1beta1Client -func (c *Clientset) PolicyV1beta1() v1beta1policy.PolicyV1beta1Interface { - return &fakev1beta1policy.FakePolicyV1beta1{Fake: &c.Fake} +func (c *Clientset) PolicyV1beta1() policyv1beta1.PolicyV1beta1Interface { + return &fakepolicyv1beta1.FakePolicyV1beta1{Fake: &c.Fake} } // Policy retrieves the PolicyV1beta1Client -func (c *Clientset) Policy() v1beta1policy.PolicyV1beta1Interface { - return &fakev1beta1policy.FakePolicyV1beta1{Fake: &c.Fake} +func (c *Clientset) Policy() policyv1beta1.PolicyV1beta1Interface { + return &fakepolicyv1beta1.FakePolicyV1beta1{Fake: &c.Fake} } // RbacV1beta1 retrieves the RbacV1beta1Client -func (c *Clientset) RbacV1beta1() v1beta1rbac.RbacV1beta1Interface { - return &fakev1beta1rbac.FakeRbacV1beta1{Fake: &c.Fake} +func (c *Clientset) RbacV1beta1() rbacv1beta1.RbacV1beta1Interface { + return &fakerbacv1beta1.FakeRbacV1beta1{Fake: &c.Fake} } // Rbac retrieves the RbacV1beta1Client -func (c *Clientset) Rbac() v1beta1rbac.RbacV1beta1Interface { - return &fakev1beta1rbac.FakeRbacV1beta1{Fake: &c.Fake} +func (c *Clientset) Rbac() rbacv1beta1.RbacV1beta1Interface { + return &fakerbacv1beta1.FakeRbacV1beta1{Fake: &c.Fake} } // RbacV1alpha1 retrieves the RbacV1alpha1Client -func (c *Clientset) RbacV1alpha1() v1alpha1rbac.RbacV1alpha1Interface { - return &fakev1alpha1rbac.FakeRbacV1alpha1{Fake: &c.Fake} +func (c *Clientset) RbacV1alpha1() rbacv1alpha1.RbacV1alpha1Interface { + return &fakerbacv1alpha1.FakeRbacV1alpha1{Fake: &c.Fake} } // StorageV1beta1 retrieves the StorageV1beta1Client -func (c *Clientset) StorageV1beta1() v1beta1storage.StorageV1beta1Interface { - return &fakev1beta1storage.FakeStorageV1beta1{Fake: &c.Fake} +func (c *Clientset) StorageV1beta1() storagev1beta1.StorageV1beta1Interface { + return &fakestoragev1beta1.FakeStorageV1beta1{Fake: &c.Fake} } // Storage retrieves the StorageV1beta1Client -func (c *Clientset) Storage() v1beta1storage.StorageV1beta1Interface { - return &fakev1beta1storage.FakeStorageV1beta1{Fake: &c.Fake} +func (c *Clientset) Storage() storagev1beta1.StorageV1beta1Interface { + return &fakestoragev1beta1.FakeStorageV1beta1{Fake: &c.Fake} } diff --git a/pkg/client/clientset_generated/clientset/scheme/BUILD b/pkg/client/clientset_generated/clientset/scheme/BUILD new file mode 100644 index 000000000000..9d5a7e4c63da --- /dev/null +++ b/pkg/client/clientset_generated/clientset/scheme/BUILD @@ -0,0 +1,52 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "doc.go", + "register.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/api/v1:go_default_library", + "//pkg/apis/apps/v1beta1:go_default_library", + "//pkg/apis/authentication/v1:go_default_library", + "//pkg/apis/authentication/v1beta1:go_default_library", + "//pkg/apis/authorization/v1:go_default_library", + "//pkg/apis/authorization/v1beta1:go_default_library", + "//pkg/apis/autoscaling/v1:go_default_library", + "//pkg/apis/autoscaling/v2alpha1:go_default_library", + "//pkg/apis/batch/v1:go_default_library", + "//pkg/apis/batch/v2alpha1:go_default_library", + "//pkg/apis/certificates/v1beta1:go_default_library", + "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/policy/v1beta1:go_default_library", + "//pkg/apis/rbac/v1alpha1:go_default_library", + "//pkg/apis/rbac/v1beta1:go_default_library", + "//pkg/apis/storage/v1beta1:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/pkg/client/clientset_generated/clientset/scheme/doc.go b/pkg/client/clientset_generated/clientset/scheme/doc.go new file mode 100644 index 000000000000..5d8ec824f0fb --- /dev/null +++ b/pkg/client/clientset_generated/clientset/scheme/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2017 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 custom arguments. + +// This package contains the scheme of the automatically generated clientset. +package scheme diff --git a/pkg/client/clientset_generated/clientset/scheme/register.go b/pkg/client/clientset_generated/clientset/scheme/register.go new file mode 100644 index 000000000000..5eb779d5c2b7 --- /dev/null +++ b/pkg/client/clientset_generated/clientset/scheme/register.go @@ -0,0 +1,83 @@ +/* +Copyright 2017 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 scheme + +import ( + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" + serializer "k8s.io/apimachinery/pkg/runtime/serializer" + corev1 "k8s.io/kubernetes/pkg/api/v1" + appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + authenticationv1 "k8s.io/kubernetes/pkg/apis/authentication/v1" + authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" + authorizationv1 "k8s.io/kubernetes/pkg/apis/authorization/v1" + authorizationv1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + autoscalingv2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" + batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + certificatesv1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + policyv1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + rbacv1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + storagev1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" +) + +var Scheme = runtime.NewScheme() +var Codecs = serializer.NewCodecFactory(Scheme) +var ParameterCodec = runtime.NewParameterCodec(Scheme) + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + AddToScheme(Scheme) +} + +// AddToScheme adds all types of this clientset into the given scheme. This allows composition +// of clientsets, like in: +// +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kuberentes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) +// +// kclientset, _ := kubernetes.NewForConfig(c) +// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// +// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types +// correctly. +func AddToScheme(scheme *runtime.Scheme) { + corev1.AddToScheme(scheme) + appsv1beta1.AddToScheme(scheme) + authenticationv1.AddToScheme(scheme) + authenticationv1beta1.AddToScheme(scheme) + authorizationv1.AddToScheme(scheme) + authorizationv1beta1.AddToScheme(scheme) + autoscalingv1.AddToScheme(scheme) + autoscalingv2alpha1.AddToScheme(scheme) + batchv1.AddToScheme(scheme) + batchv2alpha1.AddToScheme(scheme) + certificatesv1beta1.AddToScheme(scheme) + extensionsv1beta1.AddToScheme(scheme) + policyv1beta1.AddToScheme(scheme) + rbacv1beta1.AddToScheme(scheme) + rbacv1alpha1.AddToScheme(scheme) + storagev1beta1.AddToScheme(scheme) + +} diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/BUILD index 8c49c70063b1..f7d33e42716c 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/BUILD @@ -17,10 +17,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go index e84cddeab257..8e2a56915b74 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1beta1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type AppsV1beta1Interface interface { @@ -67,22 +66,14 @@ func New(c rest.Interface) *AppsV1beta1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("apps/v1beta1") - if err != nil { - return err - } - // if apps/v1beta1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("apps/v1beta1 is not enabled") - } + gv := v1beta1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go index 7a993a26b0f2..e579cd4564d1 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // StatefulSetsGetter has a method to return a StatefulSetInterface. @@ -116,7 +116,7 @@ func (c *statefulSets) DeleteCollection(options *v1.DeleteOptions, listOptions v return c.client.Delete(). Namespace(c.ns). Resource("statefulsets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *statefulSets) Get(name string, options v1.GetOptions) (result *v1beta1. Namespace(c.ns). Resource("statefulsets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *statefulSets) List(opts v1.ListOptions) (result *v1beta1.StatefulSetLis err = c.client.Get(). Namespace(c.ns). Resource("statefulsets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *statefulSets) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("statefulsets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1/BUILD b/pkg/client/clientset_generated/clientset/typed/authentication/v1/BUILD index b0e475f6e18d..0c0cc899230e 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1/BUILD @@ -18,9 +18,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/authentication/v1:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/client-go/rest", ], diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1/authentication_client.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1/authentication_client.go index b4800a7e947f..beed71ea3c88 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1/authentication_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1/authentication_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/apis/authentication/v1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type AuthenticationV1Interface interface { @@ -67,22 +66,14 @@ func New(c rest.Interface) *AuthenticationV1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("authentication.k8s.io/v1") - if err != nil { - return err - } - // if authentication.k8s.io/v1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("authentication.k8s.io/v1 is not enabled") - } + gv := v1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/BUILD index 06e0edd01858..24065ef6c9af 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/BUILD @@ -18,9 +18,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/authentication/v1beta1:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/client-go/rest", ], diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go index b4107ae62909..b3aa17eb0b6a 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1beta1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type AuthenticationV1beta1Interface interface { @@ -67,22 +66,14 @@ func New(c rest.Interface) *AuthenticationV1beta1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("authentication.k8s.io/v1beta1") - if err != nil { - return err - } - // if authentication.k8s.io/v1beta1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("authentication.k8s.io/v1beta1 is not enabled") - } + gv := v1beta1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1/BUILD b/pkg/client/clientset_generated/clientset/typed/authorization/v1/BUILD index 86521cdcd193..b131c50ba52b 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1/BUILD @@ -22,9 +22,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/authorization/v1:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/client-go/rest", ], diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1/authorization_client.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1/authorization_client.go index 3a5122570630..232fdc959402 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1/authorization_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1/authorization_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/apis/authorization/v1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type AuthorizationV1Interface interface { @@ -77,22 +76,14 @@ func New(c rest.Interface) *AuthorizationV1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("authorization.k8s.io/v1") - if err != nil { - return err - } - // if authorization.k8s.io/v1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("authorization.k8s.io/v1 is not enabled") - } + gv := v1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/BUILD index 17adcb15c32b..e9d7293df6a5 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/BUILD @@ -22,9 +22,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/authorization/v1beta1:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/client-go/rest", ], diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go index 57c8cdb4603b..3801cdc75d25 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1beta1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type AuthorizationV1beta1Interface interface { @@ -77,22 +76,14 @@ func New(c rest.Interface) *AuthorizationV1beta1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("authorization.k8s.io/v1beta1") - if err != nil { - return err - } - // if authorization.k8s.io/v1beta1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("authorization.k8s.io/v1beta1 is not enabled") - } + gv := v1beta1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/BUILD b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/BUILD index 3018c13d5460..1bd2c93c6045 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/BUILD @@ -17,10 +17,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go index 0b501982096c..7ea617b8a17b 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type AutoscalingV1Interface interface { @@ -67,22 +66,14 @@ func New(c rest.Interface) *AutoscalingV1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("autoscaling/v1") - if err != nil { - return err - } - // if autoscaling/v1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("autoscaling/v1 is not enabled") - } + gv := v1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go index c0891dd5f1d5..13820b6155b0 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // HorizontalPodAutoscalersGetter has a method to return a HorizontalPodAutoscalerInterface. @@ -116,7 +116,7 @@ func (c *horizontalPodAutoscalers) DeleteCollection(options *meta_v1.DeleteOptio return c.client.Delete(). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *horizontalPodAutoscalers) Get(name string, options meta_v1.GetOptions) Namespace(c.ns). Resource("horizontalpodautoscalers"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *horizontalPodAutoscalers) List(opts meta_v1.ListOptions) (result *v1.Ho err = c.client.Get(). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *horizontalPodAutoscalers) Watch(opts meta_v1.ListOptions) (watch.Interf Prefix("watch"). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/BUILD b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/BUILD index 1be31ebbb755..1e89dfe12daa 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/BUILD @@ -17,10 +17,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/autoscaling/v2alpha1:go_default_library", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/autoscaling_client.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/autoscaling_client.go index 250d599a640f..90ce24f30652 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/autoscaling_client.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/autoscaling_client.go @@ -17,11 +17,10 @@ limitations under the License. package v2alpha1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type AutoscalingV2alpha1Interface interface { @@ -67,22 +66,14 @@ func New(c rest.Interface) *AutoscalingV2alpha1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("autoscaling/v2alpha1") - if err != nil { - return err - } - // if autoscaling/v2alpha1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("autoscaling/v2alpha1 is not enabled") - } + gv := v2alpha1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go index 1c02673a001b..c6dcfb8eb615 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // HorizontalPodAutoscalersGetter has a method to return a HorizontalPodAutoscalerInterface. @@ -116,7 +116,7 @@ func (c *horizontalPodAutoscalers) DeleteCollection(options *v1.DeleteOptions, l return c.client.Delete(). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *horizontalPodAutoscalers) Get(name string, options v1.GetOptions) (resu Namespace(c.ns). Resource("horizontalpodautoscalers"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *horizontalPodAutoscalers) List(opts v1.ListOptions) (result *v2alpha1.H err = c.client.Get(). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *horizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interface, Prefix("watch"). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/BUILD b/pkg/client/clientset_generated/clientset/typed/batch/v1/BUILD index 18a60597b16e..6c4197799610 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/BUILD @@ -17,10 +17,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/batch/v1:go_default_library", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go index 2c1dba16582e..a269f0063126 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/apis/batch/v1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type BatchV1Interface interface { @@ -67,22 +66,14 @@ func New(c rest.Interface) *BatchV1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("batch/v1") - if err != nil { - return err - } - // if batch/v1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("batch/v1 is not enabled") - } + gv := v1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go index ad38e23e7f5f..7b6949c1d0cd 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/apis/batch/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // JobsGetter has a method to return a JobInterface. @@ -116,7 +116,7 @@ func (c *jobs) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta return c.client.Delete(). Namespace(c.ns). Resource("jobs"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *jobs) Get(name string, options meta_v1.GetOptions) (result *v1.Job, err Namespace(c.ns). Resource("jobs"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *jobs) List(opts meta_v1.ListOptions) (result *v1.JobList, err error) { err = c.client.Get(). Namespace(c.ns). Resource("jobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *jobs) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("jobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/BUILD b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/BUILD index 819b3b56f3b1..1a07490198a1 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/BUILD @@ -18,10 +18,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go index 9757b4f74651..93792d10be34 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go @@ -17,11 +17,10 @@ limitations under the License. package v2alpha1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type BatchV2alpha1Interface interface { @@ -72,22 +71,14 @@ func New(c rest.Interface) *BatchV2alpha1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("batch/v2alpha1") - if err != nil { - return err - } - // if batch/v2alpha1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("batch/v2alpha1 is not enabled") - } + gv := v2alpha1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go index e7608e69a2a5..15bb0cc6e3f7 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // CronJobsGetter has a method to return a CronJobInterface. @@ -116,7 +116,7 @@ func (c *cronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.Li return c.client.Delete(). Namespace(c.ns). Resource("cronjobs"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *cronJobs) Get(name string, options v1.GetOptions) (result *v2alpha1.Cro Namespace(c.ns). Resource("cronjobs"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *cronJobs) List(opts v1.ListOptions) (result *v2alpha1.CronJobList, err err = c.client.Get(). Namespace(c.ns). Resource("cronjobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *cronJobs) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("cronjobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go index 29aafb642568..88061625bd9a 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/job.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // JobsGetter has a method to return a JobInterface. @@ -116,7 +116,7 @@ func (c *jobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOp return c.client.Delete(). Namespace(c.ns). Resource("jobs"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *jobs) Get(name string, options v1.GetOptions) (result *v2alpha1.Job, er Namespace(c.ns). Resource("jobs"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *jobs) List(opts v1.ListOptions) (result *v2alpha1.JobList, err error) { err = c.client.Get(). Namespace(c.ns). Resource("jobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *jobs) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("jobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/BUILD index 2ada215e0f74..89804d8a98f6 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/BUILD @@ -18,10 +18,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/certificates/v1beta1:go_default_library", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificates_client.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificates_client.go index 27f77d351842..15151f5179ba 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificates_client.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificates_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1beta1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type CertificatesV1beta1Interface interface { @@ -67,22 +66,14 @@ func New(c rest.Interface) *CertificatesV1beta1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("certificates.k8s.io/v1beta1") - if err != nil { - return err - } - // if certificates.k8s.io/v1beta1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("certificates.k8s.io/v1beta1 is not enabled") - } + gv := v1beta1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go index 33f8eb6e295d..f506726897b6 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // CertificateSigningRequestsGetter has a method to return a CertificateSigningRequestInterface. @@ -109,7 +109,7 @@ func (c *certificateSigningRequests) Delete(name string, options *v1.DeleteOptio func (c *certificateSigningRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("certificatesigningrequests"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -121,7 +121,7 @@ func (c *certificateSigningRequests) Get(name string, options v1.GetOptions) (re err = c.client.Get(). Resource("certificatesigningrequests"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -132,7 +132,7 @@ func (c *certificateSigningRequests) List(opts v1.ListOptions) (result *v1beta1. result = &v1beta1.CertificateSigningRequestList{} err = c.client.Get(). Resource("certificatesigningrequests"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -143,7 +143,7 @@ func (c *certificateSigningRequests) Watch(opts v1.ListOptions) (watch.Interface return c.client.Get(). Prefix("watch"). Resource("certificatesigningrequests"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/BUILD b/pkg/client/clientset_generated/clientset/typed/core/v1/BUILD index 3b71b94c3b53..bbac9ef3021f 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/BUILD @@ -40,10 +40,10 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/util/net", diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go b/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go index 95657c0471cf..7431932f2a56 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/componentstatus.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // ComponentStatusesGetter has a method to return a ComponentStatusInterface. @@ -93,7 +93,7 @@ func (c *componentStatuses) Delete(name string, options *meta_v1.DeleteOptions) func (c *componentStatuses) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { return c.client.Delete(). Resource("componentstatuses"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -105,7 +105,7 @@ func (c *componentStatuses) Get(name string, options meta_v1.GetOptions) (result err = c.client.Get(). Resource("componentstatuses"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -116,7 +116,7 @@ func (c *componentStatuses) List(opts meta_v1.ListOptions) (result *v1.Component result = &v1.ComponentStatusList{} err = c.client.Get(). Resource("componentstatuses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -127,7 +127,7 @@ func (c *componentStatuses) Watch(opts meta_v1.ListOptions) (watch.Interface, er return c.client.Get(). Prefix("watch"). Resource("componentstatuses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go b/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go index 05ea6339d9d2..989fb00746b9 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/configmap.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // ConfigMapsGetter has a method to return a ConfigMapInterface. @@ -99,7 +99,7 @@ func (c *configMaps) DeleteCollection(options *meta_v1.DeleteOptions, listOption return c.client.Delete(). Namespace(c.ns). Resource("configmaps"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *configMaps) Get(name string, options meta_v1.GetOptions) (result *v1.Co Namespace(c.ns). Resource("configmaps"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *configMaps) List(opts meta_v1.ListOptions) (result *v1.ConfigMapList, e err = c.client.Get(). Namespace(c.ns). Resource("configmaps"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *configMaps) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("configmaps"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/core_client.go b/pkg/client/clientset_generated/clientset/typed/core/v1/core_client.go index 0bd232da3f2b..6fdcaf128c26 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/core_client.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/core_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1 "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type CoreV1Interface interface { @@ -142,22 +141,14 @@ func New(c rest.Interface) *CoreV1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("/v1") - if err != nil { - return err - } - // if /v1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("/v1 is not enabled") - } + gv := v1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/api" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go b/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go index e4067aad67d1..f78635825283 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/endpoints.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // EndpointsGetter has a method to return a EndpointsInterface. @@ -99,7 +99,7 @@ func (c *endpoints) DeleteCollection(options *meta_v1.DeleteOptions, listOptions return c.client.Delete(). Namespace(c.ns). Resource("endpoints"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *endpoints) Get(name string, options meta_v1.GetOptions) (result *v1.End Namespace(c.ns). Resource("endpoints"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *endpoints) List(opts meta_v1.ListOptions) (result *v1.EndpointsList, er err = c.client.Get(). Namespace(c.ns). Resource("endpoints"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *endpoints) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("endpoints"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/event.go b/pkg/client/clientset_generated/clientset/typed/core/v1/event.go index 0d103dae22ee..519e16746893 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/event.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/event.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // EventsGetter has a method to return a EventInterface. @@ -99,7 +99,7 @@ func (c *events) DeleteCollection(options *meta_v1.DeleteOptions, listOptions me return c.client.Delete(). Namespace(c.ns). Resource("events"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *events) Get(name string, options meta_v1.GetOptions) (result *v1.Event, Namespace(c.ns). Resource("events"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *events) List(opts meta_v1.ListOptions) (result *v1.EventList, err error err = c.client.Get(). Namespace(c.ns). Resource("events"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *events) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("events"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go b/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go index a8817f4ddaf0..33dd84af5c25 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/limitrange.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // LimitRangesGetter has a method to return a LimitRangeInterface. @@ -99,7 +99,7 @@ func (c *limitRanges) DeleteCollection(options *meta_v1.DeleteOptions, listOptio return c.client.Delete(). Namespace(c.ns). Resource("limitranges"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *limitRanges) Get(name string, options meta_v1.GetOptions) (result *v1.L Namespace(c.ns). Resource("limitranges"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *limitRanges) List(opts meta_v1.ListOptions) (result *v1.LimitRangeList, err = c.client.Get(). Namespace(c.ns). Resource("limitranges"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *limitRanges) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("limitranges"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go b/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go index ce3a7a34215a..6a50519acfbc 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/namespace.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // NamespacesGetter has a method to return a NamespaceInterface. @@ -109,7 +109,7 @@ func (c *namespaces) Delete(name string, options *meta_v1.DeleteOptions) error { func (c *namespaces) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { return c.client.Delete(). Resource("namespaces"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -121,7 +121,7 @@ func (c *namespaces) Get(name string, options meta_v1.GetOptions) (result *v1.Na err = c.client.Get(). Resource("namespaces"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -132,7 +132,7 @@ func (c *namespaces) List(opts meta_v1.ListOptions) (result *v1.NamespaceList, e result = &v1.NamespaceList{} err = c.client.Get(). Resource("namespaces"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -143,7 +143,7 @@ func (c *namespaces) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("namespaces"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/node.go b/pkg/client/clientset_generated/clientset/typed/core/v1/node.go index 4c38b09c5536..2f3e6a0b2bee 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/node.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/node.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // NodesGetter has a method to return a NodeInterface. @@ -109,7 +109,7 @@ func (c *nodes) Delete(name string, options *meta_v1.DeleteOptions) error { func (c *nodes) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { return c.client.Delete(). Resource("nodes"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -121,7 +121,7 @@ func (c *nodes) Get(name string, options meta_v1.GetOptions) (result *v1.Node, e err = c.client.Get(). Resource("nodes"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -132,7 +132,7 @@ func (c *nodes) List(opts meta_v1.ListOptions) (result *v1.NodeList, err error) result = &v1.NodeList{} err = c.client.Get(). Resource("nodes"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -143,7 +143,7 @@ func (c *nodes) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("nodes"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go index 1d46d2543eeb..8a384454b11c 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolume.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // PersistentVolumesGetter has a method to return a PersistentVolumeInterface. @@ -109,7 +109,7 @@ func (c *persistentVolumes) Delete(name string, options *meta_v1.DeleteOptions) func (c *persistentVolumes) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { return c.client.Delete(). Resource("persistentvolumes"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -121,7 +121,7 @@ func (c *persistentVolumes) Get(name string, options meta_v1.GetOptions) (result err = c.client.Get(). Resource("persistentvolumes"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -132,7 +132,7 @@ func (c *persistentVolumes) List(opts meta_v1.ListOptions) (result *v1.Persisten result = &v1.PersistentVolumeList{} err = c.client.Get(). Resource("persistentvolumes"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -143,7 +143,7 @@ func (c *persistentVolumes) Watch(opts meta_v1.ListOptions) (watch.Interface, er return c.client.Get(). Prefix("watch"). Resource("persistentvolumes"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go index 87f480b808bb..75740ac2d007 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/persistentvolumeclaim.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // PersistentVolumeClaimsGetter has a method to return a PersistentVolumeClaimInterface. @@ -116,7 +116,7 @@ func (c *persistentVolumeClaims) DeleteCollection(options *meta_v1.DeleteOptions return c.client.Delete(). Namespace(c.ns). Resource("persistentvolumeclaims"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *persistentVolumeClaims) Get(name string, options meta_v1.GetOptions) (r Namespace(c.ns). Resource("persistentvolumeclaims"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *persistentVolumeClaims) List(opts meta_v1.ListOptions) (result *v1.Pers err = c.client.Get(). Namespace(c.ns). Resource("persistentvolumeclaims"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *persistentVolumeClaims) Watch(opts meta_v1.ListOptions) (watch.Interfac Prefix("watch"). Namespace(c.ns). Resource("persistentvolumeclaims"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go b/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go index 1ab02c09dcac..aca57686e8c4 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/pod.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // PodsGetter has a method to return a PodInterface. @@ -116,7 +116,7 @@ func (c *pods) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta return c.client.Delete(). Namespace(c.ns). Resource("pods"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *pods) Get(name string, options meta_v1.GetOptions) (result *v1.Pod, err Namespace(c.ns). Resource("pods"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *pods) List(opts meta_v1.ListOptions) (result *v1.PodList, err error) { err = c.client.Get(). Namespace(c.ns). Resource("pods"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *pods) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("pods"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go b/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go index b934bc861301..23b146117f86 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/podtemplate.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // PodTemplatesGetter has a method to return a PodTemplateInterface. @@ -99,7 +99,7 @@ func (c *podTemplates) DeleteCollection(options *meta_v1.DeleteOptions, listOpti return c.client.Delete(). Namespace(c.ns). Resource("podtemplates"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *podTemplates) Get(name string, options meta_v1.GetOptions) (result *v1. Namespace(c.ns). Resource("podtemplates"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *podTemplates) List(opts meta_v1.ListOptions) (result *v1.PodTemplateLis err = c.client.Get(). Namespace(c.ns). Resource("podtemplates"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *podTemplates) Watch(opts meta_v1.ListOptions) (watch.Interface, error) Prefix("watch"). Namespace(c.ns). Resource("podtemplates"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go b/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go index 5b055afab84d..2858e15255f8 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/replicationcontroller.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // ReplicationControllersGetter has a method to return a ReplicationControllerInterface. @@ -116,7 +116,7 @@ func (c *replicationControllers) DeleteCollection(options *meta_v1.DeleteOptions return c.client.Delete(). Namespace(c.ns). Resource("replicationcontrollers"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *replicationControllers) Get(name string, options meta_v1.GetOptions) (r Namespace(c.ns). Resource("replicationcontrollers"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *replicationControllers) List(opts meta_v1.ListOptions) (result *v1.Repl err = c.client.Get(). Namespace(c.ns). Resource("replicationcontrollers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *replicationControllers) Watch(opts meta_v1.ListOptions) (watch.Interfac Prefix("watch"). Namespace(c.ns). Resource("replicationcontrollers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go b/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go index b45ab0fe8ef1..e67c62838985 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/resourcequota.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // ResourceQuotasGetter has a method to return a ResourceQuotaInterface. @@ -116,7 +116,7 @@ func (c *resourceQuotas) DeleteCollection(options *meta_v1.DeleteOptions, listOp return c.client.Delete(). Namespace(c.ns). Resource("resourcequotas"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *resourceQuotas) Get(name string, options meta_v1.GetOptions) (result *v Namespace(c.ns). Resource("resourcequotas"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *resourceQuotas) List(opts meta_v1.ListOptions) (result *v1.ResourceQuot err = c.client.Get(). Namespace(c.ns). Resource("resourcequotas"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *resourceQuotas) Watch(opts meta_v1.ListOptions) (watch.Interface, error Prefix("watch"). Namespace(c.ns). Resource("resourcequotas"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go b/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go index 2d2bb0fa0e66..afc7f6a28f51 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/secret.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // SecretsGetter has a method to return a SecretInterface. @@ -99,7 +99,7 @@ func (c *secrets) DeleteCollection(options *meta_v1.DeleteOptions, listOptions m return c.client.Delete(). Namespace(c.ns). Resource("secrets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *secrets) Get(name string, options meta_v1.GetOptions) (result *v1.Secre Namespace(c.ns). Resource("secrets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *secrets) List(opts meta_v1.ListOptions) (result *v1.SecretList, err err err = c.client.Get(). Namespace(c.ns). Resource("secrets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *secrets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("secrets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/service.go b/pkg/client/clientset_generated/clientset/typed/core/v1/service.go index 489c0d48a9a0..32d4f26bf42d 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/service.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/service.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // ServicesGetter has a method to return a ServiceInterface. @@ -116,7 +116,7 @@ func (c *services) DeleteCollection(options *meta_v1.DeleteOptions, listOptions return c.client.Delete(). Namespace(c.ns). Resource("services"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *services) Get(name string, options meta_v1.GetOptions) (result *v1.Serv Namespace(c.ns). Resource("services"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *services) List(opts meta_v1.ListOptions) (result *v1.ServiceList, err e err = c.client.Get(). Namespace(c.ns). Resource("services"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *services) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("services"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go b/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go index e1f05670f172..52e0ac104db2 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/serviceaccount.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1 "k8s.io/kubernetes/pkg/api/v1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // ServiceAccountsGetter has a method to return a ServiceAccountInterface. @@ -99,7 +99,7 @@ func (c *serviceAccounts) DeleteCollection(options *meta_v1.DeleteOptions, listO return c.client.Delete(). Namespace(c.ns). Resource("serviceaccounts"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *serviceAccounts) Get(name string, options meta_v1.GetOptions) (result * Namespace(c.ns). Resource("serviceaccounts"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *serviceAccounts) List(opts meta_v1.ListOptions) (result *v1.ServiceAcco err = c.client.Get(). Namespace(c.ns). Resource("serviceaccounts"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *serviceAccounts) Watch(opts meta_v1.ListOptions) (watch.Interface, erro Prefix("watch"). Namespace(c.ns). Resource("serviceaccounts"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/BUILD index 184b546923ef..d5cfd9abc1a7 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/BUILD @@ -25,8 +25,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go index 54690c482fc4..88bcae68dd88 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // DaemonSetsGetter has a method to return a DaemonSetInterface. @@ -116,7 +116,7 @@ func (c *daemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1. return c.client.Delete(). Namespace(c.ns). Resource("daemonsets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *daemonSets) Get(name string, options v1.GetOptions) (result *v1beta1.Da Namespace(c.ns). Resource("daemonsets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *daemonSets) List(opts v1.ListOptions) (result *v1beta1.DaemonSetList, e err = c.client.Get(). Namespace(c.ns). Resource("daemonsets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *daemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("daemonsets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go index fa78629638b9..1d14bf63fa01 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // DeploymentsGetter has a method to return a DeploymentInterface. @@ -116,7 +116,7 @@ func (c *deployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1 return c.client.Delete(). Namespace(c.ns). Resource("deployments"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *deployments) Get(name string, options v1.GetOptions) (result *v1beta1.D Namespace(c.ns). Resource("deployments"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *deployments) List(opts v1.ListOptions) (result *v1beta1.DeploymentList, err = c.client.Get(). Namespace(c.ns). Resource("deployments"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *deployments) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("deployments"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go index d646e5a1b855..3f86c853fc4d 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1beta1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type ExtensionsV1beta1Interface interface { @@ -97,22 +96,14 @@ func New(c rest.Interface) *ExtensionsV1beta1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("extensions/v1beta1") - if err != nil { - return err - } - // if extensions/v1beta1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("extensions/v1beta1 is not enabled") - } + gv := v1beta1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go index 685d1ea7f069..4fd538e8cd70 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // IngressesGetter has a method to return a IngressInterface. @@ -116,7 +116,7 @@ func (c *ingresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.L return c.client.Delete(). Namespace(c.ns). Resource("ingresses"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *ingresses) Get(name string, options v1.GetOptions) (result *v1beta1.Ing Namespace(c.ns). Resource("ingresses"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *ingresses) List(opts v1.ListOptions) (result *v1beta1.IngressList, err err = c.client.Get(). Namespace(c.ns). Resource("ingresses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *ingresses) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("ingresses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go index e495a1efd14e..bac5f3978fd2 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // PodSecurityPoliciesGetter has a method to return a PodSecurityPolicyInterface. @@ -93,7 +93,7 @@ func (c *podSecurityPolicies) Delete(name string, options *v1.DeleteOptions) err func (c *podSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("podsecuritypolicies"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -105,7 +105,7 @@ func (c *podSecurityPolicies) Get(name string, options v1.GetOptions) (result *v err = c.client.Get(). Resource("podsecuritypolicies"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -116,7 +116,7 @@ func (c *podSecurityPolicies) List(opts v1.ListOptions) (result *v1beta1.PodSecu result = &v1beta1.PodSecurityPolicyList{} err = c.client.Get(). Resource("podsecuritypolicies"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -127,7 +127,7 @@ func (c *podSecurityPolicies) Watch(opts v1.ListOptions) (watch.Interface, error return c.client.Get(). Prefix("watch"). Resource("podsecuritypolicies"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go index 5069fab5826b..55eddb2c67b0 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // ReplicaSetsGetter has a method to return a ReplicaSetInterface. @@ -116,7 +116,7 @@ func (c *replicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1 return c.client.Delete(). Namespace(c.ns). Resource("replicasets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *replicaSets) Get(name string, options v1.GetOptions) (result *v1beta1.R Namespace(c.ns). Resource("replicasets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *replicaSets) List(opts v1.ListOptions) (result *v1beta1.ReplicaSetList, err = c.client.Get(). Namespace(c.ns). Resource("replicasets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *replicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("replicasets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go index 404d6112e64b..6047bc488db0 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // ThirdPartyResourcesGetter has a method to return a ThirdPartyResourceInterface. @@ -93,7 +93,7 @@ func (c *thirdPartyResources) Delete(name string, options *v1.DeleteOptions) err func (c *thirdPartyResources) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("thirdpartyresources"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -105,7 +105,7 @@ func (c *thirdPartyResources) Get(name string, options v1.GetOptions) (result *v err = c.client.Get(). Resource("thirdpartyresources"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -116,7 +116,7 @@ func (c *thirdPartyResources) List(opts v1.ListOptions) (result *v1beta1.ThirdPa result = &v1beta1.ThirdPartyResourceList{} err = c.client.Get(). Resource("thirdpartyresources"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -127,7 +127,7 @@ func (c *thirdPartyResources) Watch(opts v1.ListOptions) (watch.Interface, error return c.client.Get(). Prefix("watch"). Resource("thirdpartyresources"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/BUILD index 7da57f8e18db..4476c97ad887 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/BUILD @@ -19,10 +19,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go index 7d0fa710cd4d..7c5a4832ad9f 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // PodDisruptionBudgetsGetter has a method to return a PodDisruptionBudgetInterface. @@ -116,7 +116,7 @@ func (c *podDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, listO return c.client.Delete(). Namespace(c.ns). Resource("poddisruptionbudgets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *podDisruptionBudgets) Get(name string, options v1.GetOptions) (result * Namespace(c.ns). Resource("poddisruptionbudgets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *podDisruptionBudgets) List(opts v1.ListOptions) (result *v1beta1.PodDis err = c.client.Get(). Namespace(c.ns). Resource("poddisruptionbudgets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *podDisruptionBudgets) Watch(opts v1.ListOptions) (watch.Interface, erro Prefix("watch"). Namespace(c.ns). Resource("poddisruptionbudgets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go index c542fcfed827..2424ed90ff97 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1beta1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type PolicyV1beta1Interface interface { @@ -72,22 +71,14 @@ func New(c rest.Interface) *PolicyV1beta1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("policy/v1beta1") - if err != nil { - return err - } - // if policy/v1beta1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("policy/v1beta1 is not enabled") - } + gv := v1beta1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/BUILD b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/BUILD index 6d02a149c4bb..581150fdd9f1 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/BUILD @@ -20,10 +20,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/rbac/v1alpha1:go_default_library", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go index b4cbdcc7bce9..39750c8437de 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // ClusterRolesGetter has a method to return a ClusterRoleInterface. @@ -93,7 +93,7 @@ func (c *clusterRoles) Delete(name string, options *v1.DeleteOptions) error { func (c *clusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("clusterroles"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -105,7 +105,7 @@ func (c *clusterRoles) Get(name string, options v1.GetOptions) (result *v1alpha1 err = c.client.Get(). Resource("clusterroles"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -116,7 +116,7 @@ func (c *clusterRoles) List(opts v1.ListOptions) (result *v1alpha1.ClusterRoleLi result = &v1alpha1.ClusterRoleList{} err = c.client.Get(). Resource("clusterroles"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -127,7 +127,7 @@ func (c *clusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("clusterroles"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go index ca6999c6756e..27d290c3d414 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // ClusterRoleBindingsGetter has a method to return a ClusterRoleBindingInterface. @@ -93,7 +93,7 @@ func (c *clusterRoleBindings) Delete(name string, options *v1.DeleteOptions) err func (c *clusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("clusterrolebindings"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -105,7 +105,7 @@ func (c *clusterRoleBindings) Get(name string, options v1.GetOptions) (result *v err = c.client.Get(). Resource("clusterrolebindings"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -116,7 +116,7 @@ func (c *clusterRoleBindings) List(opts v1.ListOptions) (result *v1alpha1.Cluste result = &v1alpha1.ClusterRoleBindingList{} err = c.client.Get(). Resource("clusterrolebindings"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -127,7 +127,7 @@ func (c *clusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error return c.client.Get(). Prefix("watch"). Resource("clusterrolebindings"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go index 42f077ca276f..b9d09e5bc8af 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1alpha1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type RbacV1alpha1Interface interface { @@ -82,22 +81,14 @@ func New(c rest.Interface) *RbacV1alpha1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("rbac.authorization.k8s.io/v1alpha1") - if err != nil { - return err - } - // if rbac.authorization.k8s.io/v1alpha1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("rbac.authorization.k8s.io/v1alpha1 is not enabled") - } + gv := v1alpha1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go index 6df31e333ede..6af24abe2b13 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // RolesGetter has a method to return a RoleInterface. @@ -99,7 +99,7 @@ func (c *roles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListO return c.client.Delete(). Namespace(c.ns). Resource("roles"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *roles) Get(name string, options v1.GetOptions) (result *v1alpha1.Role, Namespace(c.ns). Resource("roles"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *roles) List(opts v1.ListOptions) (result *v1alpha1.RoleList, err error) err = c.client.Get(). Namespace(c.ns). Resource("roles"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *roles) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("roles"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go index f41334ab503e..12845116b45e 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // RoleBindingsGetter has a method to return a RoleBindingInterface. @@ -99,7 +99,7 @@ func (c *roleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v return c.client.Delete(). Namespace(c.ns). Resource("rolebindings"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *roleBindings) Get(name string, options v1.GetOptions) (result *v1alpha1 Namespace(c.ns). Resource("rolebindings"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *roleBindings) List(opts v1.ListOptions) (result *v1alpha1.RoleBindingLi err = c.client.Get(). Namespace(c.ns). Resource("rolebindings"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *roleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("rolebindings"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/BUILD index 11d1ad18fe7c..e9608d713613 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/BUILD @@ -20,10 +20,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/rbac/v1beta1:go_default_library", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go index 28392a593e35..0a8d00e8f955 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // ClusterRolesGetter has a method to return a ClusterRoleInterface. @@ -93,7 +93,7 @@ func (c *clusterRoles) Delete(name string, options *v1.DeleteOptions) error { func (c *clusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("clusterroles"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -105,7 +105,7 @@ func (c *clusterRoles) Get(name string, options v1.GetOptions) (result *v1beta1. err = c.client.Get(). Resource("clusterroles"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -116,7 +116,7 @@ func (c *clusterRoles) List(opts v1.ListOptions) (result *v1beta1.ClusterRoleLis result = &v1beta1.ClusterRoleList{} err = c.client.Get(). Resource("clusterroles"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -127,7 +127,7 @@ func (c *clusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("clusterroles"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go index a714003b2133..e9b318ba2351 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // ClusterRoleBindingsGetter has a method to return a ClusterRoleBindingInterface. @@ -93,7 +93,7 @@ func (c *clusterRoleBindings) Delete(name string, options *v1.DeleteOptions) err func (c *clusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("clusterrolebindings"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -105,7 +105,7 @@ func (c *clusterRoleBindings) Get(name string, options v1.GetOptions) (result *v err = c.client.Get(). Resource("clusterrolebindings"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -116,7 +116,7 @@ func (c *clusterRoleBindings) List(opts v1.ListOptions) (result *v1beta1.Cluster result = &v1beta1.ClusterRoleBindingList{} err = c.client.Get(). Resource("clusterrolebindings"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -127,7 +127,7 @@ func (c *clusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error return c.client.Get(). Prefix("watch"). Resource("clusterrolebindings"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rbac_client.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rbac_client.go index dbce67085419..20c8da68c8c7 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rbac_client.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rbac_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1beta1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type RbacV1beta1Interface interface { @@ -82,22 +81,14 @@ func New(c rest.Interface) *RbacV1beta1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("rbac.authorization.k8s.io/v1beta1") - if err != nil { - return err - } - // if rbac.authorization.k8s.io/v1beta1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("rbac.authorization.k8s.io/v1beta1 is not enabled") - } + gv := v1beta1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go index 2967976cc24b..76cf84e80195 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // RolesGetter has a method to return a RoleInterface. @@ -99,7 +99,7 @@ func (c *roles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListO return c.client.Delete(). Namespace(c.ns). Resource("roles"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *roles) Get(name string, options v1.GetOptions) (result *v1beta1.Role, e Namespace(c.ns). Resource("roles"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *roles) List(opts v1.ListOptions) (result *v1beta1.RoleList, err error) err = c.client.Get(). Namespace(c.ns). Resource("roles"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *roles) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("roles"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go index 719e4e67603c..0f1b03fa3895 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // RoleBindingsGetter has a method to return a RoleBindingInterface. @@ -99,7 +99,7 @@ func (c *roleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v return c.client.Delete(). Namespace(c.ns). Resource("rolebindings"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *roleBindings) Get(name string, options v1.GetOptions) (result *v1beta1. Namespace(c.ns). Resource("rolebindings"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *roleBindings) List(opts v1.ListOptions) (result *v1beta1.RoleBindingLis err = c.client.Get(). Namespace(c.ns). Resource("rolebindings"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *roleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("rolebindings"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/BUILD b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/BUILD index bb394e922b35..aafb4e789ad6 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/BUILD +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/BUILD @@ -17,10 +17,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", + "//pkg/client/clientset_generated/clientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go index fa29839bd94a..6925575e06f1 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1beta1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) type StorageV1beta1Interface interface { @@ -67,22 +66,14 @@ func New(c rest.Interface) *StorageV1beta1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("storage.k8s.io/v1beta1") - if err != nil { - return err - } - // if storage.k8s.io/v1beta1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("storage.k8s.io/v1beta1 is not enabled") - } + gv := v1beta1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go index 12da75970cc0..2d1d549395b9 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) // StorageClassesGetter has a method to return a StorageClassInterface. @@ -93,7 +93,7 @@ func (c *storageClasses) Delete(name string, options *v1.DeleteOptions) error { func (c *storageClasses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("storageclasses"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -105,7 +105,7 @@ func (c *storageClasses) Get(name string, options v1.GetOptions) (result *v1beta err = c.client.Get(). Resource("storageclasses"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -116,7 +116,7 @@ func (c *storageClasses) List(opts v1.ListOptions) (result *v1beta1.StorageClass result = &v1beta1.StorageClassList{} err = c.client.Get(). Resource("storageclasses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -127,7 +127,7 @@ func (c *storageClasses) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("storageclasses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/BUILD b/pkg/client/clientset_generated/internalclientset/BUILD index 909e72d86bac..28a55833e588 100644 --- a/pkg/client/clientset_generated/internalclientset/BUILD +++ b/pkg/client/clientset_generated/internalclientset/BUILD @@ -12,23 +12,9 @@ go_library( srcs = [ "clientset.go", "doc.go", - "import_known_versions.go", ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", - "//pkg/api/install:go_default_library", - "//pkg/apis/apps/install:go_default_library", - "//pkg/apis/authentication/install:go_default_library", - "//pkg/apis/authorization/install:go_default_library", - "//pkg/apis/autoscaling/install:go_default_library", - "//pkg/apis/batch/install:go_default_library", - "//pkg/apis/certificates/install:go_default_library", - "//pkg/apis/componentconfig/install:go_default_library", - "//pkg/apis/extensions/install:go_default_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/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", @@ -59,6 +45,7 @@ filegroup( srcs = [ ":package-srcs", "//pkg/client/clientset_generated/internalclientset/fake:all-srcs", + "//pkg/client/clientset_generated/internalclientset/scheme:all-srcs", "//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion:all-srcs", "//pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion:all-srcs", "//pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion:all-srcs", diff --git a/pkg/client/clientset_generated/internalclientset/clientset.go b/pkg/client/clientset_generated/internalclientset/clientset.go index e00b26b6c31e..dfba4a8166bb 100644 --- a/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/pkg/client/clientset_generated/internalclientset/clientset.go @@ -17,67 +17,57 @@ limitations under the License. package internalclientset import ( - "github.com/golang/glog" + glog "github.com/golang/glog" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" - "k8s.io/client-go/util/flowcontrol" - 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" + flowcontrol "k8s.io/client-go/util/flowcontrol" + appsinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" + authenticationinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion" + authorizationinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion" + autoscalinginternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion" + batchinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" + certificatesinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion" + coreinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + extensionsinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" + policyinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" + rbacinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion" + storageinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion" ) type Interface interface { Discovery() discovery.DiscoveryInterface - 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 + Core() coreinternalversion.CoreInterface + Apps() appsinternalversion.AppsInterface + Authentication() authenticationinternalversion.AuthenticationInterface + Authorization() authorizationinternalversion.AuthorizationInterface + Autoscaling() autoscalinginternalversion.AutoscalingInterface + Batch() batchinternalversion.BatchInterface + Certificates() certificatesinternalversion.CertificatesInterface + Extensions() extensionsinternalversion.ExtensionsInterface + Policy() policyinternalversion.PolicyInterface + Rbac() rbacinternalversion.RbacInterface + Storage() storageinternalversion.StorageInterface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *internalversioncore.CoreClient - *internalversionapps.AppsClient - *internalversionauthentication.AuthenticationClient - *internalversionauthorization.AuthorizationClient - *internalversionautoscaling.AutoscalingClient - *internalversionbatch.BatchClient - *internalversioncertificates.CertificatesClient - *internalversionextensions.ExtensionsClient - *internalversionpolicy.PolicyClient - *internalversionrbac.RbacClient - *internalversionstorage.StorageClient + *coreinternalversion.CoreClient + *appsinternalversion.AppsClient + *authenticationinternalversion.AuthenticationClient + *authorizationinternalversion.AuthorizationClient + *autoscalinginternalversion.AutoscalingClient + *batchinternalversion.BatchClient + *certificatesinternalversion.CertificatesClient + *extensionsinternalversion.ExtensionsClient + *policyinternalversion.PolicyClient + *rbacinternalversion.RbacClient + *storageinternalversion.StorageClient } // Core retrieves the CoreClient -func (c *Clientset) Core() internalversioncore.CoreInterface { +func (c *Clientset) Core() coreinternalversion.CoreInterface { if c == nil { return nil } @@ -85,7 +75,7 @@ func (c *Clientset) Core() internalversioncore.CoreInterface { } // Apps retrieves the AppsClient -func (c *Clientset) Apps() internalversionapps.AppsInterface { +func (c *Clientset) Apps() appsinternalversion.AppsInterface { if c == nil { return nil } @@ -93,7 +83,7 @@ func (c *Clientset) Apps() internalversionapps.AppsInterface { } // Authentication retrieves the AuthenticationClient -func (c *Clientset) Authentication() internalversionauthentication.AuthenticationInterface { +func (c *Clientset) Authentication() authenticationinternalversion.AuthenticationInterface { if c == nil { return nil } @@ -101,7 +91,7 @@ func (c *Clientset) Authentication() internalversionauthentication.Authenticatio } // Authorization retrieves the AuthorizationClient -func (c *Clientset) Authorization() internalversionauthorization.AuthorizationInterface { +func (c *Clientset) Authorization() authorizationinternalversion.AuthorizationInterface { if c == nil { return nil } @@ -109,7 +99,7 @@ func (c *Clientset) Authorization() internalversionauthorization.AuthorizationIn } // Autoscaling retrieves the AutoscalingClient -func (c *Clientset) Autoscaling() internalversionautoscaling.AutoscalingInterface { +func (c *Clientset) Autoscaling() autoscalinginternalversion.AutoscalingInterface { if c == nil { return nil } @@ -117,7 +107,7 @@ func (c *Clientset) Autoscaling() internalversionautoscaling.AutoscalingInterfac } // Batch retrieves the BatchClient -func (c *Clientset) Batch() internalversionbatch.BatchInterface { +func (c *Clientset) Batch() batchinternalversion.BatchInterface { if c == nil { return nil } @@ -125,7 +115,7 @@ func (c *Clientset) Batch() internalversionbatch.BatchInterface { } // Certificates retrieves the CertificatesClient -func (c *Clientset) Certificates() internalversioncertificates.CertificatesInterface { +func (c *Clientset) Certificates() certificatesinternalversion.CertificatesInterface { if c == nil { return nil } @@ -133,7 +123,7 @@ func (c *Clientset) Certificates() internalversioncertificates.CertificatesInter } // Extensions retrieves the ExtensionsClient -func (c *Clientset) Extensions() internalversionextensions.ExtensionsInterface { +func (c *Clientset) Extensions() extensionsinternalversion.ExtensionsInterface { if c == nil { return nil } @@ -141,7 +131,7 @@ func (c *Clientset) Extensions() internalversionextensions.ExtensionsInterface { } // Policy retrieves the PolicyClient -func (c *Clientset) Policy() internalversionpolicy.PolicyInterface { +func (c *Clientset) Policy() policyinternalversion.PolicyInterface { if c == nil { return nil } @@ -149,7 +139,7 @@ func (c *Clientset) Policy() internalversionpolicy.PolicyInterface { } // Rbac retrieves the RbacClient -func (c *Clientset) Rbac() internalversionrbac.RbacInterface { +func (c *Clientset) Rbac() rbacinternalversion.RbacInterface { if c == nil { return nil } @@ -157,7 +147,7 @@ func (c *Clientset) Rbac() internalversionrbac.RbacInterface { } // Storage retrieves the StorageClient -func (c *Clientset) Storage() internalversionstorage.StorageInterface { +func (c *Clientset) Storage() storageinternalversion.StorageInterface { if c == nil { return nil } @@ -180,47 +170,47 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.CoreClient, err = internalversioncore.NewForConfig(&configShallowCopy) + cs.CoreClient, err = coreinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AppsClient, err = internalversionapps.NewForConfig(&configShallowCopy) + cs.AppsClient, err = appsinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AuthenticationClient, err = internalversionauthentication.NewForConfig(&configShallowCopy) + cs.AuthenticationClient, err = authenticationinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AuthorizationClient, err = internalversionauthorization.NewForConfig(&configShallowCopy) + cs.AuthorizationClient, err = authorizationinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.AutoscalingClient, err = internalversionautoscaling.NewForConfig(&configShallowCopy) + cs.AutoscalingClient, err = autoscalinginternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.BatchClient, err = internalversionbatch.NewForConfig(&configShallowCopy) + cs.BatchClient, err = batchinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.CertificatesClient, err = internalversioncertificates.NewForConfig(&configShallowCopy) + cs.CertificatesClient, err = certificatesinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.ExtensionsClient, err = internalversionextensions.NewForConfig(&configShallowCopy) + cs.ExtensionsClient, err = extensionsinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.PolicyClient, err = internalversionpolicy.NewForConfig(&configShallowCopy) + cs.PolicyClient, err = policyinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.RbacClient, err = internalversionrbac.NewForConfig(&configShallowCopy) + cs.RbacClient, err = rbacinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } - cs.StorageClient, err = internalversionstorage.NewForConfig(&configShallowCopy) + cs.StorageClient, err = storageinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -237,17 +227,17 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset - cs.CoreClient = internalversioncore.NewForConfigOrDie(c) - cs.AppsClient = internalversionapps.NewForConfigOrDie(c) - cs.AuthenticationClient = internalversionauthentication.NewForConfigOrDie(c) - cs.AuthorizationClient = internalversionauthorization.NewForConfigOrDie(c) - cs.AutoscalingClient = internalversionautoscaling.NewForConfigOrDie(c) - cs.BatchClient = internalversionbatch.NewForConfigOrDie(c) - cs.CertificatesClient = internalversioncertificates.NewForConfigOrDie(c) - cs.ExtensionsClient = internalversionextensions.NewForConfigOrDie(c) - cs.PolicyClient = internalversionpolicy.NewForConfigOrDie(c) - cs.RbacClient = internalversionrbac.NewForConfigOrDie(c) - cs.StorageClient = internalversionstorage.NewForConfigOrDie(c) + cs.CoreClient = coreinternalversion.NewForConfigOrDie(c) + cs.AppsClient = appsinternalversion.NewForConfigOrDie(c) + cs.AuthenticationClient = authenticationinternalversion.NewForConfigOrDie(c) + cs.AuthorizationClient = authorizationinternalversion.NewForConfigOrDie(c) + cs.AutoscalingClient = autoscalinginternalversion.NewForConfigOrDie(c) + cs.BatchClient = batchinternalversion.NewForConfigOrDie(c) + cs.CertificatesClient = certificatesinternalversion.NewForConfigOrDie(c) + cs.ExtensionsClient = extensionsinternalversion.NewForConfigOrDie(c) + cs.PolicyClient = policyinternalversion.NewForConfigOrDie(c) + cs.RbacClient = rbacinternalversion.NewForConfigOrDie(c) + cs.StorageClient = storageinternalversion.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -256,17 +246,17 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.CoreClient = internalversioncore.New(c) - cs.AppsClient = internalversionapps.New(c) - cs.AuthenticationClient = internalversionauthentication.New(c) - cs.AuthorizationClient = internalversionauthorization.New(c) - cs.AutoscalingClient = internalversionautoscaling.New(c) - cs.BatchClient = internalversionbatch.New(c) - cs.CertificatesClient = internalversioncertificates.New(c) - cs.ExtensionsClient = internalversionextensions.New(c) - cs.PolicyClient = internalversionpolicy.New(c) - cs.RbacClient = internalversionrbac.New(c) - cs.StorageClient = internalversionstorage.New(c) + cs.CoreClient = coreinternalversion.New(c) + cs.AppsClient = appsinternalversion.New(c) + cs.AuthenticationClient = authenticationinternalversion.New(c) + cs.AuthorizationClient = authorizationinternalversion.New(c) + cs.AutoscalingClient = autoscalinginternalversion.New(c) + cs.BatchClient = batchinternalversion.New(c) + cs.CertificatesClient = certificatesinternalversion.New(c) + cs.ExtensionsClient = extensionsinternalversion.New(c) + cs.PolicyClient = policyinternalversion.New(c) + cs.RbacClient = rbacinternalversion.New(c) + cs.StorageClient = storageinternalversion.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go b/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go index 139f0f0f236a..2cc55322b81f 100644 --- a/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go +++ b/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go @@ -24,28 +24,28 @@ import ( "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - 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" + appsinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" + fakeappsinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake" + authenticationinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion" + fakeauthenticationinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake" + authorizationinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion" + fakeauthorizationinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake" + autoscalinginternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion" + fakeautoscalinginternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake" + batchinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" + fakebatchinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake" + certificatesinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion" + fakecertificatesinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake" + coreinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" + fakecoreinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake" + extensionsinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" + fakeextensionsinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake" + policyinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" + fakepolicyinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake" + rbacinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion" + fakerbacinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake" + storageinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion" + fakestorageinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. @@ -82,56 +82,56 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} // Core retrieves the CoreClient -func (c *Clientset) Core() internalversioncore.CoreInterface { - return &fakeinternalversioncore.FakeCore{Fake: &c.Fake} +func (c *Clientset) Core() coreinternalversion.CoreInterface { + return &fakecoreinternalversion.FakeCore{Fake: &c.Fake} } // Apps retrieves the AppsClient -func (c *Clientset) Apps() internalversionapps.AppsInterface { - return &fakeinternalversionapps.FakeApps{Fake: &c.Fake} +func (c *Clientset) Apps() appsinternalversion.AppsInterface { + return &fakeappsinternalversion.FakeApps{Fake: &c.Fake} } // Authentication retrieves the AuthenticationClient -func (c *Clientset) Authentication() internalversionauthentication.AuthenticationInterface { - return &fakeinternalversionauthentication.FakeAuthentication{Fake: &c.Fake} +func (c *Clientset) Authentication() authenticationinternalversion.AuthenticationInterface { + return &fakeauthenticationinternalversion.FakeAuthentication{Fake: &c.Fake} } // Authorization retrieves the AuthorizationClient -func (c *Clientset) Authorization() internalversionauthorization.AuthorizationInterface { - return &fakeinternalversionauthorization.FakeAuthorization{Fake: &c.Fake} +func (c *Clientset) Authorization() authorizationinternalversion.AuthorizationInterface { + return &fakeauthorizationinternalversion.FakeAuthorization{Fake: &c.Fake} } // Autoscaling retrieves the AutoscalingClient -func (c *Clientset) Autoscaling() internalversionautoscaling.AutoscalingInterface { - return &fakeinternalversionautoscaling.FakeAutoscaling{Fake: &c.Fake} +func (c *Clientset) Autoscaling() autoscalinginternalversion.AutoscalingInterface { + return &fakeautoscalinginternalversion.FakeAutoscaling{Fake: &c.Fake} } // Batch retrieves the BatchClient -func (c *Clientset) Batch() internalversionbatch.BatchInterface { - return &fakeinternalversionbatch.FakeBatch{Fake: &c.Fake} +func (c *Clientset) Batch() batchinternalversion.BatchInterface { + return &fakebatchinternalversion.FakeBatch{Fake: &c.Fake} } // Certificates retrieves the CertificatesClient -func (c *Clientset) Certificates() internalversioncertificates.CertificatesInterface { - return &fakeinternalversioncertificates.FakeCertificates{Fake: &c.Fake} +func (c *Clientset) Certificates() certificatesinternalversion.CertificatesInterface { + return &fakecertificatesinternalversion.FakeCertificates{Fake: &c.Fake} } // Extensions retrieves the ExtensionsClient -func (c *Clientset) Extensions() internalversionextensions.ExtensionsInterface { - return &fakeinternalversionextensions.FakeExtensions{Fake: &c.Fake} +func (c *Clientset) Extensions() extensionsinternalversion.ExtensionsInterface { + return &fakeextensionsinternalversion.FakeExtensions{Fake: &c.Fake} } // Policy retrieves the PolicyClient -func (c *Clientset) Policy() internalversionpolicy.PolicyInterface { - return &fakeinternalversionpolicy.FakePolicy{Fake: &c.Fake} +func (c *Clientset) Policy() policyinternalversion.PolicyInterface { + return &fakepolicyinternalversion.FakePolicy{Fake: &c.Fake} } // Rbac retrieves the RbacClient -func (c *Clientset) Rbac() internalversionrbac.RbacInterface { - return &fakeinternalversionrbac.FakeRbac{Fake: &c.Fake} +func (c *Clientset) Rbac() rbacinternalversion.RbacInterface { + return &fakerbacinternalversion.FakeRbac{Fake: &c.Fake} } // Storage retrieves the StorageClient -func (c *Clientset) Storage() internalversionstorage.StorageInterface { - return &fakeinternalversionstorage.FakeStorage{Fake: &c.Fake} +func (c *Clientset) Storage() storageinternalversion.StorageInterface { + return &fakestorageinternalversion.FakeStorage{Fake: &c.Fake} } diff --git a/pkg/client/clientset_generated/internalclientset/import_known_versions.go b/pkg/client/clientset_generated/internalclientset/import_known_versions.go deleted file mode 100644 index 4aa24c40837a..000000000000 --- a/pkg/client/clientset_generated/internalclientset/import_known_versions.go +++ /dev/null @@ -1,42 +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 internalclientset - -// These imports are the API groups the client will support. -import ( - "fmt" - - "k8s.io/kubernetes/pkg/api" - _ "k8s.io/kubernetes/pkg/api/install" - _ "k8s.io/kubernetes/pkg/apis/apps/install" - _ "k8s.io/kubernetes/pkg/apis/authentication/install" - _ "k8s.io/kubernetes/pkg/apis/authorization/install" - _ "k8s.io/kubernetes/pkg/apis/autoscaling/install" - _ "k8s.io/kubernetes/pkg/apis/batch/install" - _ "k8s.io/kubernetes/pkg/apis/certificates/install" - _ "k8s.io/kubernetes/pkg/apis/componentconfig/install" - _ "k8s.io/kubernetes/pkg/apis/extensions/install" - _ "k8s.io/kubernetes/pkg/apis/policy/install" - _ "k8s.io/kubernetes/pkg/apis/rbac/install" - _ "k8s.io/kubernetes/pkg/apis/storage/install" -) - -func init() { - if missingVersions := api.Registry.ValidateEnvRequestedVersions(); len(missingVersions) != 0 { - panic(fmt.Sprintf("KUBE_API_VERSIONS contains versions that are not installed: %q.", missingVersions)) - } -} diff --git a/pkg/client/clientset_generated/internalclientset/scheme/BUILD b/pkg/client/clientset_generated/internalclientset/scheme/BUILD new file mode 100644 index 000000000000..ad71b89d38eb --- /dev/null +++ b/pkg/client/clientset_generated/internalclientset/scheme/BUILD @@ -0,0 +1,51 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "doc.go", + "register.go", + "register_custom.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/api/install:go_default_library", + "//pkg/apis/apps/install:go_default_library", + "//pkg/apis/authentication/install:go_default_library", + "//pkg/apis/authorization/install:go_default_library", + "//pkg/apis/autoscaling/install:go_default_library", + "//pkg/apis/batch/install:go_default_library", + "//pkg/apis/certificates/install:go_default_library", + "//pkg/apis/componentconfig/install:go_default_library", + "//pkg/apis/extensions/install:go_default_library", + "//pkg/apis/policy/install:go_default_library", + "//pkg/apis/rbac/install:go_default_library", + "//pkg/apis/storage/install:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/pkg/client/clientset_generated/internalclientset/scheme/doc.go b/pkg/client/clientset_generated/internalclientset/scheme/doc.go new file mode 100644 index 000000000000..99b0eae18888 --- /dev/null +++ b/pkg/client/clientset_generated/internalclientset/scheme/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2017 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 contains the scheme of the automatically generated clientset. +package scheme diff --git a/pkg/client/clientset_generated/internalclientset/scheme/register.go b/pkg/client/clientset_generated/internalclientset/scheme/register.go new file mode 100644 index 000000000000..f4140bf9f077 --- /dev/null +++ b/pkg/client/clientset_generated/internalclientset/scheme/register.go @@ -0,0 +1,67 @@ +/* +Copyright 2017 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 scheme + +import ( + announced "k8s.io/apimachinery/pkg/apimachinery/announced" + registered "k8s.io/apimachinery/pkg/apimachinery/registered" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" + serializer "k8s.io/apimachinery/pkg/runtime/serializer" + core "k8s.io/kubernetes/pkg/api/install" + apps "k8s.io/kubernetes/pkg/apis/apps/install" + authentication "k8s.io/kubernetes/pkg/apis/authentication/install" + authorization "k8s.io/kubernetes/pkg/apis/authorization/install" + autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/install" + batch "k8s.io/kubernetes/pkg/apis/batch/install" + certificates "k8s.io/kubernetes/pkg/apis/certificates/install" + extensions "k8s.io/kubernetes/pkg/apis/extensions/install" + policy "k8s.io/kubernetes/pkg/apis/policy/install" + rbac "k8s.io/kubernetes/pkg/apis/rbac/install" + storage "k8s.io/kubernetes/pkg/apis/storage/install" + os "os" +) + +var Scheme = runtime.NewScheme() +var Codecs = serializer.NewCodecFactory(Scheme) +var ParameterCodec = runtime.NewParameterCodec(Scheme) + +var Registry = registered.NewOrDie(os.Getenv("KUBE_API_VERSIONS")) +var GroupFactoryRegistry = make(announced.APIGroupFactoryRegistry) + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + Install(GroupFactoryRegistry, Registry, Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { + core.Install(groupFactoryRegistry, registry, scheme) + apps.Install(groupFactoryRegistry, registry, scheme) + authentication.Install(groupFactoryRegistry, registry, scheme) + authorization.Install(groupFactoryRegistry, registry, scheme) + autoscaling.Install(groupFactoryRegistry, registry, scheme) + batch.Install(groupFactoryRegistry, registry, scheme) + certificates.Install(groupFactoryRegistry, registry, scheme) + extensions.Install(groupFactoryRegistry, registry, scheme) + policy.Install(groupFactoryRegistry, registry, scheme) + rbac.Install(groupFactoryRegistry, registry, scheme) + storage.Install(groupFactoryRegistry, registry, scheme) + + ExtraInstall(groupFactoryRegistry, registry, scheme) +} diff --git a/pkg/client/clientset_generated/internalclientset/scheme/register_custom.go b/pkg/client/clientset_generated/internalclientset/scheme/register_custom.go new file mode 100644 index 000000000000..d54eb1ccefb7 --- /dev/null +++ b/pkg/client/clientset_generated/internalclientset/scheme/register_custom.go @@ -0,0 +1,29 @@ +/* +Copyright 2017 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 scheme + +import ( + "k8s.io/apimachinery/pkg/apimachinery/announced" + "k8s.io/apimachinery/pkg/apimachinery/registered" + "k8s.io/apimachinery/pkg/runtime" + componentconfig "k8s.io/kubernetes/pkg/apis/componentconfig/install" +) + +func ExtraInstall(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { + // componentconfig is an apigroup, but we don't have an API endpoint because its objects are just embedded in ConfigMaps. + componentconfig.Install(groupFactoryRegistry, registry, scheme) +} diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD index a8f6c124d91a..db87b997438e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/BUILD @@ -17,8 +17,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/apps:go_default_library", + "//pkg/client/clientset_generated/internalclientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go index df9653ad461e..7c948201932e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/apps_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) type AppsInterface interface { @@ -64,20 +64,20 @@ func New(c rest.Interface) *AppsClient { } func setConfigDefaults(config *rest.Config) error { - // if apps group is not registered, return an error - g, err := api.Registry.Group("apps") + g, err := scheme.Registry.Group("apps") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -85,6 +85,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go index 471cc843a6ec..a4d959a8468a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/statefulset.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" apps "k8s.io/kubernetes/pkg/apis/apps" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // StatefulSetsGetter has a method to return a StatefulSetInterface. @@ -116,7 +116,7 @@ func (c *statefulSets) DeleteCollection(options *v1.DeleteOptions, listOptions v return c.client.Delete(). Namespace(c.ns). Resource("statefulsets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *statefulSets) Get(name string, options v1.GetOptions) (result *apps.Sta Namespace(c.ns). Resource("statefulsets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *statefulSets) List(opts v1.ListOptions) (result *apps.StatefulSetList, err = c.client.Get(). Namespace(c.ns). Resource("statefulsets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *statefulSets) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("statefulsets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD index 89dbc89116e7..b69e9219468f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/BUILD @@ -18,8 +18,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/authentication:go_default_library", + "//pkg/client/clientset_generated/internalclientset/scheme:go_default_library", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go index ea971cd67a09..709621a10da6 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/authentication_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) type AuthenticationInterface interface { @@ -64,20 +64,20 @@ func New(c rest.Interface) *AuthenticationClient { } func setConfigDefaults(config *rest.Config) error { - // if authentication group is not registered, return an error - g, err := api.Registry.Group("authentication.k8s.io") + g, err := scheme.Registry.Group("authentication.k8s.io") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -85,6 +85,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD index 7701656a15c6..4c94e2a3adb9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/BUILD @@ -22,8 +22,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/authorization:go_default_library", + "//pkg/client/clientset_generated/internalclientset/scheme:go_default_library", "//vendor:k8s.io/client-go/rest", ], ) diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go index 9bbd05411c70..b3ee68f467ac 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/authorization_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) type AuthorizationInterface interface { @@ -74,20 +74,20 @@ func New(c rest.Interface) *AuthorizationClient { } func setConfigDefaults(config *rest.Config) error { - // if authorization group is not registered, return an error - g, err := api.Registry.Group("authorization.k8s.io") + g, err := scheme.Registry.Group("authorization.k8s.io") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -95,6 +95,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD index d5f2d174d6e8..5b42e7e9b5c8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/BUILD @@ -17,8 +17,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/autoscaling:go_default_library", + "//pkg/client/clientset_generated/internalclientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go index 325e11ba0209..e0752ab5ff5b 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/autoscaling_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) type AutoscalingInterface interface { @@ -64,20 +64,20 @@ func New(c rest.Interface) *AutoscalingClient { } func setConfigDefaults(config *rest.Config) error { - // if autoscaling group is not registered, return an error - g, err := api.Registry.Group("autoscaling") + g, err := scheme.Registry.Group("autoscaling") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -85,6 +85,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go index e0b8b0b17f2f..bada1520f714 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/horizontalpodautoscaler.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // HorizontalPodAutoscalersGetter has a method to return a HorizontalPodAutoscalerInterface. @@ -116,7 +116,7 @@ func (c *horizontalPodAutoscalers) DeleteCollection(options *v1.DeleteOptions, l return c.client.Delete(). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *horizontalPodAutoscalers) Get(name string, options v1.GetOptions) (resu Namespace(c.ns). Resource("horizontalpodautoscalers"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *horizontalPodAutoscalers) List(opts v1.ListOptions) (result *autoscalin err = c.client.Get(). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *horizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interface, Prefix("watch"). Namespace(c.ns). Resource("horizontalpodautoscalers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD index ddad53204723..d7d0daeb5fb3 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/BUILD @@ -18,8 +18,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/client/clientset_generated/internalclientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go index 90866b44fbee..97be023a7bac 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/batch_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) type BatchInterface interface { @@ -69,20 +69,20 @@ func New(c rest.Interface) *BatchClient { } func setConfigDefaults(config *rest.Config) error { - // if batch group is not registered, return an error - g, err := api.Registry.Group("batch") + g, err := scheme.Registry.Group("batch") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -90,6 +90,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go index 0b7048c8d81f..7df0cf879656 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/cronjob.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" batch "k8s.io/kubernetes/pkg/apis/batch" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // CronJobsGetter has a method to return a CronJobInterface. @@ -116,7 +116,7 @@ func (c *cronJobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.Li return c.client.Delete(). Namespace(c.ns). Resource("cronjobs"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *cronJobs) Get(name string, options v1.GetOptions) (result *batch.CronJo Namespace(c.ns). Resource("cronjobs"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *cronJobs) List(opts v1.ListOptions) (result *batch.CronJobList, err err err = c.client.Get(). Namespace(c.ns). Resource("cronjobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *cronJobs) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("cronjobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go index 2b0c4a7d233d..e7da9d7a8812 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/job.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" batch "k8s.io/kubernetes/pkg/apis/batch" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // JobsGetter has a method to return a JobInterface. @@ -116,7 +116,7 @@ func (c *jobs) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOp return c.client.Delete(). Namespace(c.ns). Resource("jobs"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *jobs) Get(name string, options v1.GetOptions) (result *batch.Job, err e Namespace(c.ns). Resource("jobs"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *jobs) List(opts v1.ListOptions) (result *batch.JobList, err error) { err = c.client.Get(). Namespace(c.ns). Resource("jobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *jobs) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("jobs"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD index baf0d8510d8b..58d61399d6c1 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/BUILD @@ -18,8 +18,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/certificates:go_default_library", + "//pkg/client/clientset_generated/internalclientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go index 692461bc6915..53e6142d0c0f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificates_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) type CertificatesInterface interface { @@ -64,20 +64,20 @@ func New(c rest.Interface) *CertificatesClient { } func setConfigDefaults(config *rest.Config) error { - // if certificates group is not registered, return an error - g, err := api.Registry.Group("certificates.k8s.io") + g, err := scheme.Registry.Group("certificates.k8s.io") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -85,6 +85,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go index c1d5c037f5c5..d5e1cd3bd772 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/certificatesigningrequest.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" certificates "k8s.io/kubernetes/pkg/apis/certificates" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // CertificateSigningRequestsGetter has a method to return a CertificateSigningRequestInterface. @@ -109,7 +109,7 @@ func (c *certificateSigningRequests) Delete(name string, options *v1.DeleteOptio func (c *certificateSigningRequests) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("certificatesigningrequests"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -121,7 +121,7 @@ func (c *certificateSigningRequests) Get(name string, options v1.GetOptions) (re err = c.client.Get(). Resource("certificatesigningrequests"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -132,7 +132,7 @@ func (c *certificateSigningRequests) List(opts v1.ListOptions) (result *certific result = &certificates.CertificateSigningRequestList{} err = c.client.Get(). Resource("certificatesigningrequests"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -143,7 +143,7 @@ func (c *certificateSigningRequests) Watch(opts v1.ListOptions) (watch.Interface return c.client.Get(). Prefix("watch"). Resource("certificatesigningrequests"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD index cbde75b71aec..1aaf08d8d9c8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/BUILD @@ -39,6 +39,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/client/clientset_generated/internalclientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go index ca48c86f5e80..a057c3e49d2a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/componentstatus.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // ComponentStatusesGetter has a method to return a ComponentStatusInterface. @@ -92,7 +93,7 @@ func (c *componentStatuses) Delete(name string, options *v1.DeleteOptions) error func (c *componentStatuses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("componentstatuses"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -104,7 +105,7 @@ func (c *componentStatuses) Get(name string, options v1.GetOptions) (result *api err = c.client.Get(). Resource("componentstatuses"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -115,7 +116,7 @@ func (c *componentStatuses) List(opts v1.ListOptions) (result *api.ComponentStat result = &api.ComponentStatusList{} err = c.client.Get(). Resource("componentstatuses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -126,7 +127,7 @@ func (c *componentStatuses) Watch(opts v1.ListOptions) (watch.Interface, error) return c.client.Get(). Prefix("watch"). Resource("componentstatuses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go index cf9b31f0eb7a..1bb0b03ac869 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/configmap.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // ConfigMapsGetter has a method to return a ConfigMapInterface. @@ -98,7 +99,7 @@ func (c *configMaps) DeleteCollection(options *v1.DeleteOptions, listOptions v1. return c.client.Delete(). Namespace(c.ns). Resource("configmaps"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -111,7 +112,7 @@ func (c *configMaps) Get(name string, options v1.GetOptions) (result *api.Config Namespace(c.ns). Resource("configmaps"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -123,7 +124,7 @@ func (c *configMaps) List(opts v1.ListOptions) (result *api.ConfigMapList, err e err = c.client.Get(). Namespace(c.ns). Resource("configmaps"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -135,7 +136,7 @@ func (c *configMaps) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("configmaps"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go index b20f00053ddc..10313c3cb626 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/core_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) type CoreInterface interface { @@ -139,20 +139,20 @@ func New(c rest.Interface) *CoreClient { } func setConfigDefaults(config *rest.Config) error { - // if core group is not registered, return an error - g, err := api.Registry.Group("") + g, err := scheme.Registry.Group("") if err != nil { return err } + config.APIPath = "/api" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -160,6 +160,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go index 0ab38b36e012..9dc0d6e117cc 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/endpoints.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // EndpointsGetter has a method to return a EndpointsInterface. @@ -98,7 +99,7 @@ func (c *endpoints) DeleteCollection(options *v1.DeleteOptions, listOptions v1.L return c.client.Delete(). Namespace(c.ns). Resource("endpoints"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -111,7 +112,7 @@ func (c *endpoints) Get(name string, options v1.GetOptions) (result *api.Endpoin Namespace(c.ns). Resource("endpoints"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -123,7 +124,7 @@ func (c *endpoints) List(opts v1.ListOptions) (result *api.EndpointsList, err er err = c.client.Get(). Namespace(c.ns). Resource("endpoints"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -135,7 +136,7 @@ func (c *endpoints) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("endpoints"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go index 1159ca37b2bc..537dcfb46bf0 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/event.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // EventsGetter has a method to return a EventInterface. @@ -98,7 +99,7 @@ func (c *events) DeleteCollection(options *v1.DeleteOptions, listOptions v1.List return c.client.Delete(). Namespace(c.ns). Resource("events"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -111,7 +112,7 @@ func (c *events) Get(name string, options v1.GetOptions) (result *api.Event, err Namespace(c.ns). Resource("events"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -123,7 +124,7 @@ func (c *events) List(opts v1.ListOptions) (result *api.EventList, err error) { err = c.client.Get(). Namespace(c.ns). Resource("events"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -135,7 +136,7 @@ func (c *events) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("events"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go index e5b47fc25567..6e84744e5c63 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/limitrange.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // LimitRangesGetter has a method to return a LimitRangeInterface. @@ -98,7 +99,7 @@ func (c *limitRanges) DeleteCollection(options *v1.DeleteOptions, listOptions v1 return c.client.Delete(). Namespace(c.ns). Resource("limitranges"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -111,7 +112,7 @@ func (c *limitRanges) Get(name string, options v1.GetOptions) (result *api.Limit Namespace(c.ns). Resource("limitranges"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -123,7 +124,7 @@ func (c *limitRanges) List(opts v1.ListOptions) (result *api.LimitRangeList, err err = c.client.Get(). Namespace(c.ns). Resource("limitranges"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -135,7 +136,7 @@ func (c *limitRanges) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("limitranges"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go index fbcdd1407639..9c9361ef8a07 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/namespace.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // NamespacesGetter has a method to return a NamespaceInterface. @@ -108,7 +109,7 @@ func (c *namespaces) Delete(name string, options *v1.DeleteOptions) error { func (c *namespaces) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("namespaces"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -120,7 +121,7 @@ func (c *namespaces) Get(name string, options v1.GetOptions) (result *api.Namesp err = c.client.Get(). Resource("namespaces"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -131,7 +132,7 @@ func (c *namespaces) List(opts v1.ListOptions) (result *api.NamespaceList, err e result = &api.NamespaceList{} err = c.client.Get(). Resource("namespaces"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -142,7 +143,7 @@ func (c *namespaces) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("namespaces"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go index 39dce9e3e3c7..5cb761a7e2c0 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/node.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // NodesGetter has a method to return a NodeInterface. @@ -108,7 +109,7 @@ func (c *nodes) Delete(name string, options *v1.DeleteOptions) error { func (c *nodes) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("nodes"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -120,7 +121,7 @@ func (c *nodes) Get(name string, options v1.GetOptions) (result *api.Node, err e err = c.client.Get(). Resource("nodes"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -131,7 +132,7 @@ func (c *nodes) List(opts v1.ListOptions) (result *api.NodeList, err error) { result = &api.NodeList{} err = c.client.Get(). Resource("nodes"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -142,7 +143,7 @@ func (c *nodes) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("nodes"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go index 7e6698a1e91d..8d63c730f15e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolume.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // PersistentVolumesGetter has a method to return a PersistentVolumeInterface. @@ -108,7 +109,7 @@ func (c *persistentVolumes) Delete(name string, options *v1.DeleteOptions) error func (c *persistentVolumes) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("persistentvolumes"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -120,7 +121,7 @@ func (c *persistentVolumes) Get(name string, options v1.GetOptions) (result *api err = c.client.Get(). Resource("persistentvolumes"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -131,7 +132,7 @@ func (c *persistentVolumes) List(opts v1.ListOptions) (result *api.PersistentVol result = &api.PersistentVolumeList{} err = c.client.Get(). Resource("persistentvolumes"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -142,7 +143,7 @@ func (c *persistentVolumes) Watch(opts v1.ListOptions) (watch.Interface, error) return c.client.Get(). Prefix("watch"). Resource("persistentvolumes"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go index e3187cd39d9e..1138e87fc0fb 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/persistentvolumeclaim.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // PersistentVolumeClaimsGetter has a method to return a PersistentVolumeClaimInterface. @@ -115,7 +116,7 @@ func (c *persistentVolumeClaims) DeleteCollection(options *v1.DeleteOptions, lis return c.client.Delete(). Namespace(c.ns). Resource("persistentvolumeclaims"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -128,7 +129,7 @@ func (c *persistentVolumeClaims) Get(name string, options v1.GetOptions) (result Namespace(c.ns). Resource("persistentvolumeclaims"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -140,7 +141,7 @@ func (c *persistentVolumeClaims) List(opts v1.ListOptions) (result *api.Persiste err = c.client.Get(). Namespace(c.ns). Resource("persistentvolumeclaims"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -152,7 +153,7 @@ func (c *persistentVolumeClaims) Watch(opts v1.ListOptions) (watch.Interface, er Prefix("watch"). Namespace(c.ns). Resource("persistentvolumeclaims"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go index 56f3df944105..193a02f2eb0f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/pod.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // PodsGetter has a method to return a PodInterface. @@ -115,7 +116,7 @@ func (c *pods) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOp return c.client.Delete(). Namespace(c.ns). Resource("pods"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -128,7 +129,7 @@ func (c *pods) Get(name string, options v1.GetOptions) (result *api.Pod, err err Namespace(c.ns). Resource("pods"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -140,7 +141,7 @@ func (c *pods) List(opts v1.ListOptions) (result *api.PodList, err error) { err = c.client.Get(). Namespace(c.ns). Resource("pods"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -152,7 +153,7 @@ func (c *pods) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("pods"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go index 43b5b4303d70..79bb1572e810 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/podtemplate.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // PodTemplatesGetter has a method to return a PodTemplateInterface. @@ -98,7 +99,7 @@ func (c *podTemplates) DeleteCollection(options *v1.DeleteOptions, listOptions v return c.client.Delete(). Namespace(c.ns). Resource("podtemplates"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -111,7 +112,7 @@ func (c *podTemplates) Get(name string, options v1.GetOptions) (result *api.PodT Namespace(c.ns). Resource("podtemplates"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -123,7 +124,7 @@ func (c *podTemplates) List(opts v1.ListOptions) (result *api.PodTemplateList, e err = c.client.Get(). Namespace(c.ns). Resource("podtemplates"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -135,7 +136,7 @@ func (c *podTemplates) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("podtemplates"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go index 3b133aa13851..64008ae8b70c 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/replicationcontroller.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // ReplicationControllersGetter has a method to return a ReplicationControllerInterface. @@ -115,7 +116,7 @@ func (c *replicationControllers) DeleteCollection(options *v1.DeleteOptions, lis return c.client.Delete(). Namespace(c.ns). Resource("replicationcontrollers"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -128,7 +129,7 @@ func (c *replicationControllers) Get(name string, options v1.GetOptions) (result Namespace(c.ns). Resource("replicationcontrollers"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -140,7 +141,7 @@ func (c *replicationControllers) List(opts v1.ListOptions) (result *api.Replicat err = c.client.Get(). Namespace(c.ns). Resource("replicationcontrollers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -152,7 +153,7 @@ func (c *replicationControllers) Watch(opts v1.ListOptions) (watch.Interface, er Prefix("watch"). Namespace(c.ns). Resource("replicationcontrollers"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go index 850d7013a990..d2e13b9f7159 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/resourcequota.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // ResourceQuotasGetter has a method to return a ResourceQuotaInterface. @@ -115,7 +116,7 @@ func (c *resourceQuotas) DeleteCollection(options *v1.DeleteOptions, listOptions return c.client.Delete(). Namespace(c.ns). Resource("resourcequotas"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -128,7 +129,7 @@ func (c *resourceQuotas) Get(name string, options v1.GetOptions) (result *api.Re Namespace(c.ns). Resource("resourcequotas"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -140,7 +141,7 @@ func (c *resourceQuotas) List(opts v1.ListOptions) (result *api.ResourceQuotaLis err = c.client.Get(). Namespace(c.ns). Resource("resourcequotas"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -152,7 +153,7 @@ func (c *resourceQuotas) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("resourcequotas"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go index d91f0d9d6b4e..e45b7ec2284a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/secret.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // SecretsGetter has a method to return a SecretInterface. @@ -98,7 +99,7 @@ func (c *secrets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.Lis return c.client.Delete(). Namespace(c.ns). Resource("secrets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -111,7 +112,7 @@ func (c *secrets) Get(name string, options v1.GetOptions) (result *api.Secret, e Namespace(c.ns). Resource("secrets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -123,7 +124,7 @@ func (c *secrets) List(opts v1.ListOptions) (result *api.SecretList, err error) err = c.client.Get(). Namespace(c.ns). Resource("secrets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -135,7 +136,7 @@ func (c *secrets) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("secrets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go index abb74194196f..f555eab150c4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/service.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // ServicesGetter has a method to return a ServiceInterface. @@ -115,7 +116,7 @@ func (c *services) DeleteCollection(options *v1.DeleteOptions, listOptions v1.Li return c.client.Delete(). Namespace(c.ns). Resource("services"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -128,7 +129,7 @@ func (c *services) Get(name string, options v1.GetOptions) (result *api.Service, Namespace(c.ns). Resource("services"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -140,7 +141,7 @@ func (c *services) List(opts v1.ListOptions) (result *api.ServiceList, err error err = c.client.Get(). Namespace(c.ns). Resource("services"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -152,7 +153,7 @@ func (c *services) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("services"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go index 32aaff76adf3..6ed306e62cb2 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/serviceaccount.go @@ -22,6 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" api "k8s.io/kubernetes/pkg/api" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // ServiceAccountsGetter has a method to return a ServiceAccountInterface. @@ -98,7 +99,7 @@ func (c *serviceAccounts) DeleteCollection(options *v1.DeleteOptions, listOption return c.client.Delete(). Namespace(c.ns). Resource("serviceaccounts"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -111,7 +112,7 @@ func (c *serviceAccounts) Get(name string, options v1.GetOptions) (result *api.S Namespace(c.ns). Resource("serviceaccounts"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -123,7 +124,7 @@ func (c *serviceAccounts) List(opts v1.ListOptions) (result *api.ServiceAccountL err = c.client.Get(). Namespace(c.ns). Resource("serviceaccounts"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -135,7 +136,7 @@ func (c *serviceAccounts) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("serviceaccounts"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD index a9795f2eff1f..1ca3a3c6325d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/BUILD @@ -26,8 +26,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/client/clientset_generated/internalclientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go index e172f810bfc3..6f272838a199 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/daemonset.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // DaemonSetsGetter has a method to return a DaemonSetInterface. @@ -116,7 +116,7 @@ func (c *daemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1. return c.client.Delete(). Namespace(c.ns). Resource("daemonsets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *daemonSets) Get(name string, options v1.GetOptions) (result *extensions Namespace(c.ns). Resource("daemonsets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *daemonSets) List(opts v1.ListOptions) (result *extensions.DaemonSetList err = c.client.Get(). Namespace(c.ns). Resource("daemonsets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *daemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("daemonsets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go index cb525a953c82..eb9d44682211 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/deployment.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // DeploymentsGetter has a method to return a DeploymentInterface. @@ -116,7 +116,7 @@ func (c *deployments) DeleteCollection(options *v1.DeleteOptions, listOptions v1 return c.client.Delete(). Namespace(c.ns). Resource("deployments"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *deployments) Get(name string, options v1.GetOptions) (result *extension Namespace(c.ns). Resource("deployments"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *deployments) List(opts v1.ListOptions) (result *extensions.DeploymentLi err = c.client.Get(). Namespace(c.ns). Resource("deployments"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *deployments) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("deployments"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go index 31a0fddeffc7..90a1ef975df3 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/extensions_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) type ExtensionsInterface interface { @@ -99,20 +99,20 @@ func New(c rest.Interface) *ExtensionsClient { } func setConfigDefaults(config *rest.Config) error { - // if extensions group is not registered, return an error - g, err := api.Registry.Group("extensions") + g, err := scheme.Registry.Group("extensions") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -120,6 +120,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go index e1db937b03a2..7a6a7bc3638e 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/ingress.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // IngressesGetter has a method to return a IngressInterface. @@ -116,7 +116,7 @@ func (c *ingresses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.L return c.client.Delete(). Namespace(c.ns). Resource("ingresses"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *ingresses) Get(name string, options v1.GetOptions) (result *extensions. Namespace(c.ns). Resource("ingresses"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *ingresses) List(opts v1.ListOptions) (result *extensions.IngressList, e err = c.client.Get(). Namespace(c.ns). Resource("ingresses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *ingresses) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("ingresses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go index 4dcebc5126a7..2508119114d9 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/networkpolicy.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // NetworkPoliciesGetter has a method to return a NetworkPolicyInterface. @@ -99,7 +99,7 @@ func (c *networkPolicies) DeleteCollection(options *v1.DeleteOptions, listOption return c.client.Delete(). Namespace(c.ns). Resource("networkpolicies"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *networkPolicies) Get(name string, options v1.GetOptions) (result *exten Namespace(c.ns). Resource("networkpolicies"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *networkPolicies) List(opts v1.ListOptions) (result *extensions.NetworkP err = c.client.Get(). Namespace(c.ns). Resource("networkpolicies"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *networkPolicies) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("networkpolicies"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go index 27ed9afcdff5..7f30f1cd08be 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/podsecuritypolicy.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // PodSecurityPoliciesGetter has a method to return a PodSecurityPolicyInterface. @@ -93,7 +93,7 @@ func (c *podSecurityPolicies) Delete(name string, options *v1.DeleteOptions) err func (c *podSecurityPolicies) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("podsecuritypolicies"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -105,7 +105,7 @@ func (c *podSecurityPolicies) Get(name string, options v1.GetOptions) (result *e err = c.client.Get(). Resource("podsecuritypolicies"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -116,7 +116,7 @@ func (c *podSecurityPolicies) List(opts v1.ListOptions) (result *extensions.PodS result = &extensions.PodSecurityPolicyList{} err = c.client.Get(). Resource("podsecuritypolicies"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -127,7 +127,7 @@ func (c *podSecurityPolicies) Watch(opts v1.ListOptions) (watch.Interface, error return c.client.Get(). Prefix("watch"). Resource("podsecuritypolicies"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go index 35ad547e0c47..9161c48e4b6a 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/replicaset.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // ReplicaSetsGetter has a method to return a ReplicaSetInterface. @@ -116,7 +116,7 @@ func (c *replicaSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1 return c.client.Delete(). Namespace(c.ns). Resource("replicasets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *replicaSets) Get(name string, options v1.GetOptions) (result *extension Namespace(c.ns). Resource("replicasets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *replicaSets) List(opts v1.ListOptions) (result *extensions.ReplicaSetLi err = c.client.Get(). Namespace(c.ns). Resource("replicasets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *replicaSets) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("replicasets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go index 19259209a150..d7be18204817 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/thirdpartyresource.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" extensions "k8s.io/kubernetes/pkg/apis/extensions" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // ThirdPartyResourcesGetter has a method to return a ThirdPartyResourceInterface. @@ -93,7 +93,7 @@ func (c *thirdPartyResources) Delete(name string, options *v1.DeleteOptions) err func (c *thirdPartyResources) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("thirdpartyresources"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -105,7 +105,7 @@ func (c *thirdPartyResources) Get(name string, options v1.GetOptions) (result *e err = c.client.Get(). Resource("thirdpartyresources"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -116,7 +116,7 @@ func (c *thirdPartyResources) List(opts v1.ListOptions) (result *extensions.Thir result = &extensions.ThirdPartyResourceList{} err = c.client.Get(). Resource("thirdpartyresources"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -127,7 +127,7 @@ func (c *thirdPartyResources) Watch(opts v1.ListOptions) (watch.Interface, error return c.client.Get(). Prefix("watch"). Resource("thirdpartyresources"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD index d7b69bf29fea..1520da9621a1 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/BUILD @@ -19,8 +19,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/policy:go_default_library", + "//pkg/client/clientset_generated/internalclientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go index 8497076d1ddd..8ae3a7268a53 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/poddisruptionbudget.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" policy "k8s.io/kubernetes/pkg/apis/policy" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // PodDisruptionBudgetsGetter has a method to return a PodDisruptionBudgetInterface. @@ -116,7 +116,7 @@ func (c *podDisruptionBudgets) DeleteCollection(options *v1.DeleteOptions, listO return c.client.Delete(). Namespace(c.ns). Resource("poddisruptionbudgets"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -129,7 +129,7 @@ func (c *podDisruptionBudgets) Get(name string, options v1.GetOptions) (result * Namespace(c.ns). Resource("poddisruptionbudgets"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -141,7 +141,7 @@ func (c *podDisruptionBudgets) List(opts v1.ListOptions) (result *policy.PodDisr err = c.client.Get(). Namespace(c.ns). Resource("poddisruptionbudgets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -153,7 +153,7 @@ func (c *podDisruptionBudgets) Watch(opts v1.ListOptions) (watch.Interface, erro Prefix("watch"). Namespace(c.ns). Resource("poddisruptionbudgets"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go index 7a0e00735f6d..04c7b36e3520 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/policy_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) type PolicyInterface interface { @@ -69,20 +69,20 @@ func New(c rest.Interface) *PolicyClient { } func setConfigDefaults(config *rest.Config) error { - // if policy group is not registered, return an error - g, err := api.Registry.Group("policy") + g, err := scheme.Registry.Group("policy") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -90,6 +90,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD index 34142c085fea..0eb1ed7c4f49 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/BUILD @@ -20,8 +20,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", + "//pkg/client/clientset_generated/internalclientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go index 1352fe228b82..6099dff445ea 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrole.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" rbac "k8s.io/kubernetes/pkg/apis/rbac" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // ClusterRolesGetter has a method to return a ClusterRoleInterface. @@ -93,7 +93,7 @@ func (c *clusterRoles) Delete(name string, options *v1.DeleteOptions) error { func (c *clusterRoles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("clusterroles"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -105,7 +105,7 @@ func (c *clusterRoles) Get(name string, options v1.GetOptions) (result *rbac.Clu err = c.client.Get(). Resource("clusterroles"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -116,7 +116,7 @@ func (c *clusterRoles) List(opts v1.ListOptions) (result *rbac.ClusterRoleList, result = &rbac.ClusterRoleList{} err = c.client.Get(). Resource("clusterroles"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -127,7 +127,7 @@ func (c *clusterRoles) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("clusterroles"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go index 21d9be2fca03..467e4131a136 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/clusterrolebinding.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" rbac "k8s.io/kubernetes/pkg/apis/rbac" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // ClusterRoleBindingsGetter has a method to return a ClusterRoleBindingInterface. @@ -93,7 +93,7 @@ func (c *clusterRoleBindings) Delete(name string, options *v1.DeleteOptions) err func (c *clusterRoleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("clusterrolebindings"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -105,7 +105,7 @@ func (c *clusterRoleBindings) Get(name string, options v1.GetOptions) (result *r err = c.client.Get(). Resource("clusterrolebindings"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -116,7 +116,7 @@ func (c *clusterRoleBindings) List(opts v1.ListOptions) (result *rbac.ClusterRol result = &rbac.ClusterRoleBindingList{} err = c.client.Get(). Resource("clusterrolebindings"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -127,7 +127,7 @@ func (c *clusterRoleBindings) Watch(opts v1.ListOptions) (watch.Interface, error return c.client.Get(). Prefix("watch"). Resource("clusterrolebindings"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go index c5f6244bad18..6e5a608cf32b 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rbac_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) type RbacInterface interface { @@ -79,20 +79,20 @@ func New(c rest.Interface) *RbacClient { } func setConfigDefaults(config *rest.Config) error { - // if rbac group is not registered, return an error - g, err := api.Registry.Group("rbac.authorization.k8s.io") + g, err := scheme.Registry.Group("rbac.authorization.k8s.io") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -100,6 +100,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go index fb711e579627..09ef7cfb3aa0 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/role.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" rbac "k8s.io/kubernetes/pkg/apis/rbac" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // RolesGetter has a method to return a RoleInterface. @@ -99,7 +99,7 @@ func (c *roles) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListO return c.client.Delete(). Namespace(c.ns). Resource("roles"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *roles) Get(name string, options v1.GetOptions) (result *rbac.Role, err Namespace(c.ns). Resource("roles"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *roles) List(opts v1.ListOptions) (result *rbac.RoleList, err error) { err = c.client.Get(). Namespace(c.ns). Resource("roles"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *roles) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("roles"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go index 24c3fcb08074..ac505255a4d2 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/rolebinding.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" rbac "k8s.io/kubernetes/pkg/apis/rbac" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // RoleBindingsGetter has a method to return a RoleBindingInterface. @@ -99,7 +99,7 @@ func (c *roleBindings) DeleteCollection(options *v1.DeleteOptions, listOptions v return c.client.Delete(). Namespace(c.ns). Resource("rolebindings"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -112,7 +112,7 @@ func (c *roleBindings) Get(name string, options v1.GetOptions) (result *rbac.Rol Namespace(c.ns). Resource("rolebindings"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -124,7 +124,7 @@ func (c *roleBindings) List(opts v1.ListOptions) (result *rbac.RoleBindingList, err = c.client.Get(). Namespace(c.ns). Resource("rolebindings"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -136,7 +136,7 @@ func (c *roleBindings) Watch(opts v1.ListOptions) (watch.Interface, error) { Prefix("watch"). Namespace(c.ns). Resource("rolebindings"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD index 34ccef189b63..67f9b7eb02bc 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/BUILD @@ -17,8 +17,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", "//pkg/apis/storage:go_default_library", + "//pkg/client/clientset_generated/internalclientset/scheme:go_default_library", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go index 2b4a06a449d1..9eebff01a4c0 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storage_client.go @@ -18,7 +18,7 @@ package internalversion import ( rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) type StorageInterface interface { @@ -64,20 +64,20 @@ func New(c rest.Interface) *StorageClient { } func setConfigDefaults(config *rest.Config) error { - // if storage group is not registered, return an error - g, err := api.Registry.Group("storage.k8s.io") + g, err := scheme.Registry.Group("storage.k8s.io") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -85,6 +85,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go index b525106c0e23..f9045115d055 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/storageclass.go @@ -21,8 +21,8 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - api "k8s.io/kubernetes/pkg/api" storage "k8s.io/kubernetes/pkg/apis/storage" + scheme "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme" ) // StorageClassesGetter has a method to return a StorageClassInterface. @@ -93,7 +93,7 @@ func (c *storageClasses) Delete(name string, options *v1.DeleteOptions) error { func (c *storageClasses) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("storageclasses"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -105,7 +105,7 @@ func (c *storageClasses) Get(name string, options v1.GetOptions) (result *storag err = c.client.Get(). Resource("storageclasses"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -116,7 +116,7 @@ func (c *storageClasses) List(opts v1.ListOptions) (result *storage.StorageClass result = &storage.StorageClassList{} err = c.client.Get(). Resource("storageclasses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -127,7 +127,7 @@ func (c *storageClasses) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("storageclasses"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go index a8152868ae9c..79f163dbdbdf 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/clientset.go @@ -17,29 +17,29 @@ limitations under the License. package clientset import ( - "github.com/golang/glog" + glog "github.com/golang/glog" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" - "k8s.io/client-go/util/flowcontrol" - v1alpha1apiregistration "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" + flowcontrol "k8s.io/client-go/util/flowcontrol" + apiregistrationv1alpha1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" ) type Interface interface { Discovery() discovery.DiscoveryInterface - ApiregistrationV1alpha1() v1alpha1apiregistration.ApiregistrationV1alpha1Interface + ApiregistrationV1alpha1() apiregistrationv1alpha1.ApiregistrationV1alpha1Interface // Deprecated: please explicitly pick a version if possible. - Apiregistration() v1alpha1apiregistration.ApiregistrationV1alpha1Interface + Apiregistration() apiregistrationv1alpha1.ApiregistrationV1alpha1Interface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *v1alpha1apiregistration.ApiregistrationV1alpha1Client + *apiregistrationv1alpha1.ApiregistrationV1alpha1Client } // ApiregistrationV1alpha1 retrieves the ApiregistrationV1alpha1Client -func (c *Clientset) ApiregistrationV1alpha1() v1alpha1apiregistration.ApiregistrationV1alpha1Interface { +func (c *Clientset) ApiregistrationV1alpha1() apiregistrationv1alpha1.ApiregistrationV1alpha1Interface { if c == nil { return nil } @@ -48,7 +48,7 @@ func (c *Clientset) ApiregistrationV1alpha1() v1alpha1apiregistration.Apiregistr // Deprecated: Apiregistration retrieves the default version of ApiregistrationClient. // Please explicitly pick a version. -func (c *Clientset) Apiregistration() v1alpha1apiregistration.ApiregistrationV1alpha1Interface { +func (c *Clientset) Apiregistration() apiregistrationv1alpha1.ApiregistrationV1alpha1Interface { if c == nil { return nil } @@ -71,7 +71,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.ApiregistrationV1alpha1Client, err = v1alpha1apiregistration.NewForConfig(&configShallowCopy) + cs.ApiregistrationV1alpha1Client, err = apiregistrationv1alpha1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -88,7 +88,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset - cs.ApiregistrationV1alpha1Client = v1alpha1apiregistration.NewForConfigOrDie(c) + cs.ApiregistrationV1alpha1Client = apiregistrationv1alpha1.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -97,7 +97,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.ApiregistrationV1alpha1Client = v1alpha1apiregistration.New(c) + cs.ApiregistrationV1alpha1Client = apiregistrationv1alpha1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go index 7b64aeb27788..4d8ecd43ce06 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go @@ -24,8 +24,8 @@ import ( "k8s.io/client-go/pkg/api" "k8s.io/client-go/testing" clientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" - v1alpha1apiregistration "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" - fakev1alpha1apiregistration "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake" + apiregistrationv1alpha1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1" + fakeapiregistrationv1alpha1 "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. @@ -62,11 +62,11 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} // ApiregistrationV1alpha1 retrieves the ApiregistrationV1alpha1Client -func (c *Clientset) ApiregistrationV1alpha1() v1alpha1apiregistration.ApiregistrationV1alpha1Interface { - return &fakev1alpha1apiregistration.FakeApiregistrationV1alpha1{Fake: &c.Fake} +func (c *Clientset) ApiregistrationV1alpha1() apiregistrationv1alpha1.ApiregistrationV1alpha1Interface { + return &fakeapiregistrationv1alpha1.FakeApiregistrationV1alpha1{Fake: &c.Fake} } // Apiregistration retrieves the ApiregistrationV1alpha1Client -func (c *Clientset) Apiregistration() v1alpha1apiregistration.ApiregistrationV1alpha1Interface { - return &fakev1alpha1apiregistration.FakeApiregistrationV1alpha1{Fake: &c.Fake} +func (c *Clientset) Apiregistration() apiregistrationv1alpha1.ApiregistrationV1alpha1Interface { + return &fakeapiregistrationv1alpha1.FakeApiregistrationV1alpha1{Fake: &c.Fake} } diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/doc.go new file mode 100644 index 000000000000..5d8ec824f0fb --- /dev/null +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2017 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 custom arguments. + +// This package contains the scheme of the automatically generated clientset. +package scheme diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/register.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/register.go new file mode 100644 index 000000000000..f08109e7c69c --- /dev/null +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/register.go @@ -0,0 +1,53 @@ +/* +Copyright 2017 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 scheme + +import ( + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" + serializer "k8s.io/apimachinery/pkg/runtime/serializer" + apiregistrationv1alpha1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" +) + +var Scheme = runtime.NewScheme() +var Codecs = serializer.NewCodecFactory(Scheme) +var ParameterCodec = runtime.NewParameterCodec(Scheme) + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + AddToScheme(Scheme) +} + +// AddToScheme adds all types of this clientset into the given scheme. This allows composition +// of clientsets, like in: +// +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kuberentes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) +// +// kclientset, _ := kubernetes.NewForConfig(c) +// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// +// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types +// correctly. +func AddToScheme(scheme *runtime.Scheme) { + apiregistrationv1alpha1.AddToScheme(scheme) + +} diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go index 6ded1c21e010..7f5a7eb88b3c 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiregistration_client.go @@ -17,11 +17,10 @@ limitations under the License. package v1alpha1 import ( - fmt "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - api "k8s.io/client-go/pkg/api" rest "k8s.io/client-go/rest" + v1alpha1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" ) type ApiregistrationV1alpha1Interface interface { @@ -67,22 +66,14 @@ func New(c rest.Interface) *ApiregistrationV1alpha1Client { } func setConfigDefaults(config *rest.Config) error { - gv, err := schema.ParseGroupVersion("apiregistration.k8s.io/v1alpha1") - if err != nil { - return err - } - // if apiregistration.k8s.io/v1alpha1 is not enabled, return an error - if !api.Registry.IsEnabledVersion(gv) { - return fmt.Errorf("apiregistration.k8s.io/v1alpha1 is not enabled") - } + gv := v1alpha1.SchemeGroupVersion + config.GroupVersion = &gv config.APIPath = "/apis" + config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } - copyGroupVersion := gv - config.GroupVersion = ©GroupVersion - - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: api.Codecs} return nil } diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go index bd9d8ca96287..ba5fe8af4d6b 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1alpha1/apiservice.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - api "k8s.io/client-go/pkg/api" rest "k8s.io/client-go/rest" v1alpha1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1" + scheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" ) // APIServicesGetter has a method to return a APIServiceInterface. @@ -109,7 +109,7 @@ func (c *aPIServices) Delete(name string, options *v1.DeleteOptions) error { func (c *aPIServices) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("apiservices"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -121,7 +121,7 @@ func (c *aPIServices) Get(name string, options v1.GetOptions) (result *v1alpha1. err = c.client.Get(). Resource("apiservices"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -132,7 +132,7 @@ func (c *aPIServices) List(opts v1.ListOptions) (result *v1alpha1.APIServiceList result = &v1alpha1.APIServiceList{} err = c.client.Get(). Resource("apiservices"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -143,7 +143,7 @@ func (c *aPIServices) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("apiservices"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go index 9fc616e759ab..e78f9a1384bd 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/clientset.go @@ -17,27 +17,27 @@ limitations under the License. package internalclientset import ( - "github.com/golang/glog" + glog "github.com/golang/glog" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" - "k8s.io/client-go/util/flowcontrol" - internalversionapiregistration "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" + flowcontrol "k8s.io/client-go/util/flowcontrol" + apiregistrationinternalversion "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" ) type Interface interface { Discovery() discovery.DiscoveryInterface - Apiregistration() internalversionapiregistration.ApiregistrationInterface + Apiregistration() apiregistrationinternalversion.ApiregistrationInterface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *internalversionapiregistration.ApiregistrationClient + *apiregistrationinternalversion.ApiregistrationClient } // Apiregistration retrieves the ApiregistrationClient -func (c *Clientset) Apiregistration() internalversionapiregistration.ApiregistrationInterface { +func (c *Clientset) Apiregistration() apiregistrationinternalversion.ApiregistrationInterface { if c == nil { return nil } @@ -60,7 +60,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.ApiregistrationClient, err = internalversionapiregistration.NewForConfig(&configShallowCopy) + cs.ApiregistrationClient, err = apiregistrationinternalversion.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -77,7 +77,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset - cs.ApiregistrationClient = internalversionapiregistration.NewForConfigOrDie(c) + cs.ApiregistrationClient = apiregistrationinternalversion.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -86,7 +86,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.ApiregistrationClient = internalversionapiregistration.New(c) + cs.ApiregistrationClient = apiregistrationinternalversion.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go index e1b50918a620..1aaee0745523 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go @@ -24,8 +24,8 @@ import ( "k8s.io/client-go/pkg/api" "k8s.io/client-go/testing" clientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset" - internalversionapiregistration "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" - fakeinternalversionapiregistration "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake" + apiregistrationinternalversion "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion" + fakeapiregistrationinternalversion "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. @@ -62,6 +62,6 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} // Apiregistration retrieves the ApiregistrationClient -func (c *Clientset) Apiregistration() internalversionapiregistration.ApiregistrationInterface { - return &fakeinternalversionapiregistration.FakeApiregistration{Fake: &c.Fake} +func (c *Clientset) Apiregistration() apiregistrationinternalversion.ApiregistrationInterface { + return &fakeapiregistrationinternalversion.FakeApiregistration{Fake: &c.Fake} } diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme/doc.go new file mode 100644 index 000000000000..5d8ec824f0fb --- /dev/null +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme/doc.go @@ -0,0 +1,20 @@ +/* +Copyright 2017 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 custom arguments. + +// This package contains the scheme of the automatically generated clientset. +package scheme diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme/register.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme/register.go new file mode 100644 index 000000000000..df7b9ba2713b --- /dev/null +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme/register.go @@ -0,0 +1,46 @@ +/* +Copyright 2017 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 scheme + +import ( + announced "k8s.io/apimachinery/pkg/apimachinery/announced" + registered "k8s.io/apimachinery/pkg/apimachinery/registered" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" + serializer "k8s.io/apimachinery/pkg/runtime/serializer" + apiregistration "k8s.io/kube-aggregator/pkg/apis/apiregistration/install" + os "os" +) + +var Scheme = runtime.NewScheme() +var Codecs = serializer.NewCodecFactory(Scheme) +var ParameterCodec = runtime.NewParameterCodec(Scheme) + +var Registry = registered.NewOrDie(os.Getenv("KUBE_API_VERSIONS")) +var GroupFactoryRegistry = make(announced.APIGroupFactoryRegistry) + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + Install(GroupFactoryRegistry, Registry, Scheme) +} + +// Install registers the API group and adds types to a scheme +func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { + apiregistration.Install(groupFactoryRegistry, registry, scheme) + +} diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go index b34d12f1956e..1c0fc64a7255 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiregistration_client.go @@ -17,8 +17,8 @@ limitations under the License. package internalversion import ( - api "k8s.io/client-go/pkg/api" rest "k8s.io/client-go/rest" + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme" ) type ApiregistrationInterface interface { @@ -64,20 +64,20 @@ func New(c rest.Interface) *ApiregistrationClient { } func setConfigDefaults(config *rest.Config) error { - // if apiregistration group is not registered, return an error - g, err := api.Registry.Group("apiregistration.k8s.io") + g, err := scheme.Registry.Group("apiregistration.k8s.io") if err != nil { return err } + config.APIPath = "/apis" if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() } if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + gv := g.GroupVersion + config.GroupVersion = &gv } - config.NegotiatedSerializer = api.Codecs + config.NegotiatedSerializer = scheme.Codecs if config.QPS == 0 { config.QPS = 5 @@ -85,6 +85,7 @@ func setConfigDefaults(config *rest.Config) error { if config.Burst == 0 { config.Burst = 10 } + return nil } diff --git a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go index d8116f26ac72..010589694004 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/typed/apiregistration/internalversion/apiservice.go @@ -20,9 +20,9 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - api "k8s.io/client-go/pkg/api" rest "k8s.io/client-go/rest" apiregistration "k8s.io/kube-aggregator/pkg/apis/apiregistration" + scheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme" ) // APIServicesGetter has a method to return a APIServiceInterface. @@ -109,7 +109,7 @@ func (c *aPIServices) Delete(name string, options *v1.DeleteOptions) error { func (c *aPIServices) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { return c.client.Delete(). Resource("apiservices"). - VersionedParams(&listOptions, api.ParameterCodec). + VersionedParams(&listOptions, scheme.ParameterCodec). Body(options). Do(). Error() @@ -121,7 +121,7 @@ func (c *aPIServices) Get(name string, options v1.GetOptions) (result *apiregist err = c.client.Get(). Resource("apiservices"). Name(name). - VersionedParams(&options, api.ParameterCodec). + VersionedParams(&options, scheme.ParameterCodec). Do(). Into(result) return @@ -132,7 +132,7 @@ func (c *aPIServices) List(opts v1.ListOptions) (result *apiregistration.APIServ result = &apiregistration.APIServiceList{} err = c.client.Get(). Resource("apiservices"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Do(). Into(result) return @@ -143,7 +143,7 @@ func (c *aPIServices) Watch(opts v1.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("apiservices"). - VersionedParams(&opts, api.ParameterCodec). + VersionedParams(&opts, scheme.ParameterCodec). Watch() } diff --git a/vendor/BUILD b/vendor/BUILD index 15f7419f5f1f..bca564119a47 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -16616,13 +16616,12 @@ go_library( tags = ["automanaged"], deps = [ "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme", ], ) @@ -16696,9 +16695,9 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration", + "//vendor:k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme", ], ) @@ -17086,3 +17085,37 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/doc.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme/register.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1", + ], +) + +go_library( + name = "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme", + srcs = [ + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme/doc.go", + "k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset/scheme/register.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", + "//vendor:k8s.io/kube-aggregator/pkg/apis/apiregistration/install", + ], +)