From b916cf50792a1912bfd09904aec54905665242e8 Mon Sep 17 00:00:00 2001
From: Marco Ebert <marco_ebert@icloud.com>
Date: Fri, 14 Feb 2025 21:36:21 +0100
Subject: [PATCH] Images: Migrate to AR. (1/2) (#12839)

---
 Makefile                                   | 2 +-
 cloudbuild.yaml                            | 2 +-
 images/cfssl/cloudbuild.yaml               | 2 +-
 images/custom-error-pages/cloudbuild.yaml  | 2 +-
 images/e2e-test-echo/cloudbuild.yaml       | 2 +-
 images/fastcgi-helloserver/cloudbuild.yaml | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 3ff56fc47..0b8f1f5c2 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ ifneq ($(PLATFORM),)
 	PLATFORM_FLAG="--platform"
 endif
 
-REGISTRY ?= gcr.io/k8s-staging-ingress-nginx
+REGISTRY ?= us-central1-docker.pkg.dev/k8s-staging-images/ingress-nginx
 
 BASE_IMAGE ?= $(shell cat NGINX_BASE)
 
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index cb74da0a5..0bb2b60a4 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -4,7 +4,7 @@ options:
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
     env:
-      - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+      - REGISTRY=us-central1-docker.pkg.dev/k8s-staging-images/ingress-nginx
       - REPO_INFO=https://github.com/kubernetes/ingress-nginx
       - COMMIT_SHA=${_PULL_BASE_SHA}
       - BUILD_ID=${BUILD_ID}
diff --git a/images/cfssl/cloudbuild.yaml b/images/cfssl/cloudbuild.yaml
index 612bae942..33fafdb08 100644
--- a/images/cfssl/cloudbuild.yaml
+++ b/images/cfssl/cloudbuild.yaml
@@ -4,7 +4,7 @@ options:
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
     env:
-      - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+      - REGISTRY=us-central1-docker.pkg.dev/k8s-staging-images/ingress-nginx
     entrypoint: bash
     args:
       - -c
diff --git a/images/custom-error-pages/cloudbuild.yaml b/images/custom-error-pages/cloudbuild.yaml
index 7a37591f8..324a8f19a 100644
--- a/images/custom-error-pages/cloudbuild.yaml
+++ b/images/custom-error-pages/cloudbuild.yaml
@@ -4,7 +4,7 @@ options:
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
     env:
-      - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+      - REGISTRY=us-central1-docker.pkg.dev/k8s-staging-images/ingress-nginx
     entrypoint: bash
     args:
       - -c
diff --git a/images/e2e-test-echo/cloudbuild.yaml b/images/e2e-test-echo/cloudbuild.yaml
index ada4486a4..02bfc034a 100644
--- a/images/e2e-test-echo/cloudbuild.yaml
+++ b/images/e2e-test-echo/cloudbuild.yaml
@@ -4,7 +4,7 @@ options:
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
     env:
-      - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+      - REGISTRY=us-central1-docker.pkg.dev/k8s-staging-images/ingress-nginx
     entrypoint: bash
     args:
       - -c
diff --git a/images/fastcgi-helloserver/cloudbuild.yaml b/images/fastcgi-helloserver/cloudbuild.yaml
index 9dc5588a1..c2c6135df 100644
--- a/images/fastcgi-helloserver/cloudbuild.yaml
+++ b/images/fastcgi-helloserver/cloudbuild.yaml
@@ -4,7 +4,7 @@ options:
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
     env:
-      - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+      - REGISTRY=us-central1-docker.pkg.dev/k8s-staging-images/ingress-nginx
     entrypoint: bash
     args:
       - -c