From 2b1746cda8883c199329510ac021b1c6badf4984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?vlc=E5=88=98=E8=AF=9A?= Date: Wed, 21 Sep 2022 09:33:28 +0800 Subject: [PATCH] + new line & automatic file scan mechanism for conversions/defaulters gen --- hack/lib/generator-help.sh | 2 +- hack/update-generated-conversions.sh | 3 ++- hack/update-generated-defaulters.sh | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hack/lib/generator-help.sh b/hack/lib/generator-help.sh index 04679d6b9..a79bf584a 100644 --- a/hack/lib/generator-help.sh +++ b/hack/lib/generator-help.sh @@ -24,4 +24,4 @@ function find_dirs_containing_comment_tags() { IFS=","; printf '%s' "${array[*]}"; -} \ No newline at end of file +} diff --git a/hack/update-generated-conversions.sh b/hack/update-generated-conversions.sh index 493685e8d..4edd5c967 100755 --- a/hack/update-generated-conversions.sh +++ b/hack/update-generated-conversions.sh @@ -1,9 +1,10 @@ #!/bin/bash source "$(dirname "${BASH_SOURCE}")/lib/init.sh" +source "$(dirname "${BASH_SOURCE}")/lib/generator-help.sh" go build -o "${OS_OUTPUT_BINPATH}/conversion-gen" "k8s.io/code-generator/cmd/conversion-gen" ${OS_OUTPUT_BINPATH}/conversion-gen \ --go-header-file "hack/boilerplate/boilerplate.go.txt" \ - --input-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1,${PRJ_PREFIX}/pkg/framework/plugins/removefailedpods,${PRJ_PREFIX}/pkg/framework/plugins/nodeutilization,${PRJ_PREFIX}/pkg/framework/plugins/podlifetime,${PRJ_PREFIX}/pkg/framework/plugins/removeduplicates,${PRJ_PREFIX}/pkg/framework/plugins/removepodshavingtoomanyrestarts,${PRJ_PREFIX}/pkg/framework/plugins/removepodsviolatinginterpodantiaffinity,${PRJ_PREFIX}/pkg/framework/plugins/removepodsviolatingnodeaffinity,${PRJ_PREFIX}/pkg/framework/plugins/removepodsviolatingnodetaints,${PRJ_PREFIX}/pkg/framework/plugins/removepodsviolatingtopologyspreadconstraint" \ + --input-dirs "$(find_dirs_containing_comment_tags "+k8s:conversion-gen=")" \ --output-file-base zz_generated.conversion diff --git a/hack/update-generated-defaulters.sh b/hack/update-generated-defaulters.sh index 1c88e1d11..52e0f42f2 100755 --- a/hack/update-generated-defaulters.sh +++ b/hack/update-generated-defaulters.sh @@ -1,10 +1,11 @@ #!/bin/bash source "$(dirname "${BASH_SOURCE}")/lib/init.sh" +source "$(dirname "${BASH_SOURCE}")/lib/generator-help.sh" go build -o "${OS_OUTPUT_BINPATH}/defaulter-gen" "k8s.io/code-generator/cmd/defaulter-gen" ${OS_OUTPUT_BINPATH}/defaulter-gen \ --go-header-file "hack/boilerplate/boilerplate.go.txt" \ - --input-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1" \ + --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