Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cloudbuild-tag-prerelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild-tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/billing-integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion marketplace/deployer_util/storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions scripts/doctor.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion scripts/install
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/publish
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion scripts/verify
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading