From b03a1883c8f25d1cdeb82cf1d698bc0371c52ae5 Mon Sep 17 00:00:00 2001 From: gurusai-voleti Date: Tue, 30 Dec 2025 12:54:47 +0000 Subject: [PATCH] chore: Migrate gsutil usage to gcloud storage --- community/3-tier/cleanup.sh | 4 ++-- community/3-tier/deployCitiesMicroservices.sh | 6 +++--- community/lustre/scripts/startup-script.sh | 2 +- tools/alt-testing/create-projects.sh | 2 +- tools/scheduled-deployments/README.md | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/community/3-tier/cleanup.sh b/community/3-tier/cleanup.sh index 8751cc04c..a9a2c85fc 100755 --- a/community/3-tier/cleanup.sh +++ b/community/3-tier/cleanup.sh @@ -12,8 +12,8 @@ deleteBucket() { local BUCKET_NAME=$PROJECT-$APP echo "Deleting bucket" - gsutil rm -raf gs://${BUCKET_NAME}/* - gsutil rb -f gs://${BUCKET_NAME}/ + gcloud storage rm --recursive --all-versions --continue-on-error gs://${BUCKET_NAME}/* + gcloud storage buckets delete --continue-on-error gs://${BUCKET_NAME}/ } ## diff --git a/community/3-tier/deployCitiesMicroservices.sh b/community/3-tier/deployCitiesMicroservices.sh index 4bb77774b..92cdce5be 100755 --- a/community/3-tier/deployCitiesMicroservices.sh +++ b/community/3-tier/deployCitiesMicroservices.sh @@ -28,7 +28,7 @@ echo ${BUCKET_NAME} echo_mesg "Deploying cities-service" ######### Copy Startup Script for cities-service - gsutil cp -r startup-scripts/cities-service.sh gs://${BUCKET_NAME}/startup-scripts/cities-service.sh + gcloud storage cp --recursive startup-scripts/cities-service.sh gs://${BUCKET_NAME}/startup-scripts/cities-service.sh ######### Create Instance Group for cities service createRegionalInstanceGroup cities-service ${APP_REGION} ${PROJECT} $NETWORK $SUBNET $BUCKET_NAME @@ -49,7 +49,7 @@ deployCitiesUI() { echo_mesg "Deploying cities-ui" ######### Copy startup script for cities-ui - gsutil cp -r startup-scripts/cities-ui.sh gs://${BUCKET_NAME}/startup-scripts/cities-ui.sh + gcloud storage cp --recursive startup-scripts/cities-ui.sh gs://${BUCKET_NAME}/startup-scripts/cities-ui.sh ######### Create Instance Groups for cities ui createRegionalInstanceGroup cities-ui ${APP_REGION} ${PROJECT} $NETWORK $SUBNET $BUCKET_NAME @@ -94,7 +94,7 @@ echo_mesg "****** Deploying Microservices *****" ######### Create Bucket echo_mesg "Creating Bucket" -gsutil mb gs://${BUCKET_NAME}/ +gcloud storage buckets create gs://${BUCKET_NAME}/ ######## Create VPC Network and subnetwork createVPCNetwork diff --git a/community/lustre/scripts/startup-script.sh b/community/lustre/scripts/startup-script.sh index 94eb18f23..1f94ecfeb 100644 --- a/community/lustre/scripts/startup-script.sh +++ b/community/lustre/scripts/startup-script.sh @@ -175,7 +175,7 @@ EOF function hsm_import_bucket() { - bucket_file_list=`gsutil ls -r ${HSM_GCS_BUCKET_IMPORT}/** | sed "/\/:$/d"` + bucket_file_list=`gcloud storage ls --recursive ${HSM_GCS_BUCKET_IMPORT}/** | sed "/\/:$/d"` for i in $bucket_file_list do diff --git a/tools/alt-testing/create-projects.sh b/tools/alt-testing/create-projects.sh index 8f1b5a19a..cd4debfcb 100644 --- a/tools/alt-testing/create-projects.sh +++ b/tools/alt-testing/create-projects.sh @@ -36,7 +36,7 @@ gcloud iam service-accounts add-iam-policy-binding \ cnrm-system@${KRM_PROJECT_ID}.iam.gserviceaccount.com \ --member="serviceAccount:${KRM_PROJECT_ID}.svc.id.goog[cnrm-system/cnrm-controller-manager]" \ --role="roles/iam.workloadIdentityUser" -gsutil cp gs://cnrm/latest/release-bundle.tar.gz release-bundle.tar.gz +gcloud storage cp gs://cnrm/latest/release-bundle.tar.gz release-bundle.tar.gz rm -rf release-bundle tar zxvf release-bundle.tar.gz sed -i.bak 's/${PROJECT_ID?}/'"$KRM_PROJECT_ID"'/' install-bundle-workload-identity/0-cnrm-system.yaml diff --git a/tools/scheduled-deployments/README.md b/tools/scheduled-deployments/README.md index a8b8d0591..2493d403c 100644 --- a/tools/scheduled-deployments/README.md +++ b/tools/scheduled-deployments/README.md @@ -67,7 +67,7 @@ $ zip -jr ./functions scheduled-deployments.zip and upload that folder to Cloud Storage ```sh -$ gsutil cp scheduled-deployments.zip gs://[PROJECT-ID].appspot.com +$ gcloud storage cp scheduled-deployments.zip gs://[PROJECT-ID].appspot.com ``` where `gs://[PROJECT-ID].appspot.com` is your Cloud Storage bucket name. @@ -89,7 +89,7 @@ Cloud Storage. Make sure the file is set to be shared publicly. To upload to Cloud Storage, you can execute ```sh -$ gsutil cp -a public-read openapi.json gs://[PROJECT-ID].appspot.com +$ gcloud storage cp --predefined-acl=public-read openapi.json gs://[PROJECT-ID].appspot.com ``` so your specification file will be available at