From 376d42c0a4229d79f38b9d554efca105a326b553 Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Sun, 27 Aug 2023 13:12:40 -0700
Subject: [PATCH] Fixes to staging image build

---
 Makefile        | 2 +-
 cloudbuild.yaml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 151a654bb..6c20af343 100644
--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,7 @@ test:
 
 BINARY        ?= external-dns
 SOURCES        = $(shell find . -name '*.go')
+IMAGE_STAGING  = gcr.io/k8s-staging-external-dns/$(BINARY)
 REGISTRY      ?= us.gcr.io/k8s-artifacts-prod/external-dns
 IMAGE         ?= $(REGISTRY)/$(BINARY)
 VERSION       ?= $(shell git describe --tags --always --dirty --match "v*")
@@ -148,7 +149,6 @@ clean:
 .PHONY: release.staging
 
 release.staging: test
-	@echo "Perhaps use ${IMAGE} instead of ${IMAGE_STAGING} ?"
 	IMAGE=$(IMAGE_STAGING) $(MAKE) build.push/multiarch
 
 release.prod: test
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index af82a21b1..d16c29e56 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -9,7 +9,6 @@ steps:
     env:
       - VERSION=$_GIT_TAG
       - PULL_BASE_REF=$_PULL_BASE_REF
-      - REGISTRY=$_DOCKER_REGISTRY
     args:
       - release.staging
 substitutions: