Merge pull request #3278 from meghanajangi/apidiff-fix

fix: Apidiff prow job is failing

Makefile

@@ -314,9 +314,11 @@ verify-gen: generate ## Verify generated files
 		echo "generated files are out of date, run make generate"; exit 1; \
 	fi
 
+APIDIFF_OLD_COMMIT ?= $(shell git rev-parse origin/main)
+
 .PHONY: apidiff
 apidiff: $(GO_APIDIFF) ## Check for API differences
-	$(GO_APIDIFF) $(shell git rev-parse origin/main) --print-compatible
+	$(GO_APIDIFF) $(APIDIFF_OLD_COMMIT) --print-compatible
 
 ##@ build:
 

scripts/ci-apidiff.sh

@@ -19,9 +19,8 @@ set -o nounset
 set -o pipefail
 
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
-APIDIFF="${REPO_ROOT}/hack/tools/bin/go-apidiff"
 
-cd "${REPO_ROOT}" && make apidiff
-echo "*** Running go-apidiff ***"
+cd "${REPO_ROOT}"
 
-${APIDIFF} "${PULL_BASE_SHA}" --print-compatible
+echo "*** Running go-apidiff ***"
+APIDIFF_OLD_COMMIT="${PULL_BASE_SHA}" make apidiff