From ee011b3be45885ae7af31554294dee92f1f32ff5 Mon Sep 17 00:00:00 2001 From: Ryan Phillips Date: Fri, 8 Mar 2019 12:13:55 -0600 Subject: [PATCH] add featureslist to pluralExceptions --- cmd/client-gen/generators/client_generator.go | 9 +++++---- cmd/informer-gen/generators/generic.go | 1 + cmd/informer-gen/generators/packages.go | 7 ++++--- cmd/lister-gen/generators/lister.go | 1 + 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cmd/client-gen/generators/client_generator.go b/cmd/client-gen/generators/client_generator.go index a7e8a96d..de0d48d1 100644 --- a/cmd/client-gen/generators/client_generator.go +++ b/cmd/client-gen/generators/client_generator.go @@ -42,6 +42,7 @@ func NameSystems() namer.NameSystems { "DNS": "DNSes", "Endpoints": "Endpoints", "Features": "Features", + "FeaturesList": "FeaturesList", "SecurityContextConstraints": "SecurityContextConstraints", } lowercaseNamer := namer.NewAllLowercasePluralNamer(pluralExceptions) @@ -96,10 +97,10 @@ func NameSystems() namer.NameSystems { } publicPluralNamer := &ExceptionNamer{ Exceptions: map[string]string{ - // these exceptions are used to deconflict the generated code - // you can put your fully qualified package like - // to generate a name that doesn't conflict with your group. - // "k8s.io/apis/events/v1beta1.Event": "EventResource" + // these exceptions are used to deconflict the generated code + // you can put your fully qualified package like + // to generate a name that doesn't conflict with your group. + // "k8s.io/apis/events/v1beta1.Event": "EventResource" }, KeyFunc: func(t *types.Type) string { return t.Name.Package + "." + t.Name.Name diff --git a/cmd/informer-gen/generators/generic.go b/cmd/informer-gen/generators/generic.go index 47e9a8d1..c2d980ee 100644 --- a/cmd/informer-gen/generators/generic.go +++ b/cmd/informer-gen/generators/generic.go @@ -53,6 +53,7 @@ func (g *genericGenerator) Namers(c *generator.Context) namer.NameSystems { "DNS": "DNSes", "Endpoints": "Endpoints", "Features": "Features", + "FeaturesList": "FeaturesList", "SecurityContextConstraints": "SecurityContextConstraints", } return namer.NameSystems{ diff --git a/cmd/informer-gen/generators/packages.go b/cmd/informer-gen/generators/packages.go index 00a53e9f..e4de4487 100644 --- a/cmd/informer-gen/generators/packages.go +++ b/cmd/informer-gen/generators/packages.go @@ -39,6 +39,7 @@ func NameSystems() namer.NameSystems { "DNS": "DNSes", "Endpoints": "Endpoints", "Features": "Features", + "FeaturesList": "FeaturesList", "SecurityContextConstraints": "SecurityContextConstraints", } return namer.NameSystems{ @@ -323,9 +324,9 @@ func versionPackage(basePackage string, groupPkgName string, gv clientgentypes.G DefaultGen: generator.DefaultGen{ OptionalName: "interface", }, - outputPackage: packagePath, - imports: generator.NewImportTracker(), - types: typesToGenerate, + outputPackage: packagePath, + imports: generator.NewImportTracker(), + types: typesToGenerate, internalInterfacesPackage: packageForInternalInterfaces(basePackage), }) diff --git a/cmd/lister-gen/generators/lister.go b/cmd/lister-gen/generators/lister.go index 73b119de..7c5bd26b 100644 --- a/cmd/lister-gen/generators/lister.go +++ b/cmd/lister-gen/generators/lister.go @@ -39,6 +39,7 @@ func NameSystems() namer.NameSystems { "DNS": "DNSes", "Endpoints": "Endpoints", "Features": "Features", + "FeaturesList": "FeaturesList", "SecurityContextConstraints": "SecurityContextConstraints", } return namer.NameSystems{