From 7b95450e345d1d5e10fe8cc2b745732de8637ff2 Mon Sep 17 00:00:00 2001
From: k8s-infra-cherrypick-robot
 <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com>
Date: Sun, 23 Mar 2025 09:38:32 -0700
Subject: [PATCH] Images: Rework. (2/3) (#13011)

Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
---
 images/cfssl/cloudbuild.yaml              | 14 +++++++-------
 images/custom-error-pages/cloudbuild.yaml | 14 +++++++-------
 images/e2e-test-echo/cloudbuild.yaml      | 14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/images/cfssl/cloudbuild.yaml b/images/cfssl/cloudbuild.yaml
index 33fafdb08..10039e5b1 100644
--- a/images/cfssl/cloudbuild.yaml
+++ b/images/cfssl/cloudbuild.yaml
@@ -2,10 +2,10 @@ options:
   # Ignore Prow provided substitutions.
   substitution_option: ALLOW_LOOSE
 steps:
-  - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
-    env:
-      - REGISTRY=us-central1-docker.pkg.dev/k8s-staging-images/ingress-nginx
-    entrypoint: bash
-    args:
-      - -c
-      - gcloud auth configure-docker && cd images && make NAME=cfssl push
+- name: gcr.io/cloud-builders/docker
+  dir: images
+  env:
+  - NAME=cfssl
+  entrypoint: make
+  args:
+  - push
diff --git a/images/custom-error-pages/cloudbuild.yaml b/images/custom-error-pages/cloudbuild.yaml
index 324a8f19a..38db680f4 100644
--- a/images/custom-error-pages/cloudbuild.yaml
+++ b/images/custom-error-pages/cloudbuild.yaml
@@ -2,10 +2,10 @@ options:
   # Ignore Prow provided substitutions.
   substitution_option: ALLOW_LOOSE
 steps:
-  - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
-    env:
-      - REGISTRY=us-central1-docker.pkg.dev/k8s-staging-images/ingress-nginx
-    entrypoint: bash
-    args:
-      - -c
-      - gcloud auth configure-docker && cd images && make NAME=custom-error-pages push
+- name: gcr.io/cloud-builders/docker
+  dir: images
+  env:
+  - NAME=custom-error-pages
+  entrypoint: make
+  args:
+  - push
diff --git a/images/e2e-test-echo/cloudbuild.yaml b/images/e2e-test-echo/cloudbuild.yaml
index 02bfc034a..c964f6d3d 100644
--- a/images/e2e-test-echo/cloudbuild.yaml
+++ b/images/e2e-test-echo/cloudbuild.yaml
@@ -2,10 +2,10 @@ options:
   # Ignore Prow provided substitutions.
   substitution_option: ALLOW_LOOSE
 steps:
-  - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d
-    env:
-      - REGISTRY=us-central1-docker.pkg.dev/k8s-staging-images/ingress-nginx
-    entrypoint: bash
-    args:
-      - -c
-      - gcloud auth configure-docker && cd images && make NAME=e2e-test-echo push
+- name: gcr.io/cloud-builders/docker
+  dir: images
+  env:
+  - NAME=e2e-test-echo
+  entrypoint: make
+  args:
+  - push