Migrating from generate-groups.sh to kube_codegen.sh

build/Makefile

@@ -733,10 +733,11 @@ gen-install: $(ensure-build-image)
 
 # Generate the client for our CustomResourceDefinition
 gen-crd-client: $(ensure-build-image)
-	docker run --rm $(common_mounts) -w $(workdir_path) $(build_tag) bash -c "\
-	$(git_safe) && \
-	/root/gen-crd-client.sh && \
-	cd $(workdir_path)/pkg && goimports -w ."
+	docker run --rm \
+		$(common_mounts) -w $(workdir_path) $(build_tag) bash -c "\
+		$(git_safe) && \
+		/root/gen-crd-client.sh && \
+		cd $(workdir_path)/pkg && goimports -w ."
 
 # Run a bash shell with the developer tools in it. (Creates the image if it doesn't exist)
 # Can use DOCKER_RUN_ARGS for extra arguments.

build/build-image/Dockerfile

@@ -50,6 +50,9 @@ RUN go install golang.org/x/tools/cmd/goimports@latest && \
     go install golang.org/x/pkgsite/cmd/pkgsite@latest
 
 # the kubernetes version for the file
+#
+# When this is raised to 1.29: bump the code-generator version on line 66 to the v0.30 tag.
+# When this is raised to >=1.30: delete line 66-67 and uncomment line 68 to stop pinning code-generator.
 ENV KUBERNETES_VER 1.28.6
 
 # overwrite kubectl as we want a specific version
@@ -60,7 +63,9 @@ RUN echo "source <(kubectl completion bash)" >> /root/.bashrc
 
 # install the release branch of the code generator tools
 RUN mkdir -p /go/src/k8s.io && cd /go/src/k8s.io && \
-    git clone -b kubernetes-${KUBERNETES_VER} --depth=3 https://github.com/kubernetes/code-generator.git
+    git clone -b v0.30.0-beta.0 --depth=3 https://github.com/kubernetes/code-generator.git
+    # We are pinning code-generator for now - kube_codegen.sh has substantial improvements in later releases.
+    # git clone -b kubernetes-${KUBERNETES_VER} --depth=3 https://github.com/kubernetes/code-generator.git
 
 # install Helm package manager
 ENV HELM_VER 3.10.3

build/build-image/gen-crd-client.sh

@@ -14,9 +14,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+#!/bin/bash
+
 set -x
+set -o errexit
+set -o nounset
+set -o pipefail
+
+CODEGEN_SCRIPT="/go/src/k8s.io/code-generator/kube_codegen.sh"
+
+source "${CODEGEN_SCRIPT}"
+
+echo "Generating CRD client code..."
+OUTPUT_DIR="/go/src/agones.dev/agones/pkg/client"
+OUTPUT_PKG="agones.dev/agones/pkg/client"
+
+kube::codegen::gen_client \
+  --with-watch \
+  --with-applyconfig \
+  --output-dir "${OUTPUT_DIR}" \
+  --output-pkg "${OUTPUT_PKG}" \
+  --boilerplate /go/src/agones.dev/agones/build/boilerplate.go.txt \
+  /go/src/agones.dev/agones/pkg/apis
 
-bash /go/src/k8s.io/code-generator/generate-groups.sh "all" \
-    agones.dev/agones/pkg/client \
-    agones.dev/agones/pkg/apis "allocation:v1 agones:v1 multicluster:v1 autoscaling:v1" \
-    --go-header-file=/go/src/agones.dev/agones/build/boilerplate.go.txt
+echo "CRD client code generation complete."