LDFLAGS defined once for Makefile

kubernetes-sigs · Aug 31, 2023 · dceb4be · dceb4be
1 parent e7716fb
commit dceb4be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -199,7 +199,7 @@ ifeq ($(SELINUX_ENABLED),1)
 endif
 
 # Set build time variables including version details
-LDFLAGS := $(shell hack/version.sh)
+LDFLAGS ?= $(shell hack/version.sh)
 
 # Additional CAPV vars (everything else is ~ kept in sync with core CAPI)
 # Allow overriding manifest generation destination directory

diff --git a/hack/e2e.sh b/hack/e2e.sh
@@ -119,6 +119,7 @@ export WORKLOAD_CONTROL_PLANE_ENDPOINT_IP
 echo "Acquired Workload Cluster Control Plane IP: $WORKLOAD_CONTROL_PLANE_ENDPOINT_IP"
 
 # save the docker image locally
+export LDFLAGS=""
 make e2e-image
 mkdir -p "$ARTIFACTS"/tempContainers
 docker save gcr.io/k8s-staging-cluster-api/capv-manager:e2e -o "$DOCKER_IMAGE_TAR"