From b08f1fa8b5c7c7bbcb57350e7520547938a0f793 Mon Sep 17 00:00:00 2001 From: Amir Alavi Date: Sat, 18 May 2024 10:01:23 -0400 Subject: [PATCH] fix: code-gen scripts to use new flags in recent kubernetes 1.30, the code-gen flags were changed. --output-file-base -> --output-file based on https://github.com/kubernetes/code-generator/commit/144141734d766acc38b57f690cb9906f40b2d483\#diff-beaa4412ca0edb2451061daa9570ce25858ec41951938fc60f17e2370462ad8e Signed-off-by: Amir Alavi --- hack/lib/generator-help.sh | 2 +- hack/update-generated-conversions.sh | 4 ++-- hack/update-generated-deep-copies.sh | 4 ++-- hack/update-generated-defaulters.sh | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hack/lib/generator-help.sh b/hack/lib/generator-help.sh index 7b96947fa..ca5685b36 100644 --- a/hack/lib/generator-help.sh +++ b/hack/lib/generator-help.sh @@ -20,6 +20,6 @@ function find_dirs_containing_comment_tags() { | LC_ALL=C sort -u \ ) - IFS=","; + IFS=" "; printf '%s' "${array[*]}"; } diff --git a/hack/update-generated-conversions.sh b/hack/update-generated-conversions.sh index 4edd5c967..b83da7769 100755 --- a/hack/update-generated-conversions.sh +++ b/hack/update-generated-conversions.sh @@ -6,5 +6,5 @@ go build -o "${OS_OUTPUT_BINPATH}/conversion-gen" "k8s.io/code-generator/cmd/con ${OS_OUTPUT_BINPATH}/conversion-gen \ --go-header-file "hack/boilerplate/boilerplate.go.txt" \ - --input-dirs "$(find_dirs_containing_comment_tags "+k8s:conversion-gen=")" \ - --output-file-base zz_generated.conversion + --output-file zz_generated.conversion.go \ + $(find_dirs_containing_comment_tags "+k8s:conversion-gen=") diff --git a/hack/update-generated-deep-copies.sh b/hack/update-generated-deep-copies.sh index 3f2f67e26..8bacfe0d6 100755 --- a/hack/update-generated-deep-copies.sh +++ b/hack/update-generated-deep-copies.sh @@ -6,6 +6,6 @@ go build -o "${OS_OUTPUT_BINPATH}/deepcopy-gen" "k8s.io/code-generator/cmd/deepc ${OS_OUTPUT_BINPATH}/deepcopy-gen \ --go-header-file "hack/boilerplate/boilerplate.go.txt" \ - --input-dirs "$(find_dirs_containing_comment_tags "+k8s:deepcopy-gen=")" \ - --output-file-base zz_generated.deepcopy + --output-file zz_generated.deepcopy.go \ + $(find_dirs_containing_comment_tags "+k8s:deepcopy-gen=") diff --git a/hack/update-generated-defaulters.sh b/hack/update-generated-defaulters.sh index 52e0f42f2..ee3d7cf8e 100755 --- a/hack/update-generated-defaulters.sh +++ b/hack/update-generated-defaulters.sh @@ -6,6 +6,6 @@ go build -o "${OS_OUTPUT_BINPATH}/defaulter-gen" "k8s.io/code-generator/cmd/defa ${OS_OUTPUT_BINPATH}/defaulter-gen \ --go-header-file "hack/boilerplate/boilerplate.go.txt" \ - --input-dirs "$(find_dirs_containing_comment_tags "+k8s:defaulter-gen=")" \ - --extra-peer-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1" \ - --output-file-base zz_generated.defaults + --extra-peer-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1" \ + --output-file zz_generated.defaults.go \ + $(find_dirs_containing_comment_tags "+k8s:defaulter-gen=")