From d8b41750c3a31e460cf7d6dd0dcf5a296e388c73 Mon Sep 17 00:00:00 2001
From: bhandarivijay <bhandarivijay@google.com>
Date: Wed, 4 Mar 2026 09:13:15 +0000
Subject: [PATCH] chore: Migrate gsutil usage to gcloud storage

---
 Makefile                       | 2 +-
 deploy/cloudbuild.yaml         | 4 ++--
 deploy/release.sh              | 2 +-
 deploy/release_cloudbuild.yaml | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index c00f6f51..f3bdef56 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ $(BUILD_DIR):
 
 .PHONY: release
 release: cross
-	gsutil cp $(BUILD_DIR)/$(PROJECT)-* gs://$(RELEASE_BUCKET)/$(VERSION)/
+	gcloud storage cp $(BUILD_DIR)/$(PROJECT)-* gs://$(RELEASE_BUCKET)/$(VERSION)/
 
 .PHONY: clean
 clean:
diff --git a/deploy/cloudbuild.yaml b/deploy/cloudbuild.yaml
index 6edd8562..77918e90 100644
--- a/deploy/cloudbuild.yaml
+++ b/deploy/cloudbuild.yaml
@@ -26,8 +26,8 @@ steps:
 
 
 # Upload to GCS
-  - name: 'gcr.io/cloud-builders/gsutil'
-    args: ['cp', '-r', 'out/*', 'gs://container-structure-test/builds/$COMMIT_SHA/']
+  - name: 'gcr.io/cloud-builders/gcloud'
+    args: ['storage', 'cp', '--recursive', 'out/*', 'gs://container-structure-test/builds/$COMMIT_SHA/']
 
 # Build the image
   - name: 'gcr.io/cloud-builders/docker'
diff --git a/deploy/release.sh b/deploy/release.sh
index 27e6d921..1feaeb53 100755
--- a/deploy/release.sh
+++ b/deploy/release.sh
@@ -24,4 +24,4 @@ if [ -z "$COMMIT" ]; then
   usage
 fi
 
-gsutil cp gs://container-structure-test/builds/$COMMIT/container-structure-test gs://container-structure-test/latest/
+gcloud storage cp gs://container-structure-test/builds/$COMMIT/container-structure-test gs://container-structure-test/latest/
diff --git a/deploy/release_cloudbuild.yaml b/deploy/release_cloudbuild.yaml
index 78d60890..34a53076 100644
--- a/deploy/release_cloudbuild.yaml
+++ b/deploy/release_cloudbuild.yaml
@@ -26,11 +26,11 @@ steps:
     env: ['GOARCH=ppc64le']
 
 # Upload to GCS
-  - name: 'gcr.io/cloud-builders/gsutil'
-    args: ['cp', '-r', 'out/*', 'gs://container-structure-test/$TAG_NAME/']
+  - name: 'gcr.io/cloud-builders/gcloud'
+    args: ['storage', 'cp', '--recursive', 'out/*', 'gs://container-structure-test/$TAG_NAME/']
 
-  - name: 'gcr.io/cloud-builders/gsutil'
-    args: ['cp', '-r', 'gs://container-structure-test/$TAG_NAME/*', 'gs://container-structure-test/latest/']
+  - name: 'gcr.io/cloud-builders/gcloud'
+    args: ['storage', 'cp', '--recursive', 'gs://container-structure-test/$TAG_NAME/*', 'gs://container-structure-test/latest/']
 
 # Build the image
   - name: 'gcr.io/cloud-builders/docker'