github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

client-gen: clarify clientset-api-path

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2017-11-24 14:08:26 +01:00
parent 02a7c12cbd
commit 81a5ca68a7
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@ type CustomArgs struct {
// ClientsetOutputPath is the path the clientset will be generated at. It's // ClientsetOutputPath is the path the clientset will be generated at. It's
// populated from command-line arguments. // populated from command-line arguments.
ClientsetOutputPath string ClientsetOutputPath string
// ClientsetAPIPath is the default API path for generated clients. // ClientsetAPIPath is the default API HTTP path for generated clients.
ClientsetAPIPath string ClientsetAPIPath string
// ClientsetOnly determines if we should generate the clients for groups and // ClientsetOnly determines if we should generate the clients for groups and
// types along with the clientset. It's populated from command-line // types along with the clientset. It's populated from command-line
@ -58,7 +58,7 @@ func (ca *CustomArgs) AddFlags(fs *pflag.FlagSet) {
pflag.Var(NewGVTypesValue(&ca.IncludedTypesOverrides, []string{}), "included-types-overrides", "list of group/version/type for which client should be generated. By default, client is generated for all types which have genclient in types.go. This overrides that. For each groupVersion in this list, only the types mentioned here will be included. The default check of genclient will be used for other group versions.") pflag.Var(NewGVTypesValue(&ca.IncludedTypesOverrides, []string{}), "included-types-overrides", "list of group/version/type for which client should be generated. By default, client is generated for all types which have genclient in types.go. This overrides that. For each groupVersion in this list, only the types mentioned here will be included. The default check of genclient will be used for other group versions.")
pflag.StringVar(&ca.InputBasePath, "input-base", "k8s.io/kubernetes/pkg/apis", "base path to look for the api group.") pflag.StringVar(&ca.InputBasePath, "input-base", "k8s.io/kubernetes/pkg/apis", "base path to look for the api group.")
pflag.StringVarP(&ca.ClientsetName, "clientset-name", "n", "internalclientset", "the name of the generated clientset package.") pflag.StringVarP(&ca.ClientsetName, "clientset-name", "n", "internalclientset", "the name of the generated clientset package.")
pflag.StringVarP(&ca.ClientsetAPIPath, "clientset-api-path", "", "", "the value of default API path.") pflag.StringVarP(&ca.ClientsetAPIPath, "clientset-api-path", "", "/apis", "the value of default API HTTP path, starting with / and without trailing /.")
pflag.StringVar(&ca.ClientsetOutputPath, "clientset-path", "k8s.io/kubernetes/pkg/client/clientset_generated/", "the generated clientset will be output to <clientset-path>/<clientset-name>.") pflag.StringVar(&ca.ClientsetOutputPath, "clientset-path", "k8s.io/kubernetes/pkg/client/clientset_generated/", "the generated clientset will be output to <clientset-path>/<clientset-name>.")
pflag.BoolVar(&ca.ClientsetOnly, "clientset-only", false, "when set, client-gen only generates the clientset shell, without generating the individual typed clients") pflag.BoolVar(&ca.ClientsetOnly, "clientset-only", false, "when set, client-gen only generates the clientset shell, without generating the individual typed clients")
pflag.BoolVar(&ca.FakeClient, "fake-clientset", true, "when set, client-gen will generate the fake clientset that can be used in tests") pflag.BoolVar(&ca.FakeClient, "fake-clientset", true, "when set, client-gen will generate the fake clientset that can be used in tests")

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

@ -72,13 +72,10 @@ func (g *genGroup) GenerateType(c *generator.Context, t *types.Type, w io.Writer
sw := generator.NewSnippetWriter(w, c, "$", "$") sw := generator.NewSnippetWriter(w, c, "$", "$")
apiPath := func(group string) string { apiPath := func(group string) string {
if len(g.apiPath) > 0 {
return `"` + g.apiPath + `"`
}
if group == "core" { if group == "core" {
return `"/api"` return `"/api"`
} }
return `"/apis"` return `"` + g.apiPath + `"`
} }
groupName := g.group groupName := g.group