fail on make verify if generated CRDs differ (#1906)

* fail on make verify if generated CRDs differ

Signed-off-by: Adnan Abdulhussein <aadnan@vmware.com>

* make verification error more clear

Signed-off-by: Adnan Abdulhussein <aadnan@vmware.com>
This commit is contained in:
Adnan Abdulhussein
2019-09-25 11:28:38 -07:00
committed by Nolan Brubaker
parent dd088e3475
commit 63ff1ad99b
2 changed files with 10 additions and 5 deletions

View File

@@ -41,11 +41,6 @@ ${GOPATH}/src/k8s.io/code-generator/generate-groups.sh \
--go-header-file ${GOPATH}/src/github.com/heptio/velero/hack/boilerplate.go.txt \
$@
if [[ "$@" == "--verify-only" ]]; then
# skip generating CRD manifests
exit
fi
go run ${GOPATH}/src/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go \
crd \
output:dir=pkg/generated/crds/manifests \

View File

@@ -17,3 +17,13 @@
HACK_DIR=$(dirname "${BASH_SOURCE}")
${HACK_DIR}/update-generated-crd-code.sh --verify-only
# ensure no changes to generated CRDs
if ! git diff --exit-code pkg/generated/crds/crds.go >/dev/null; then
# revert changes to state before running CRD generation to stay consistent
# with code-generator `--verify-only` option which discards generated changes
git checkout pkg/generated/crds
echo "CRD verification - failed! Generated CRDs are out-of-date, please run 'make update'."
exit 1
fi