Update update-codegen.sh to new upstream cli behaviour

Signed-off-by: Marvin Beckers <[email protected]>

Author: embik

hack/go-install.sh

@@ -15,48 +15,35 @@
 # limitations under the License.
 
 # Originally copied from
-# https://github.com/kubernetes-sigs/cluster-api-provider-gcp/blob/c26a68b23e9317323d5d37660fe9d29b3d2ff40c/scripts/go_install.sh
+# https://github.com/kubernetes-sigs/controller-runtime/blob/479b723944e34ae42c9911fe01228ff34eb5ca81/hack/go-install.sh#L4
 
 set -o errexit
 set -o nounset
 set -o pipefail
 
-if [[ -z "${1:-}" ]]; then
+if [ -z "${1}" ]; then
   echo "must provide module as first parameter"
   exit 1
 fi
 
-if [[ -z "${2:-}" ]]; then
+if [ -z "${2}" ]; then
   echo "must provide binary name as second parameter"
   exit 1
 fi
 
-if [[ -z "${3:-}" ]]; then
+if [ -z "${3}" ]; then
   echo "must provide version as third parameter"
   exit 1
 fi
 
-if [[ -z "${GOBIN:-}" ]]; then
+if [ -z "${GOBIN}" ]; then
   echo "GOBIN is not set. Must set GOBIN to install the bin in a specified directory."
   exit 1
 fi
 
-mkdir -p "${GOBIN}"
-
-tmp_dir=$(mktemp -d -t goinstall_XXXXXXXXXX)
-function clean {
-  rm -rf "${tmp_dir}"
-}
-trap clean EXIT
-
-rm "${GOBIN}/${2}"* > /dev/null 2>&1 || true
-
-cd "${tmp_dir}"
-
-# create a new module in the tmp directory
-go mod init fake/mod
+rm -f "${GOBIN}/${2}"* || true
 
 # install the golang module specified as the first argument
-go install -tags kcptools "${1}@${3}"
+go install "${1}@${3}"
 mv "${GOBIN}/${2}" "${GOBIN}/${2}-${3}"
 ln -sf "${GOBIN}/${2}-${3}" "${GOBIN}/${2}"

hack/update-codegen.sh

@@ -41,32 +41,28 @@ ${KUBE_CLIENT_GEN} \
   --input example3/v1 \
   --input secondexample/v1 \
   --input existinginterfaces/v1 \
-  --output-base . \
-  --output-package acme.corp/pkg/generated/clientset \
-  --trim-path-prefix acme.corp
+  --output-dir ./pkg/generated/clientset \
+  --output-pkg acme.corp/pkg/generated/clientset
 
 ${KUBE_APPLYCONFIGURATION_GEN} \
   --go-header-file ./../hack/boilerplate/boilerplate.generatego.txt \
-  --input-dirs acme.corp/pkg/apis/example/v1,acme.corp/pkg/apis/example/v1alpha1,acme.corp/pkg/apis/example/v1beta1,acme.corp/pkg/apis/example/v2,acme.corp/pkg/apis/example3/v1,acme.corp/pkg/apis/secondexample/v1,acme.corp/pkg/apis/existinginterfaces/v1 \
-  --output-base . \
-  --output-package acme.corp/pkg/generated/applyconfigurations \
-  --trim-path-prefix acme.corp
+  --output-dir ./pkg/generated/applyconfigurations \
+  --output-pkg acme.corp/pkg/generated/applyconfigurations \
+  acme.corp/pkg/apis/example/v1 acme.corp/pkg/apis/example/v1alpha1 acme.corp/pkg/apis/example/v1beta1 acme.corp/pkg/apis/example/v2 acme.corp/pkg/apis/example3/v1 acme.corp/pkg/apis/secondexample/v1 acme.corp/pkg/apis/existinginterfaces/v1
 
 ${KUBE_LISTER_GEN} \
   --go-header-file ./../hack/boilerplate/boilerplate.generatego.txt \
-  --input-dirs acme.corp/pkg/apis/example/v1,acme.corp/pkg/apis/example/v1alpha1,acme.corp/pkg/apis/example/v1beta1,acme.corp/pkg/apis/example/v2,acme.corp/pkg/apis/example3/v1,acme.corp/pkg/apis/secondexample/v1,acme.corp/pkg/apis/existinginterfaces/v1 \
-  --output-base . \
-  --output-package acme.corp/pkg/generated/listers \
-  --trim-path-prefix acme.corp
+  --output-dir ./pkg/generated/listers \
+  --output-pkg acme.corp/pkg/generated/listers \
+  acme.corp/pkg/apis/example/v1 acme.corp/pkg/apis/example/v1alpha1 acme.corp/pkg/apis/example/v1beta1 acme.corp/pkg/apis/example/v2 acme.corp/pkg/apis/example3/v1 acme.corp/pkg/apis/secondexample/v1 acme.corp/pkg/apis/existinginterfaces/v1
 
 ${KUBE_INFORMER_GEN} \
   --versioned-clientset-package acme.corp/pkg/generated/clientset/versioned \
   --listers-package acme.corp/pkg/generated/listers \
   --go-header-file ./../hack/boilerplate/boilerplate.generatego.txt \
-  --input-dirs acme.corp/pkg/apis/example/v1,acme.corp/pkg/apis/example/v1alpha1,acme.corp/pkg/apis/example/v1beta1,acme.corp/pkg/apis/example/v2,acme.corp/pkg/apis/example3/v1,acme.corp/pkg/apis/secondexample/v1,acme.corp/pkg/apis/existinginterfaces/v1 \
-  --output-base . \
-  --output-package acme.corp/pkg/generated/informers \
-  --trim-path-prefix acme.corp
+  --output-dir ./pkg/generated/informers \
+  --output-pkg acme.corp/pkg/generated/informers \
+  acme.corp/pkg/apis/example/v1 acme.corp/pkg/apis/example/v1alpha1 acme.corp/pkg/apis/example/v1beta1 acme.corp/pkg/apis/example/v2 acme.corp/pkg/apis/example3/v1 acme.corp/pkg/apis/secondexample/v1 acme.corp/pkg/apis/existinginterfaces/v1
 
 # Generate cluster-aware clients, informers and listers using generated single-cluster code
 ./../bin/code-generator \
@@ -84,4 +80,4 @@ ${KUBE_INFORMER_GEN} \
   "paths=./pkg/apis/..." \
   "output:dir=./pkg/kcp/clients"
 
-popd
+popd