Skip to content

Commit 1298ccd

Browse files
chore: Migrate gsutil usage to gcloud storage (#192)
1 parent 76c2589 commit 1298ccd

5 files changed

Lines changed: 14 additions & 15 deletions

File tree

ai-infrastructure/tpu-training-on-gke/environment/cloudbuild.destroy.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ steps:
2020
args:
2121
- -c
2222
- |
23-
gsutil cp gs://${_AUTOMATION_BUCKET}/providers/* .
23+
gcloud storage cp gs://${_AUTOMATION_BUCKET}/providers/* .
2424
sed -i "s/<FOLDER-NAME>/${_ENV_NAME}\/tfstate\/gke_config/g" backend.tf
25-
gsutil cp gs://${_AUTOMATION_BUCKET}/tfvars/0-bootstrap.auto.tfvars.json .
26-
gsutil cp gs://${_AUTOMATION_BUCKET}/${_ENV_NAME}/tfvars/1-base-infra.auto.tfvars.json .
25+
gcloud storage cp gs://${_AUTOMATION_BUCKET}/tfvars/0-bootstrap.auto.tfvars.json .
26+
gcloud storage cp gs://${_AUTOMATION_BUCKET}/${_ENV_NAME}/tfvars/1-base-infra.auto.tfvars.json .
2727
echo '{"env_name":"${_ENV_NAME}"}' > env-name.auto.tfvars.json
2828
2929
- id: 'Destroy GKE config - tf init'
@@ -47,9 +47,9 @@ steps:
4747
args:
4848
- -c
4949
- |
50-
gsutil cp gs://${_AUTOMATION_BUCKET}/providers/* .
50+
gcloud storage cp gs://${_AUTOMATION_BUCKET}/providers/* .
5151
sed -i "s/<FOLDER-NAME>/${_ENV_NAME}\/tfstate\/base_infra/g" backend.tf
52-
gsutil cp gs://${_AUTOMATION_BUCKET}/tfvars/0-bootstrap.auto.tfvars.json .
52+
gcloud storage cp gs://${_AUTOMATION_BUCKET}/tfvars/0-bootstrap.auto.tfvars.json .
5353
echo '{"env_name":"${_ENV_NAME}"}' > env-name.auto.tfvars.json
5454
5555
- id: 'Destroy base infra - tf init'

ai-infrastructure/tpu-training-on-gke/environment/cloudbuild.provision.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ steps:
2020
args:
2121
- -c
2222
- |
23-
gsutil cp gs://${_AUTOMATION_BUCKET}/providers/* .
24-
gsutil cp gs://${_AUTOMATION_BUCKET}/tfvars/0-bootstrap.auto.tfvars.json .
23+
gcloud storage cp gs://${_AUTOMATION_BUCKET}/providers/* .
24+
gcloud storage cp gs://${_AUTOMATION_BUCKET}/tfvars/0-bootstrap.auto.tfvars.json .
2525
sed -i "s/<FOLDER-NAME>/${_ENV_NAME}\/tfstate\/base_infra/g" backend.tf
2626
echo '{"env_name":"${_ENV_NAME}"}' > env-name.auto.tfvars.json
2727
@@ -49,7 +49,7 @@ steps:
4949
## This is a mitigation to address issues with using Terraform to install CRDs.
5050
wget -O jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64
5151
chmod 755 jq
52-
gsutil cp gs://${_AUTOMATION_BUCKET}/${_ENV_NAME}/settings/1-base-infra-settings.json .
52+
gcloud storage cp gs://${_AUTOMATION_BUCKET}/${_ENV_NAME}/settings/1-base-infra-settings.json .
5353
CLUSTER_NAME=$(cat 1-base-infra-settings.json | ./jq -r '.cluster_name')
5454
CLUSTER_LOCATION=$(cat 1-base-infra-settings.json | ./jq -r '.cluster_location')
5555
gcloud config set auth/impersonate_service_account $_AUTOMATION_ACCOUNT
@@ -58,9 +58,9 @@ steps:
5858
kubectl apply --server-side -f "https://github.com/kubernetes-sigs/kueue/releases/download/$_KUEUE_API_VERSION/manifests.yaml"
5959
6060
# Prepare tfvars and providers for the Terraform gke-config stage
61-
gsutil cp gs://${_AUTOMATION_BUCKET}/tfvars/0-bootstrap.auto.tfvars.json .
62-
gsutil cp gs://${_AUTOMATION_BUCKET}/providers/* .
63-
gsutil cp gs://${_AUTOMATION_BUCKET}/${_ENV_NAME}/tfvars/1-base-infra.auto.tfvars.json .
61+
gcloud storage cp gs://${_AUTOMATION_BUCKET}/tfvars/0-bootstrap.auto.tfvars.json .
62+
gcloud storage cp gs://${_AUTOMATION_BUCKET}/providers/* .
63+
gcloud storage cp gs://${_AUTOMATION_BUCKET}/${_ENV_NAME}/tfvars/1-base-infra.auto.tfvars.json .
6464
sed -i "s/<FOLDER-NAME>/${_ENV_NAME}\/tfstate\/gke_config/g" backend.tf
6565
echo '{"env_name":"${_ENV_NAME}"}' > env-name.auto.tfvars.json
6666

genai-on-vertex-ai/agents/reasoning_engine/crewai/CrewAI_on_VertexAI_Reasoning_Engine.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"metadata": {},
264264
"outputs": [],
265265
"source": [
266-
"!set -x && gsutil mb -p $PROJECT_ID -l $LOCATION $STAGING_BUCKET"
266+
"!set -x && gcloud storage buckets create --project $PROJECT_ID --location $LOCATION $STAGING_BUCKET"
267267
]
268268
},
269269
{

genai-on-vertex-ai/gemini/prompting_recipes/spatial_reasoning/spatial_reasoning_app_for_gemini2.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@
461461
" if not os.path.exists(local_path):\n",
462462
" print(f'Local path to image file does not exist: {local_path}')\n",
463463
" print(f'Downloading sample image from GCS...')\n",
464-
" !gsutil cp \"{gcs_uri}\" \"{local_path}\"\n",
464+
" !gcloud storage cp \"{gcs_uri}\" \"{local_path}\"\n",
465465
" else:\n",
466466
" print(f'Image already exists at: {local_path}')\n"
467467
]

genai-on-vertex-ai/retrieval_augmented_generation/diy_rag_with_vertexai_apis/build_grounded_rag_app_with_vertex.ipynb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2877,8 +2877,7 @@
28772877
"outputs": [],
28782878
"source": [
28792879
"if DELETE_BUCKET:\n",
2880-
" ! gsutil -m rm -r $STAGING_BUCKET_URI"
2881-
]
2880+
" ! gcloud storage rm --recursive $STAGING_BUCKET_URI" ]
28822881
},
28832882
{
28842883
"cell_type": "markdown",

0 commit comments

Comments
 (0)