Fix make verify failure after kubernetes-sigs#802 (kubernetes-sigs#803

)

Signed-off-by: Vince Prignano <[email protected]>

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

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
 

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