From f2b674e690614f4de2cb552d61fbbe6b84ee8b1b Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Thu, 13 Oct 2022 17:03:24 +0000 Subject: [PATCH] Update verify scripts to use the generation scripts directly --- hack/verify-conversions.sh | 7 +------ hack/verify-deep-copies.sh | 7 +------ hack/verify-defaulters.sh | 8 +------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/hack/verify-conversions.sh b/hack/verify-conversions.sh index a86861ea8..1dd4e6c58 100755 --- a/hack/verify-conversions.sh +++ b/hack/verify-conversions.sh @@ -16,12 +16,7 @@ git archive --format=tar --prefix=descheduler/ "$(git write-tree)" | (cd "${_des _deschedulertmp="${_deschedulertmp}/descheduler" pushd "${_deschedulertmp}" > /dev/null 2>&1 -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 "./pkg/apis/componentconfig/v1alpha1,./pkg/api/v1alpha1" \ - --output-file-base zz_generated.conversion +./hack/update-generated-conversions.sh popd > /dev/null 2>&1 pushd "${DESCHEDULER_ROOT}" > /dev/null 2>&1 diff --git a/hack/verify-deep-copies.sh b/hack/verify-deep-copies.sh index 817b1046e..86bdf2193 100755 --- a/hack/verify-deep-copies.sh +++ b/hack/verify-deep-copies.sh @@ -16,12 +16,7 @@ git archive --format=tar --prefix=descheduler/ "$(git write-tree)" | (cd "${_des _deschedulertmp="${_deschedulertmp}/descheduler" pushd "${_deschedulertmp}" > /dev/null 2>&1 -go build -o "${OS_OUTPUT_BINPATH}/deepcopy-gen" "k8s.io/code-generator/cmd/deepcopy-gen" - -${OS_OUTPUT_BINPATH}/deepcopy-gen \ - --go-header-file "hack/boilerplate/boilerplate.go.txt" \ - --input-dirs "./pkg/apis/componentconfig,./pkg/apis/componentconfig/v1alpha1,./pkg/api,./pkg/api/v1alpha1,./pkg/framework/plugins/defaultevictor/" \ - --output-file-base zz_generated.deepcopy +./hack/update-generated-deep-copies.sh popd > /dev/null 2>&1 pushd "${DESCHEDULER_ROOT}" > /dev/null 2>&1 diff --git a/hack/verify-defaulters.sh b/hack/verify-defaulters.sh index 61d5597d9..7082e7781 100755 --- a/hack/verify-defaulters.sh +++ b/hack/verify-defaulters.sh @@ -15,13 +15,7 @@ git archive --format=tar --prefix=descheduler/ "$(git write-tree)" | (cd "${_des _deschedulertmp="${_deschedulertmp}/descheduler" pushd "${_deschedulertmp}" > /dev/null 2>&1 -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" \ - --extra-peer-dirs "${PRJ_PREFIX}/pkg/apis/componentconfig/v1alpha1,${PRJ_PREFIX}/pkg/api/v1alpha1" \ - --output-file-base zz_generated.defaults +./hack/update-generated-defaulters.sh popd > /dev/null 2>&1 pushd "${DESCHEDULER_ROOT}" > /dev/null 2>&1