Get rid of gengo InputDirs flag

thockin · k8s-publishing-bot · commit 4d6b3bd5ca9a · 2024-01-16T18:32:44.000-08:00
Kubernetes-commit: b68340e5b6a7951f56c307a117ff27a1ef46280e
diff --git a/cmd/applyconfiguration-gen/main.go b/cmd/applyconfiguration-gen/main.go
@@ -49,6 +49,7 @@ func main() {
 		generators.DefaultNameSystem(),
 		generators.GetTargets,
 		args.StdBuildTag,
+		pflag.Args(),
 	); err != nil {
 		klog.Fatalf("Error: %v", err)
 	}
diff --git a/cmd/client-gen/main.go b/cmd/client-gen/main.go
@@ -40,9 +40,10 @@ func main() {
 	pflag.Parse()
 
 	// add group version package as input dirs for gengo
+	inputPkgs := []string{}
 	for _, pkg := range customArgs.Groups {
 		for _, v := range pkg.Versions {
-			genericArgs.InputDirs = append(genericArgs.InputDirs, v.Package)
+			inputPkgs = append(inputPkgs, v.Package)
 		}
 	}
 
@@ -55,6 +56,7 @@ func main() {
 		generators.DefaultNameSystem(),
 		generators.GetTargets,
 		args.StdBuildTag,
+		inputPkgs,
 	); err != nil {
 		klog.Fatalf("Error: %v", err)
 	}
diff --git a/cmd/conversion-gen/main.go b/cmd/conversion-gen/main.go
@@ -125,6 +125,7 @@ func main() {
 		generators.DefaultNameSystem(),
 		generators.GetTargets,
 		args.StdBuildTag,
+		pflag.Args(),
 	); err != nil {
 		klog.Fatalf("Error: %v", err)
 	}
diff --git a/cmd/deepcopy-gen/main.go b/cmd/deepcopy-gen/main.go
@@ -75,6 +75,7 @@ func main() {
 		generators.DefaultNameSystem(),
 		generators.GetTargets,
 		args.StdBuildTag,
+		pflag.Args(),
 	); err != nil {
 		klog.Fatalf("Error: %v", err)
 	}
diff --git a/cmd/defaulter-gen/main.go b/cmd/defaulter-gen/main.go
@@ -71,6 +71,7 @@ func main() {
 		generators.DefaultNameSystem(),
 		generators.GetTargets,
 		args.StdBuildTag,
+		pflag.Args(),
 	); err != nil {
 		klog.Fatalf("Error: %v", err)
 	}
diff --git a/cmd/informer-gen/main.go b/cmd/informer-gen/main.go
@@ -47,6 +47,7 @@ func main() {
 		generators.DefaultNameSystem(),
 		generators.GetTargets,
 		args.StdBuildTag,
+		pflag.Args(),
 	); err != nil {
 		klog.Fatalf("Error: %v", err)
 	}
diff --git a/cmd/lister-gen/main.go b/cmd/lister-gen/main.go
@@ -47,6 +47,7 @@ func main() {
 		generators.DefaultNameSystem(),
 		generators.GetTargets,
 		args.StdBuildTag,
+		pflag.Args(),
 	); err != nil {
 		klog.Fatalf("Error: %v", err)
 	}
diff --git a/cmd/openapi-gen/main.go b/cmd/openapi-gen/main.go
@@ -51,6 +51,7 @@ func main() {
 		generators.DefaultNameSystem(),
 		generators.GetTargets,
 		args.StdBuildTag,
+		pflag.Args(),
 	); err != nil {
 		log.Fatalf("OpenAPI code generation error: %v", err)
 	}
diff --git a/cmd/prerelease-lifecycle-gen/main.go b/cmd/prerelease-lifecycle-gen/main.go
@@ -64,6 +64,7 @@ func main() {
 		statusgenerators.DefaultNameSystem(),
 		statusgenerators.GetTargets,
 		args.StdBuildTag,
+		pflag.Args(),
 	); err != nil {
 		klog.Fatalf("Error: %v", err)
 	}
diff --git a/cmd/register-gen/main.go b/cmd/register-gen/main.go
@@ -43,6 +43,7 @@ func main() {
 		generators.DefaultNameSystem(),
 		generators.GetTargets,
 		args.StdBuildTag,
+		pflag.Args(),
 	); err != nil {
 		klog.Fatalf("Error: %v", err)
 	}
diff --git a/kube_codegen.sh b/kube_codegen.sh
@@ -138,15 +138,11 @@ function kube::codegen::gen_helpers() {
             -name zz_generated.deepcopy.go \
             | xargs -0 rm -f
 
-        local input_args=()
-        for arg in "${input_pkgs[@]}"; do
-            input_args+=("--input-dirs" "$arg")
-        done
         "${gobin}/deepcopy-gen" \
             -v "${v}" \
             --output-file zz_generated.deepcopy.go \
             --go-header-file "${boilerplate}" \
-            "${input_args[@]}"
+            "${input_pkgs[@]}"
     fi
 
     # Defaults
@@ -174,15 +170,11 @@ function kube::codegen::gen_helpers() {
             -name zz_generated.defaults.go \
             | xargs -0 rm -f
 
-        local input_args=()
-        for arg in "${input_pkgs[@]}"; do
-            input_args+=("--input-dirs" "$arg")
-        done
         "${gobin}/defaulter-gen" \
             -v "${v}" \
             --output-file zz_generated.defaults.go \
             --go-header-file "${boilerplate}" \
-            "${input_args[@]}"
+            "${input_pkgs[@]}"
     fi
 
     # Conversions
@@ -210,10 +202,6 @@ function kube::codegen::gen_helpers() {
             -name zz_generated.conversion.go \
             | xargs -0 rm -f
 
-        local input_args=()
-        for arg in "${input_pkgs[@]}"; do
-            input_args+=("--input-dirs" "$arg")
-        done
         local extra_peer_args=()
         for arg in "${extra_peers[@]:+"${extra_peers[@]}"}"; do
             extra_peer_args+=("--extra-peer-dirs" "$arg")
@@ -223,7 +211,7 @@ function kube::codegen::gen_helpers() {
             --output-file zz_generated.conversion.go \
             --go-header-file "${boilerplate}" \
             "${extra_peer_args[@]:+"${extra_peer_args[@]}"}" \
-            "${input_args[@]}"
+            "${input_pkgs[@]}"
     fi
 }
 
@@ -367,21 +355,17 @@ function kube::codegen::gen_openapi() {
             -name zz_generated.openapi.go \
             | xargs -0 rm -f
 
-        local inputs=()
-        for arg in "${input_pkgs[@]}"; do
-            inputs+=("--input-dirs" "$arg")
-        done
         "${gobin}/openapi-gen" \
             -v "${v}" \
             --output-file zz_generated.openapi.go \
             --go-header-file "${boilerplate}" \
             --output-dir "${out_dir}" \
             --output-pkg "${out_pkg}" \
             --report-filename "${new_report}" \
-            --input-dirs "k8s.io/apimachinery/pkg/apis/meta/v1" \
-            --input-dirs "k8s.io/apimachinery/pkg/runtime" \
-            --input-dirs "k8s.io/apimachinery/pkg/version" \
-            "${inputs[@]}"
+            "k8s.io/apimachinery/pkg/apis/meta/v1" \
+            "k8s.io/apimachinery/pkg/runtime" \
+            "k8s.io/apimachinery/pkg/version" \
+            "${input_pkgs[@]}"
     fi
 
     touch "${report}" # in case it doesn't exist yet
@@ -604,17 +588,13 @@ function kube::codegen::gen_client() {
             || true \
         ) | xargs -0 rm -f
 
-        local inputs=()
-        for arg in "${input_pkgs[@]}"; do
-            inputs+=("--input-dirs" "$arg")
-        done
         "${gobin}/applyconfiguration-gen" \
             -v "${v}" \
             --go-header-file "${boilerplate}" \
             --output-dir "${out_dir}/${applyconfig_subdir}" \
             --output-pkg "${applyconfig_pkg}" \
             --external-applyconfigurations "${applyconfig_external}" \
-            "${inputs[@]}"
+            "${input_pkgs[@]}"
     fi
 
     echo "Generating client code for ${#group_versions[@]} targets"
@@ -651,17 +631,13 @@ function kube::codegen::gen_client() {
             || true \
         ) | xargs -0 rm -f
 
-        local inputs=()
-        for arg in "${input_pkgs[@]}"; do
-            inputs+=("--input-dirs" "$arg")
-        done
         "${gobin}/lister-gen" \
             -v "${v}" \
             --go-header-file "${boilerplate}" \
             --output-dir "${out_dir}/${listers_subdir}" \
             --output-pkg "${out_pkg}/${listers_subdir}" \
             --plural-exceptions "${plural_exceptions}" \
-            "${inputs[@]}"
+            "${input_pkgs[@]}"
 
         echo "Generating informer code for ${#input_pkgs[@]} targets"
 
@@ -672,10 +648,6 @@ function kube::codegen::gen_client() {
             || true \
         ) | xargs -0 rm -f
 
-        local inputs=()
-        for arg in "${input_pkgs[@]}"; do
-            inputs+=("--input-dirs" "$arg")
-        done
         "${gobin}/informer-gen" \
             -v "${v}" \
             --go-header-file "${boilerplate}" \
@@ -684,6 +656,6 @@ function kube::codegen::gen_client() {
             --versioned-clientset-package "${out_pkg}/${clientset_subdir}/${clientset_versioned_name}" \
             --listers-package "${out_pkg}/${listers_subdir}" \
             --plural-exceptions "${plural_exceptions}" \
-            "${inputs[@]}"
+            "${input_pkgs[@]}"
     fi
 }

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ func main() {`
`49`	`49`	`generators.DefaultNameSystem(),`
`50`	`50`	`generators.GetTargets,`
`51`	`51`	`args.StdBuildTag,`
	`52`	`+ pflag.Args(),`
`52`	`53`	`); err != nil {`
`53`	`54`	`klog.Fatalf("Error: %v", err)`
`54`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,10 @@ func main() {`
`40`	`40`	`pflag.Parse()`
`41`	`41`
`42`	`42`	`// add group version package as input dirs for gengo`
	`43`	`+ inputPkgs := []string{}`
`43`	`44`	`for _, pkg := range customArgs.Groups {`
`44`	`45`	`for _, v := range pkg.Versions {`
`45`		`- genericArgs.InputDirs = append(genericArgs.InputDirs, v.Package)`
	`46`	`+ inputPkgs = append(inputPkgs, v.Package)`
`46`	`47`	`}`
`47`	`48`	`}`
`48`	`49`
`@@ -55,6 +56,7 @@ func main() {`
`55`	`56`	`generators.DefaultNameSystem(),`
`56`	`57`	`generators.GetTargets,`
`57`	`58`	`args.StdBuildTag,`
	`59`	`+ inputPkgs,`
`58`	`60`	`); err != nil {`
`59`	`61`	`klog.Fatalf("Error: %v", err)`
`60`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ func main() {`
`125`	`125`	`generators.DefaultNameSystem(),`
`126`	`126`	`generators.GetTargets,`
`127`	`127`	`args.StdBuildTag,`
	`128`	`+ pflag.Args(),`
`128`	`129`	`); err != nil {`
`129`	`130`	`klog.Fatalf("Error: %v", err)`
`130`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ func main() {`
`75`	`75`	`generators.DefaultNameSystem(),`
`76`	`76`	`generators.GetTargets,`
`77`	`77`	`args.StdBuildTag,`
	`78`	`+ pflag.Args(),`
`78`	`79`	`); err != nil {`
`79`	`80`	`klog.Fatalf("Error: %v", err)`
`80`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ func main() {`
`71`	`71`	`generators.DefaultNameSystem(),`
`72`	`72`	`generators.GetTargets,`
`73`	`73`	`args.StdBuildTag,`
	`74`	`+ pflag.Args(),`
`74`	`75`	`); err != nil {`
`75`	`76`	`klog.Fatalf("Error: %v", err)`
`76`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ func main() {`
`47`	`47`	`generators.DefaultNameSystem(),`
`48`	`48`	`generators.GetTargets,`
`49`	`49`	`args.StdBuildTag,`
	`50`	`+ pflag.Args(),`
`50`	`51`	`); err != nil {`
`51`	`52`	`klog.Fatalf("Error: %v", err)`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ func main() {`
`51`	`51`	`generators.DefaultNameSystem(),`
`52`	`52`	`generators.GetTargets,`
`53`	`53`	`args.StdBuildTag,`
	`54`	`+ pflag.Args(),`
`54`	`55`	`); err != nil {`
`55`	`56`	`log.Fatalf("OpenAPI code generation error: %v", err)`
`56`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ func main() {`
`64`	`64`	`statusgenerators.DefaultNameSystem(),`
`65`	`65`	`statusgenerators.GetTargets,`
`66`	`66`	`args.StdBuildTag,`
	`67`	`+ pflag.Args(),`
`67`	`68`	`); err != nil {`
`68`	`69`	`klog.Fatalf("Error: %v", err)`
`69`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ func main() {`
`43`	`43`	`generators.DefaultNameSystem(),`
`44`	`44`	`generators.GetTargets,`
`45`	`45`	`args.StdBuildTag,`
	`46`	`+ pflag.Args(),`
`46`	`47`	`); err != nil {`
`47`	`48`	`klog.Fatalf("Error: %v", err)`
`48`	`49`	`}`