diff --git a/cloudbuild-tag-prerelease.yaml b/cloudbuild-tag-prerelease.yaml index 4ad43ea2..adbfdd31 100644 --- a/cloudbuild-tag-prerelease.yaml +++ b/cloudbuild-tag-prerelease.yaml @@ -43,7 +43,7 @@ steps: --version $TAG_NAME \ --destination charts-tgz/ - gsutil cp gs://$PROJECT_ID/charts/index.yaml index.yaml + gcloud storage cp gs://$PROJECT_ID/charts/index.yaml index.yaml helm repo index --merge index.yaml charts-tgz/ images: diff --git a/cloudbuild-tag.yaml b/cloudbuild-tag.yaml index 499eacdf..66a369c3 100644 --- a/cloudbuild-tag.yaml +++ b/cloudbuild-tag.yaml @@ -80,7 +80,7 @@ steps: --version $TAG_NAME \ --destination charts-tgz/ - gsutil cp gs://$PROJECT_ID/charts/index.yaml index.yaml + gcloud storage cp gs://$PROJECT_ID/charts/index.yaml index.yaml helm repo index --merge index.yaml charts-tgz/ images: diff --git a/cloudbuild.yaml b/cloudbuild.yaml index b0284121..67adcb00 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -128,7 +128,7 @@ steps: --version "0.0.0+sha.$COMMIT_SHA" \ --destination charts-tgz/ - gsutil cp gs://$PROJECT_ID-charts/index.yaml index.yaml + gcloud storage cp gs://$PROJECT_ID-charts/index.yaml index.yaml helm repo index --merge index.yaml charts-tgz/ - id: &InitializeCredentials Initialize Credentials diff --git a/docs/billing-integration.md b/docs/billing-integration.md index 988ef5ad..2b01b911 100644 --- a/docs/billing-integration.md +++ b/docs/billing-integration.md @@ -324,7 +324,7 @@ mpdev install ... \ Alternately, you can download and apply this secret to your target namespace and then point your application to it: ```shell -gsutil cp gs://cloud-marketplace-tools/reporting_secrets/fake_reporting_secret.yaml . +gcloud storage cp gs://cloud-marketplace-tools/reporting_secrets/fake_reporting_secret.yaml . # The downloaded secret doesn't have a name. Give it one and apply to the target namespace. diff --git a/marketplace/deployer_util/storage.py b/marketplace/deployer_util/storage.py index 502c80c8..a97c6952 100644 --- a/marketplace/deployer_util/storage.py +++ b/marketplace/deployer_util/storage.py @@ -30,7 +30,7 @@ def load(path): def _gcs_load(path): """Returns a gcs object's contents as a string.""" - return Command("gsutil cat {}".format(path)).output + return Command("gcloud storage cat {}".format(path)).output def _file_load(path): diff --git a/scripts/doctor.py b/scripts/doctor.py index 1bf9b8a5..b0ec839a 100755 --- a/scripts/doctor.py +++ b/scripts/doctor.py @@ -228,13 +228,13 @@ def check_crd(args): def check_gsutil(args): - p = subprocess.run(['gsutil', 'ls'], + p = subprocess.run(['gcloud', 'storage', 'ls'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) if p.returncode != 0: return TaskEvent( success=False, - message='Unable to list the GCS buckets. Makes sure you are authenticated via gsutil.' + message='Unable to list the GCS buckets. Makes sure you are authenticated via gcloud.' ) return TaskEvent(success=True) diff --git a/scripts/install b/scripts/install index 361c0838..b3ec22a4 100755 --- a/scripts/install +++ b/scripts/install @@ -59,7 +59,7 @@ done if [[ -n "$version_meta_file" ]]; then if [[ "$version_meta_file" == gs://* ]]; then - deployer="$(gsutil cat "$version_meta_file" | yaml2json | jq -r '.url')" + deployer="$(gcloud storage cat "$version_meta_file" | yaml2json | jq -r '.url')" elif [[ "$version_meta_file" == http://* || "$version_meta_file" == http://* ]]; then deployer="$(wget -O- -q "$version_meta_file" | yaml2json | jq -r '.url')" else diff --git a/scripts/publish b/scripts/publish index 37df530d..376240c2 100755 --- a/scripts/publish +++ b/scripts/publish @@ -61,5 +61,5 @@ print_version_metadata.py \ --deployer_image_digest "${deployer_image_digest}" \ > "/tmp/versions/${published_version}.yaml" -gsutil cp "/tmp/versions/${published_version}.yaml" "${gcs_repo}/" +gcloud storage cp "/tmp/versions/${published_version}.yaml" "${gcs_repo}/" echo "Version is available at ${gcs_repo}/${published_version}.yaml" diff --git a/scripts/verify b/scripts/verify index a34c14c2..17864c7a 100755 --- a/scripts/verify +++ b/scripts/verify @@ -175,7 +175,7 @@ docker rm "$container_id" # If parameters is a gcs file, use the content of the file instead if [[ "$parameters" = "gs://"* ]]; then echo "Using parameters from $parameters" - parameters="$(gsutil cat $parameters)" + parameters="$(gcloud storage cat $parameters)" echo "$parameters" fi