clientset: configure output directory nicer

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>

Author: stevekuznetsov

examples/pkg/kcp/clients/clientset/versioned/clientset.go

@@ -70,15 +70,15 @@ ${KUBE_INFORMER_GEN} \
 
 # Generate cluster-aware clients, informers and listers using generated single-cluster code
 ./../bin/code-generator \
-    "client:name=versioned,outputPackagePath=acme.corp/pkg/kcpexisting/clients,apiPackagePath=acme.corp/pkg/apis,singleClusterClientPackagePath=acme.corp/pkg/generated/clientset/versioned,singleClusterApplyConfigurationsPackagePath=acme.corp/pkg/generated/applyconfigurations,headerFile=./../hack/boilerplate/boilerplate.go.txt" \
+    "client:name=clientset,outputPackagePath=acme.corp/pkg/kcpexisting/clients,apiPackagePath=acme.corp/pkg/apis,singleClusterClientPackagePath=acme.corp/pkg/generated/clientset/versioned,singleClusterApplyConfigurationsPackagePath=acme.corp/pkg/generated/applyconfigurations,headerFile=./../hack/boilerplate/boilerplate.go.txt" \
     "lister:apiPackagePath=acme.corp/pkg/apis,singleClusterListerPackagePath=acme.corp/pkg/generated/listers,headerFile=./../hack/boilerplate/boilerplate.go.txt" \
     "informer:outputPackagePath=acme.corp/pkg/kcpexisting/clients,apiPackagePath=acme.corp/pkg/apis,singleClusterListerPackagePath=acme.corp/pkg/generated/listers,singleClusterInformerPackagePath=acme.corp/pkg/generated/informers/externalversions,headerFile=./../hack/boilerplate/boilerplate.go.txt" \
     "paths=./pkg/apis/..." \
     "output:dir=./pkg/kcpexisting/clients"
 
 # Generate cluster-aware clients, informers and listers assuming no single-cluster listers or informers
 ./../bin/code-generator \
-  "client:name=versioned,outputPackagePath=acme.corp/pkg/kcp/clients,apiPackagePath=acme.corp/pkg/apis,singleClusterClientPackagePath=acme.corp/pkg/generated/clientset/versioned,singleClusterApplyConfigurationsPackagePath=acme.corp/pkg/generated/applyconfigurations,headerFile=./../hack/boilerplate/boilerplate.go.txt" \
+  "client:name=clientset,outputPackagePath=acme.corp/pkg/kcp/clients,apiPackagePath=acme.corp/pkg/apis,singleClusterClientPackagePath=acme.corp/pkg/generated/clientset/versioned,singleClusterApplyConfigurationsPackagePath=acme.corp/pkg/generated/applyconfigurations,headerFile=./../hack/boilerplate/boilerplate.go.txt" \
   "lister:apiPackagePath=acme.corp/pkg/apis,headerFile=./../hack/boilerplate/boilerplate.go.txt" \
   "informer:outputPackagePath=acme.corp/pkg/kcp/clients,apiPackagePath=acme.corp/pkg/apis,headerFile=./../hack/boilerplate/boilerplate.go.txt" \
   "paths=./pkg/apis/..." \

examples/pkg/kcpexisting/clients/clientset/versioned/clientset.go

@@ -34,7 +34,10 @@ import (
 
 type Generator struct {
 	// Name is the name of this client-set, e.g. "kubernetes"
-	Name string `marker:""`
+	Name string `marker:",optional"`
+
+	// ExternalOnly toggles the creation of a "versioned" sub-directory.
+	ExternalOnly bool `marker:",optional"`
 
 	// HeaderFile specifies the header text (e.g. license) to prepend to generated files.
 	HeaderFile string `marker:",optional"`
@@ -88,14 +91,21 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 	}
 	headerText = strings.ReplaceAll(headerText, " YEAR", replacement)
 
+	if g.Name == "" {
+		g.Name = "clientset"
+	}
+
 	groupVersionKinds, err := parser.CollectKinds(ctx)
 	if err != nil {
 		return err
 	}
 
 	groupInfo := toGroupVersionInfos(groupVersionKinds)
 
-	clientsetDir := filepath.Join("clientset", "versioned")
+	clientsetDir := g.Name
+	if !g.ExternalOnly {
+		clientsetDir = filepath.Join(clientsetDir, "versioned")
+	}
 	clientsetFile := filepath.Join(clientsetDir, "clientset.go")
 	logger := klog.Background().WithValues("clientset", g.Name)
 	logger.WithValues("path", clientsetFile).Info("generating clientset")