Merge pull request kube-reporting#1126 from timflannagan1/generalize-…

…repo-package-path hack,Makefile: Support overriding the script package path in the update-codegen script.
bentitopolis · Mar 18, 2020 · 48b9a79 · 48b9a79
2 parents 827d0b8 + c9526f3
commit 48b9a79
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -217,4 +217,4 @@ update-codegen: $(CODEGEN_OUTPUT_GO_FILES)
 $(CODEGEN_OUTPUT_GO_FILES): $(CODEGEN_SOURCE_GO_FILES)
 
 verify-codegen:
-	./hack/verify-codegen.sh
+	SCRIPT_PACKAGE=$(GO_PKG) ./hack/verify-codegen.sh
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-SCRIPT_PACKAGE=github.com/operator-framework/operator-metering
+SCRIPT_PACKAGE=${SCRIPT_PACKAGE:-"github.com/operator-framework/operator-metering"}
 SCRIPT_ROOT="$(realpath $(dirname ${BASH_SOURCE[0]})/..)"
 CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo k8s.io/code-generator)}