From c66fb349d0104b45de54c148361f99effc5bbf96 Mon Sep 17 00:00:00 2001
From: Vince Prignano <vince@vincepri.com>
Date: Tue, 5 Mar 2019 13:44:00 -0800
Subject: [PATCH] Fix `make verify` failure after #802 (#803)

Signed-off-by: Vince Prignano <vincepri@vmware.com>
---
 Makefile                 | 2 +-
 hack/verify-bazel.sh     | 1 -
 hack/verify_clientset.sh | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 03fefe496d31..75cf7ebb5f2e 100644
--- a/Makefile
+++ b/Makefile
@@ -84,6 +84,7 @@ lint-full: dep-ensure ## Run slower linters to detect possible issues
 .PHONY: generate
 generate: clientset dep-ensure ## Generate code
 	go generate ./pkg/... ./cmd/...
+	$(MAKE) gazelle
 
 .PHONY: clientset
 clientset: ## Generate a typed clientset
@@ -100,7 +101,6 @@ clientset: ## Generate a typed clientset
 		--listers-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
 		--output-package sigs.k8s.io/cluster-api/pkg/client/informers_generated \
 		--go-header-file=./hack/boilerplate.go.txt
-	$(MAKE) gazelle
 
 .PHONY: clean
 clean: ## Remove all generated files
diff --git a/hack/verify-bazel.sh b/hack/verify-bazel.sh
index 05a3d67bcaef..0518bbca717a 100755
--- a/hack/verify-bazel.sh
+++ b/hack/verify-bazel.sh
@@ -16,7 +16,6 @@
 set -o errexit
 set -o nounset
 set -o pipefail
-set -o verbose
 
 if ! which bazel &>/dev/null; then echo "Bazel not available, skipping validation"; exit; fi
 
diff --git a/hack/verify_clientset.sh b/hack/verify_clientset.sh
index c8d36fb696dd..fd82b41a3ef7 100755
--- a/hack/verify_clientset.sh
+++ b/hack/verify_clientset.sh
@@ -35,6 +35,7 @@ mkdir -p "${TMP_DIFFROOT}"
 cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}"
 
 make clientset
+find "${TMP_DIFFROOT}" -name *.bazel -delete
 
 echo "diffing ${DIFFROOT} against freshly generated codegen"
 ret=0