Merge pull request #69 from stevekuznetsov/skuznets/configure-directories

✨ generators: allow configuring output directory

Author: openshift-merge-robot

hack/update-codegen.sh

@@ -70,18 +70,18 @@ ${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,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=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" \
     "lister:apiPackagePath=acme.corp/pkg/apis,singleClusterListerPackagePath=acme.corp/pkg/generated/listers,headerFile=./../hack/boilerplate/boilerplate.go.txt" \
-    "informer:outputPackagePath=acme.corp/pkg/kcpexisting,apiPackagePath=acme.corp/pkg/apis,singleClusterListerPackagePath=acme.corp/pkg/generated/listers,singleClusterInformerPackagePath=acme.corp/pkg/generated/informers/externalversions,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"
+    "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,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=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" \
   "lister:apiPackagePath=acme.corp/pkg/apis,headerFile=./../hack/boilerplate/boilerplate.go.txt" \
-  "informer:outputPackagePath=acme.corp/pkg/kcp,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/..." \
-  "output:dir=./pkg/kcp"
+  "output:dir=./pkg/kcp/clients"
 
 popd

pkg/generators/clientgen/clientgen.go

@@ -95,7 +95,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 
 	groupInfo := toGroupVersionInfos(groupVersionKinds)
 
-	clientsetDir := filepath.Join("clients", "clientset", "versioned")
+	clientsetDir := filepath.Join("clientset", "versioned")
 	clientsetFile := filepath.Join(clientsetDir, "clientset.go")
 	logger := klog.Background().WithValues("clientset", g.Name)
 	logger.WithValues("path", clientsetFile).Info("generating clientset")

pkg/generators/informergen/informergen.go

@@ -40,7 +40,7 @@ type Generator struct {
 	Year string `marker:",optional"`
 
 	// OutputPackagePath is the root directory under which this tool will output files.
-	// e.g. "github.com/kcp-dev/client-go"
+	// e.g. "github.com/kcp-dev/client-go/clients"
 	OutputPackagePath string `marker:""`
 
 	// APIPackagePath is the root directory under which API types exist.
@@ -102,10 +102,10 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 		return onlyGroups[i].Group.PackageName() < onlyGroups[j].Group.PackageName()
 	})
 
-	clientsetDir := filepath.Join("clients", "clientset", "versioned")
-	listersDir := filepath.Join("clients", "listers")
+	clientsetDir := filepath.Join("clientset", "versioned")
+	listersDir := "listers"
 
-	informersDir := filepath.Join("clients", "informers")
+	informersDir := "informers"
 	factoryPath := filepath.Join(informersDir, "factory.go")
 	logger.WithValues("path", factoryPath).Info("generating informer factory")
 	if err := util.WriteGeneratedCode(ctx, headerText, &informergen.Factory{

pkg/generators/listergen/listergen.go

@@ -86,7 +86,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 		for version, kinds := range versions {
 			groupInfo := toGroupVersionInfo(group, version)
 			for _, kind := range kinds {
-				listerDir := filepath.Join("clients", "listers", group.PackageName(), version.PackageName())
+				listerDir := filepath.Join("listers", group.PackageName(), version.PackageName())
 				outputFile := filepath.Join(listerDir, strings.ToLower(kind.String())+".go")
 				logger := klog.Background().WithValues(
 					"group", group.String(),