Fixing the code generation scripts

Author: mukhoakash

Makefile

@@ -37,5 +37,6 @@ test:
 unit:
 codegen: 
 	$(shell ./hack/update-codegen.sh) 
+	$(shell ./hack/update-crd.sh)
 
 include release-tools/build.make

hack/boilerplate.go.txt

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Kubernetes Authors.
+Copyright 2022 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

hack/tools.go

@@ -0,0 +1,23 @@
+//go:build tools
+// +build tools
+
+/*
+Copyright 2022 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This package imports things required by build scripts, to force `go mod` to see them as dependencies
+package tools
+
+import (
+	_ "k8s.io/code-generator"
+	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
+)

hack/update-codegen.sh

@@ -1,40 +1,11 @@
 #!/bin/bash
 
-SCRIPT_ROOT=$(dirname $0)
-
-deepcopy-gen --input-dirs sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1 \
-             --go-header-file hack/boilerplate.go.txt \
-	     --output-base $GOPATH/src \
-	     --output-file-base zz_generated.deepcopy \
-	     --output-package sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1
-
-openapi-gen --input-dirs sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1 \
-            --go-header-file hack/boilerplate.go.txt \
-	    --output-base $GOPATH/src \
-	    --output-package sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1
-
-defaulter-gen --input-dirs sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1 \
-              --go-header-file hack/boilerplate.go.txt \
-	      --output-base $GOPATH/src \
-	      --output-package sigs.k8s.io/container-object-storage-interface-api/defaulters
-
-lister-gen --input-dirs sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1 \
-              --go-header-file hack/boilerplate.go.txt \
-	      --output-base $GOPATH/src \
-	      --output-package sigs.k8s.io/container-object-storage-interface-api/listers
-
-informer-gen --input-dirs sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1 \
-              --go-header-file hack/boilerplate.go.txt \
-	      --output-base $GOPATH/src \
-	      --listers-package sigs.k8s.io/container-object-storage-interface-api/listers \
-	      --versioned-clientset-package sigs.k8s.io/container-object-storage-interface-api/clientset \
-	      --output-package sigs.k8s.io/container-object-storage-interface-api/informers
-
-client-gen --input objectstorage.k8s.io/v1alpha1 \
-           --go-header-file hack/boilerplate.go.txt \
-	   --input-base sigs.k8s.io/container-object-storage-interface-api/apis/ \
-	   --output-package sigs.k8s.io/container-object-storage-interface-api/ \
-	   --output-base $GOPATH/src \
-	   --clientset-name "clientset"
-
-controller-gen crd:crdVersions=v1 paths=$SCRIPT_ROOT/../apis/... output:dir=$SCRIPT_ROOT/../crds
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
+
+bash "${CODEGEN_PKG}"/generate-internal-groups.sh "deepcopy,client,informer,lister,openapi" \
+  sigs.k8s.io/container-object-storage-interface-api/client \
+  sigs.k8s.io/container-object-storage-interface-api/apis \
+  sigs.k8s.io/container-object-storage-interface-api/apis \
+  objectstorage:v1alpha1 \
+  --go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"

hack/update-crd.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+SCRIPT_ROOT_RELATIVE=$(dirname "${BASH_SOURCE}")/..
+SCRIPT_ROOT=$(realpath "${SCRIPT_ROOT_RELATIVE}")
+CONTROLLERTOOLS_PKG=${CONTROLLERTOOLS_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/sigs.k8s.io/controller-tools 2>/dev/null || echo ../code-controller-tools)}
+
+echo $CONTROLLERTOOLS_PKG
+
+# find or download controller-gen
+pushd "${CONTROLLERTOOLS_PKG}"
+trap popd exit
+go run -v ./cmd/controller-gen crd:crdVersions=v1 paths="${SCRIPT_ROOT}/apis/..." output:crd:dir="${SCRIPT_ROOT}/crds"