Merge pull request #329 from ashnehete/kube_codegen

Migrate to use kube_codegen.sh to generate client

Makefile

@@ -232,6 +232,7 @@ code-generator:
 	@GOBIN=$(PROJECT_DIR)/bin GO111MODULE=on $(GO_CMD) install k8s.io/code-generator/cmd/client-gen@$(CODEGEN_VERSION)
 	cp -f $(CODEGEN_ROOT)/generate-groups.sh $(PROJECT_DIR)/bin/
 	cp -f $(CODEGEN_ROOT)/generate-internal-groups.sh $(PROJECT_DIR)/bin/
+	cp -f $(CODEGEN_ROOT)/kube_codegen.sh $(PROJECT_DIR)/bin/
 
 
 .PHONY: openapi-gen

api/jobset/v1alpha2/types.go

@@ -0,0 +1,23 @@
+/*
+Copyright 2023 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 file is needed for kubernetes/code-generator/kube_codegen.sh script used in hack/update-codegen.sh.
+*/
+
+package v1alpha2
+
+//+genclient

hack/update-codegen.sh

@@ -18,31 +18,31 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-cd "$(dirname "${0}")"
+cd "$(dirname "${0}")/.."
 GO_CMD=${1:-go}
-CODEGEN_PKG=${2:-../bin}
+CODEGEN_PKG=${2:-bin}
 REPO_ROOT="$(git rev-parse --show-toplevel)"
 
 echo "GOPATH=$GOPATH"
 
-chmod +x "${CODEGEN_PKG}/generate-internal-groups.sh"
-
-bash "${CODEGEN_PKG}/generate-groups.sh" \
-  "applyconfiguration,client,informer,lister" \
-  sigs.k8s.io/jobset/client-go \
-  sigs.k8s.io/jobset/api \
-  jobset:v1alpha2 \
-  --go-header-file ./boilerplate.go.txt
-
-# if client-go files were generated outside of repo root, attempt to move them to the repo root.
-CLIENT_GO=$(find $GOPATH -regextype sed -regex ".*jobset.*client-go")
-if [ -z "$CLIENT_GO" ]; then
-  echo "WARNING: generated client-go files were not found."
-elif [ "$CLIENT_GO" != "$REPO_ROOT/client-go" ]; then
-  echo "moving generated files from $CLIENT_GO to $REPO_ROOT/client-go"
-  rm -rf $REPO_ROOT/client-go
-  mv -f $CLIENT_GO $REPO_ROOT
-
-fi
-
-
+source "${CODEGEN_PKG}/kube_codegen.sh"
+
+# TODO: remove the workaround when the issue is solved in the code-generator
+# (https://github.com/kubernetes/code-generator/issues/165).
+# Here, we create the soft link named "sigs.k8s.io" to the parent directory of
+# Jobset to ensure the layout required by the kube_codegen.sh script.
+ln -s .. sigs.k8s.io
+trap "rm sigs.k8s.io" EXIT
+
+kube::codegen::gen_helpers \
+    --input-pkg-root sigs.k8s.io/jobset/api \
+    --output-base "${REPO_ROOT}" \
+    --boilerplate "${REPO_ROOT}/hack/boilerplate.go.txt"
+
+kube::codegen::gen_client \
+    --with-watch \
+    --with-applyconfig \
+    --input-pkg-root sigs.k8s.io/jobset/api \
+    --output-base "$REPO_ROOT" \
+    --output-pkg-root sigs.k8s.io/jobset/client-go \
+    --boilerplate "${REPO_ROOT}/hack/boilerplate.go.txt"