diff --git a/Makefile b/Makefile index 07898df..f5fb598 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ REGISTRY?=gcr.io/k8s-staging-networking # tag based on date-sha TAG?=$(shell echo "$$(date +v%Y%m%d)-$$(git describe --always --dirty)") # the full image tag -IMAGE?=$(REGISTRY)/$(IMAGE_NAME):$(TAG) +KNP_IMAGE?=$(REGISTRY)/$(IMAGE_NAME):$(TAG) PLATFORMS?=linux/amd64,linux/arm64 .PHONY: ensure-buildx @@ -43,13 +43,13 @@ ensure-buildx: image-build: docker buildx build . \ - --tag="${IMAGE}" \ + --tag="${KNP_IMAGE}" \ --load image-push: docker buildx build . \ --platform="${PLATFORMS}" \ - --tag="${IMAGE}" \ + --tag="${KNP_IMAGE}" \ --push .PHONY: release # Build a multi-arch docker image diff --git a/cloudbuild.yaml b/cloudbuild.yaml index b5de496..7e8fdee 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -5,4 +5,7 @@ options: steps: - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240718-5ef92b5c36 entrypoint: make + env: + - REGISTRY=gcr.io/k8s-staging-networking + - IMAGE_NAME=kube-network-policies args: ['release']