From b571b7473e2a107f7bf36f74b6567fb26cd2af9b 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:40:32 -0700
Subject: [PATCH] Images: Rework. (3/3) (#13016)

Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
---
 images/fastcgi-helloserver/cloudbuild.yaml  | 14 +++++++-------
 images/httpbun/cloudbuild.yaml              | 14 +++++++-------
 images/kube-webhook-certgen/cloudbuild.yaml | 14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/images/fastcgi-helloserver/cloudbuild.yaml b/images/fastcgi-helloserver/cloudbuild.yaml
index c2c6135df..6fa7a236f 100644
--- a/images/fastcgi-helloserver/cloudbuild.yaml
+++ b/images/fastcgi-helloserver/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=fastcgi-helloserver push
+- name: gcr.io/cloud-builders/docker
+  dir: images
+  env:
+  - NAME=fastcgi-helloserver
+  entrypoint: make
+  args:
+  - push
diff --git a/images/httpbun/cloudbuild.yaml b/images/httpbun/cloudbuild.yaml
index c56820d15..641735dd8 100644
--- a/images/httpbun/cloudbuild.yaml
+++ b/images/httpbun/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=httpbun push
+- name: gcr.io/cloud-builders/docker
+  dir: images
+  env:
+  - NAME=httpbun
+  entrypoint: make
+  args:
+  - push
diff --git a/images/kube-webhook-certgen/cloudbuild.yaml b/images/kube-webhook-certgen/cloudbuild.yaml
index e4118ff88..bf7c2a67e 100644
--- a/images/kube-webhook-certgen/cloudbuild.yaml
+++ b/images/kube-webhook-certgen/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=kube-webhook-certgen push
+- name: gcr.io/cloud-builders/docker
+  dir: images
+  env:
+  - NAME=kube-webhook-certgen
+  entrypoint: make
+  args:
+  - push