From b0e4f8301717cfb1f2d1832ddafe3b1003de1d49 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Sun, 12 Mar 2023 17:15:35 -0700 Subject: [PATCH] Convert sample-controller to new codegen Kubernetes-commit: e368f1b25bf52f4f48946b8a93ecad63b4bca3ad --- hack/update-codegen.sh | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index e71453af..54992839 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -21,16 +21,21 @@ set -o pipefail 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)} +source "${CODEGEN_PKG}/kube_codegen.sh" + # generate the code with: # --output-base because this script should also be able to run inside the vendor dir of # k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir # instead of the $GOPATH directly. For normal projects this can be dropped. -"${CODEGEN_PKG}/generate-groups.sh" "deepcopy,client,informer,lister" \ - k8s.io/sample-controller/pkg/generated \ - k8s.io/sample-controller/pkg/apis \ - samplecontroller:v1alpha1 \ - --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \ - --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt -# To use your own boilerplate text append: -# --go-header-file "${SCRIPT_ROOT}"/hack/custom-boilerplate.go.txt +kube::codegen::gen_helpers \ + --input-pkg-root k8s.io/sample-controller/pkg/apis \ + --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \ + --boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt" + +kube::codegen::gen_client \ + --with-watch \ + --input-pkg-root k8s.io/sample-controller/pkg/apis \ + --output-pkg-root k8s.io/sample-controller/pkg/generated \ + --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \ + --boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt"