Update codegen scripts

hack/code-gen.sh

@@ -13,80 +13,30 @@ export PATH=$PATH:$GOPATH/bin
 
 source hack/utils.sh
 
-# Install the required binaries
+# Install the required binaries with modules enabled
 GO111MODULE=on "$GO" install \
     k8s.io/code-generator/cmd/deepcopy-gen \
     k8s.io/code-generator/cmd/register-gen \
     k8s.io/code-generator/cmd/client-gen \
     k8s.io/code-generator/cmd/lister-gen \
     k8s.io/code-generator/cmd/informer-gen
-    # k8s.io/code-generator/cmd/openapi-gen
 
-printf "deepcopy-gen... "
+# Ensure proper package tags are in place (See: https://pkg.go.dev/k8s.io/code-generator/cmd/deepcopy-gen)
+printf "Running code generators...\n"
 
-deepcopy-gen \
-  --go-header-file "hack/boilerplate.go.txt" \
-  --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
-  --output-package="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
-  --output-file-base=zz_generated.deepcopy -v 1
+# Use generate-groups.sh helper script to run all code generators
+"$GOPATH"/pkg/mod/k8s.io/code-generator@v0.30.0/kube_codegen.sh all \
+    github.com/janekbaraniewski/kubeserial/pkg/generated \
+    github.com/janekbaraniewski/kubeserial/pkg/apis \
+    v1alpha1
 
-replace_or_compare $GOPATH/src/github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1/zz_generated.deepcopy.go ./pkg/apis/v1alpha1/zz_generated.deepcopy.go
+# Manual copy might be required if output paths are incorrectly set by the tools, adjust paths as needed
+if [[ "${COPY_OR_DIFF}" == "copy" ]]; then
+    rm -rf ./pkg/generated
+    mkdir -p ./pkg/generated
+    cp -r "$GOPATH/src/github.com/janekbaraniewski/kubeserial/pkg/generated/"* ./pkg/generated/
+fi
 
-printf "Done!\n"
+replace_or_compare "$GOPATH/src/github.com/janekbaraniewski/kubeserial/pkg/generated/" ./pkg/generated/
 
-printf "register-gen... "
-
-register-gen all \
-  --go-header-file "hack/boilerplate.go.txt" \
-  --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
-  --output-package="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
-  --output-file-base=zz_generated.register -v 1
-
-replace_or_compare $GOPATH/src/github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1/zz_generated.register.go ./pkg/apis/v1alpha1/zz_generated.register.go
-
-printf "Done!\n"
-
-printf "openapi-gen... "
-
-openapi-gen \
-  --go-header-file "hack/boilerplate.go.txt" \
-  --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
-  --output-package="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
-  --output-file-base=zz_generated.openapi -v 1
-
-replace_or_compare $GOPATH/src/github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1/zz_generated.openapi.go ./pkg/apis/v1alpha1/zz_generated.openapi.go
-
-printf "Done!\n"
-
-printf "client-gen... "
-
-client-gen \
-    --go-header-file "hack/boilerplate.go.txt" \
-    --input-base="" \
-    --input="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
-    --output-package=github.com/janekbaraniewski/kubeserial/pkg/generated/clientset \
-    --clientset-name=versioned
-
-printf "Done!\n"
-
-printf "lister-gen... "
-
-lister-gen \
-    --go-header-file "hack/boilerplate.go.txt" \
-    --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
-    --output-package=github.com/janekbaraniewski/kubeserial/pkg/generated/listers
-printf "Done!\n"
-
-printf "informer-gen... "
-
-informer-gen \
-    --go-header-file "hack/boilerplate.go.txt" \
-    --input-dirs="github.com/janekbaraniewski/kubeserial/pkg/apis/v1alpha1" \
-    --versioned-clientset-package=github.com/janekbaraniewski/kubeserial/pkg/generated/clientset/versioned \
-    --listers-package=github.com/janekbaraniewski/kubeserial/pkg/generated/listers \
-    --output-package=github.com/janekbaraniewski/kubeserial/pkg/generated/informers
-
-if [[ "${COPY_OR_DIFF}" == "copy" ]]; then rm -rf ./pkg/generated; mkdir ./pkg/generated || true; fi;
-replace_or_compare $GOPATH/src/github.com/janekbaraniewski/kubeserial/pkg/generated/ ./pkg/generated/
-
-printf "Done!\n"
+printf "All generators have completed.\n"