diff --git a/Makefile b/Makefile index 6c3a0959e..73f43cfc2 100644 --- a/Makefile +++ b/Makefile @@ -122,6 +122,7 @@ gen: verify-gen: ./hack/verify-conversions.sh + ./hack/verify-deep-copies.sh lint: ifndef HAS_GOLANGCI diff --git a/hack/verify-conversions.sh b/hack/verify-conversions.sh index 708b78cc2..1b698cce5 100755 --- a/hack/verify-conversions.sh +++ b/hack/verify-conversions.sh @@ -28,7 +28,7 @@ pushd "${DESCHEDULER_ROOT}" > /dev/null 2>&1 if ! _out="$(diff -Naupr pkg/ "${_deschedulertmp}/pkg/")"; then echo "Generated output differs:" >&2 echo "${_out}" >&2 - echo "Generated conversions verify failed." + echo "Generated conversions verify failed. Please run ./hack/update-conversions.sh" exit 1 fi popd > /dev/null 2>&1 diff --git a/hack/verify-deep-copies.sh b/hack/verify-deep-copies.sh new file mode 100755 index 000000000..e8d4a5f9d --- /dev/null +++ b/hack/verify-deep-copies.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +set -o errexit +set -o nounset +set -o pipefail + +source "$(dirname "${BASH_SOURCE}")/lib/init.sh" +DESCHEDULER_ROOT=$(dirname "${BASH_SOURCE}")/.. +mkdir -p "${DESCHEDULER_ROOT}/_tmp" +_tmpdir="$(mktemp -d "${DESCHEDULER_ROOT}/_tmp/kube-verify.XXXXXX")" + +_deschedulertmp="${_tmpdir}" +mkdir -p "${_deschedulertmp}" + +git archive --format=tar --prefix=descheduler/ "$(git write-tree)" | (cd "${_deschedulertmp}" && tar xf -) +_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" \ + --output-file-base zz_generated.deepcopy +popd > /dev/null 2>&1 + +pushd "${DESCHEDULER_ROOT}" > /dev/null 2>&1 +if ! _out="$(diff -Naupr pkg/ "${_deschedulertmp}/pkg/")"; then + echo "Generated deep-copies output differs:" >&2 + echo "${_out}" >&2 + echo "Generated deep-copies verify failed. Please run ./hack/update-deep-copies.sh" + exit 1 +fi +popd > /dev/null 2>&1 + +echo "Generated deep-copies verified."