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
8 changes: 4 additions & 4 deletions .github/workflows/deployment_gke_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:

- name: Download Skaffold cache if exists
run: |
gsutil cp $SKAFFOLD_CACHE_GCS ~/.skaffold/ || true
gcloud storage cp $SKAFFOLD_CACHE_GCS ~/.skaffold/ || true

- name: Add BQ Tables
run: |
Expand All @@ -122,7 +122,7 @@ jobs:
- name: Upload Skaffold cache
if: always()
run: |
gsutil cp ~/.skaffold/cache $SKAFFOLD_CACHE_GCS
gcloud storage cp ~/.skaffold/cache $SKAFFOLD_CACHE_GCS

# deploy_documentation:
# name: Deploy documentation
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:

# - name: Download Skaffold cache if exists
# run: |
# gsutil cp $SKAFFOLD_CACHE_GCS ~/.skaffold/ || true
# gcloud storage cp $SKAFFOLD_CACHE_GCS ~/.skaffold/ || true

# - name: Use Node.js
# uses: actions/setup-node@v3
Expand All @@ -187,6 +187,6 @@ jobs:
# - name: Upload Skaffold cache
# if: always()
# run: |
# gsutil cp ~/.skaffold/cache "${SKAFFOLD_CACHE_GCS}/api_docs/cache"
# gcloud storage cp ~/.skaffold/cache "${SKAFFOLD_CACHE_GCS}/api_docs/cache"

# # cookiecutter:endraw
4 changes: 2 additions & 2 deletions .github/workflows/e2e_gke_api_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:

- name: Download Skaffold cache if exists
run: |
gsutil cp $SKAFFOLD_CACHE_GCS ~/.skaffold/ || true
gcloud storage cp $SKAFFOLD_CACHE_GCS ~/.skaffold/ || true

- name: Set up Kubernetes namespace and Service Account
run: |
Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:
- name: Upload Skaffold cache
if: always()
run: |
gsutil cp ~/.skaffold/cache $SKAFFOLD_CACHE_GCS
gcloud storage cp ~/.skaffold/cache $SKAFFOLD_CACHE_GCS

e2e-api-test:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions docs/INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ terraform apply

Ensure that a bucket with the same name as the project has been created:
```commandline
gsutil ls -p "${PROJECT_ID}"
gcloud storage ls --project="${PROJECT_ID}"
```

There should also be a jump host VM in the project:
Expand All @@ -95,7 +95,7 @@ In this section you successfully created the following:

### Copy bootstrap terraform state to tfstate-bucket
```bash
gsutil cp ../project_bootstrap/terraform.tfstate gs://"${PROJECT_ID}"-tfstate/env/bootstrap/terraform.tfstate
gcloud storage cp ../project_bootstrap/terraform.tfstate gs://"${PROJECT_ID}"-tfstate/env/bootstrap/terraform.tfstate
```

### Enable deletion protection for the jump host
Expand Down
8 changes: 4 additions & 4 deletions old workflows/workflows/deployment_gke_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:

- name: Download Skaffold cache if exists
run: |
gsutil cp $SKAFFOLD_CACHE_GCS ~/.skaffold/ || true
gcloud storage cp $SKAFFOLD_CACHE_GCS ~/.skaffold/ || true

- name: Add BQ Tables
run: |
Expand All @@ -121,7 +121,7 @@ jobs:
- name: Upload Skaffold cache
if: always()
run: |
gsutil cp ~/.skaffold/cache $SKAFFOLD_CACHE_GCS
gcloud storage cp ~/.skaffold/cache $SKAFFOLD_CACHE_GCS

deploy_documentation:
name: Deploy documentation
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:

- name: Download Skaffold cache if exists
run: |
gsutil cp $SKAFFOLD_CACHE_GCS ~/.skaffold/ || true
gcloud storage cp $SKAFFOLD_CACHE_GCS ~/.skaffold/ || true

- name: Use Node.js
uses: actions/setup-node@v3
Expand All @@ -186,6 +186,6 @@ jobs:
- name: Upload Skaffold cache
if: always()
run: |
gsutil cp ~/.skaffold/cache "${SKAFFOLD_CACHE_GCS}/api_docs/cache"
gcloud storage cp ~/.skaffold/cache "${SKAFFOLD_CACHE_GCS}/api_docs/cache"

# cookiecutter:endraw
4 changes: 2 additions & 2 deletions old workflows/workflows/e2e_gke_api_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:

- name: Download Skaffold cache if exists
run: |
gsutil cp $SKAFFOLD_CACHE_GCS ~/.skaffold/ || true
gcloud storage cp $SKAFFOLD_CACHE_GCS ~/.skaffold/ || true

- name: Set up Kubernetes namespace and Service Account
run: |
Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:
- name: Upload Skaffold cache
if: always()
run: |
gsutil cp ~/.skaffold/cache $SKAFFOLD_CACHE_GCS
gcloud storage cp ~/.skaffold/cache $SKAFFOLD_CACHE_GCS

e2e-api-test:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions setup/setup_terraform.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ create_bucket () {
printf "TF_BUCKET_LOCATION=${TF_BUCKET_LOCATION}\n"

print_highlight "Creating terraform state bucket: ${TF_BUCKET_NAME}\n"
gsutil mb -l $TF_BUCKET_LOCATION gs://$TF_BUCKET_NAME
gsutil versioning set on gs://$TF_BUCKET_NAME
gcloud storage buckets create gs://$TF_BUCKET_NAME --location $TF_BUCKET_LOCATION
gcloud storage buckets update gs://$TF_BUCKET_NAME --versioning
export TF_BUCKET_NAME=$TF_BUCKET_NAME
echo
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/stages/demo_environment/setup.bash
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# -----------------------------------------------------------

# Copy bootstrap terraform state to tfstate-bucket
gsutil cp ../project_bootstrap/terraform.tfstate gs://"${PROJECT_ID}"-tfstate/env/bootstrap/terraform.tfstate
gcloud storage cp ../project_bootstrap/terraform.tfstate gs://"${PROJECT_ID}"-tfstate/env/bootstrap/terraform.tfstate

# Enable deletion protection for the jump host
gcloud compute instances update jump-host --deletion-protection --project="${PROJECT_ID}"
Expand Down
Loading