Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor cloud build deploy instructions #825

Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3aa7ecf
update cloud build instructions for 0-bootstrap
daniel-cit Sep 28, 2022
fb787ed
update cloud build instructions for 1-org
daniel-cit Sep 28, 2022
23a4bae
update cloud build instructions for 2-enviroments
daniel-cit Sep 28, 2022
1709e43
fix markdown lint
daniel-cit Sep 28, 2022
abf2fc6
update cloud build instructions for 3-networks
daniel-cit Sep 28, 2022
8ff70d3
update cloud build instructions for 4-projects
daniel-cit Sep 28, 2022
649d339
use the same number of spaces in all READMEs
daniel-cit Sep 28, 2022
680a451
Merge branch 'master' into fix-cloud-build-instructions
bharathkkb Sep 29, 2022
4d1a72c
Merge branch 'master' into fix-cloud-build-instructions
daniel-cit Sep 29, 2022
dfabec0
fix order of execution of copy command
daniel-cit Oct 5, 2022
140a4e7
Merge branch 'master' into fix-cloud-build-instructions
daniel-cit Oct 6, 2022
48eb6f1
Merge remote-tracking branch 'origin/master' into fix-cloud-build-ins…
daniel-cit Oct 6, 2022
6dd09ce
Merge remote-tracking branch 'origin/master' into fix-cloud-build-ins…
daniel-cit Oct 6, 2022
0966ad6
fix replace variable for remote state bucket
daniel-cit Oct 7, 2022
a32efef
Merge branch 'master' into fix-cloud-build-instructions
daniel-cit Oct 10, 2022
1459c9e
Merge branch 'master' into fix-cloud-build-instructions
daniel-cit Oct 10, 2022
fde46d2
save 0-bootstrap configuration to a repo
daniel-cit Oct 11, 2022
e10916d
Merge remote-tracking branch 'origin/master' into fix-cloud-build-ins…
daniel-cit Oct 11, 2022
38d81f6
Merge remote-tracking branch 'origin/master' into fix-cloud-build-ins…
daniel-cit Oct 11, 2022
0cab5a2
add viewer role to the workspace service accont on the gcp-policies s…
daniel-cit Oct 13, 2022
bdac961
code review fixes
daniel-cit Oct 13, 2022
4fae96c
Merge remote-tracking branch 'origin/master' into fix-cloud-build-ins…
daniel-cit Oct 13, 2022
e9b4802
Merge branch 'master' into fix-cloud-build-instructions
daniel-cit Oct 14, 2022
2b27f0c
Merge branch 'master' into fix-cloud-build-instructions
bharathkkb Oct 17, 2022
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
Prev Previous commit
Next Next commit
fix replace variable for remote state bucket
  • Loading branch information
daniel-cit committed Oct 7, 2022
commit 0966ad6e345a6d925a5a8d04e8f92f9754a2a3c7
4 changes: 2 additions & 2 deletions 1-org/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ Run `terraform output cloudbuild_project_id` in the `0-bootstrap` folder to see

```bash
export backend_bucket=$(terraform -chdir="../terraform-example-foundation/0-bootstrap/" output -raw gcs_bucket_tfstate)
daniel-cit marked this conversation as resolved.
Show resolved Hide resolved
echo "backend_bucket = ${backend_bucket}"
echo "remote_state_bucket = ${backend_bucket}"

sed -i "s/TERRAFORM_STATE_BUCKET/${backend_bucket}/" ./envs/shared/terraform.tfvars
sed -i "s/REMOTE_STATE_BUCKET/${backend_bucket}/" ./envs/shared/terraform.tfvars

if [ -z "${ACCESS_CONTEXT_MANAGER_ID}" ]; then sed -i "s/#create_access_context_manager_access_policy/create_access_context_manager_access_policy/" ./envs/shared/terraform.tfvars; fi
daniel-cit marked this conversation as resolved.
Show resolved Hide resolved
```
Expand Down
4 changes: 2 additions & 2 deletions 2-environments/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ commands. The `-T` flag is needed for Linux, but causes problems for MacOS.

```bash
export backend_bucket=$(terraform -chdir="../terraform-example-foundation/0-bootstrap/" output -raw gcs_bucket_tfstate)
echo "backend_bucket = ${backend_bucket}"
echo "remote_state_bucket = ${backend_bucket}"

sed -i "s/TERRAFORM_STATE_BUCKET/${backend_bucket}/" terraform.tfvars
sed -i "s/REMOTE_STATE_BUCKET/${backend_bucket}/" terraform.tfvars
```

1. Commit changes.
Expand Down
4 changes: 2 additions & 2 deletions 3-networks-dual-svpc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ If you are not able to use Dedicated or Partner Interconnect, you can also use a
sed -i "s/ACCESS_CONTEXT_MANAGER_ID/${ACCESS_CONTEXT_MANAGER_ID}/" ./access_context.auto.tfvars

export backend_bucket=$(terraform -chdir="../terraform-example-foundation/0-bootstrap/" output -raw gcs_bucket_tfstate)
echo "backend_bucket = ${backend_bucket}"
echo "remote_state_bucket = ${backend_bucket}"

sed -i "s/TERRAFORM_STATE_BUCKET/${backend_bucket}/" ./common.auto.tfvars
sed -i "s/REMOTE_STATE_BUCKET/${backend_bucket}/" ./common.auto.tfvars

export NETWORKS_STEP_TERRAFORM_SERVICE_ACCOUNT_EMAIL=$(terraform -chdir="../terraform-example-foundation/0-bootstrap/" output -raw networks_step_terraform_service_account_email)
echo "terraform_service_account = ${NETWORKS_STEP_TERRAFORM_SERVICE_ACCOUNT_EMAIL}"
Expand Down
4 changes: 2 additions & 2 deletions 3-networks-hub-and-spoke/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ If you are not able to use Dedicated or Partner Interconnect, you can also use a
sed -i "s/ACCESS_CONTEXT_MANAGER_ID/${ACCESS_CONTEXT_MANAGER_ID}/" ./access_context.auto.tfvars

export backend_bucket=$(terraform -chdir="../terraform-example-foundation/0-bootstrap/" output -raw gcs_bucket_tfstate)
echo "backend_bucket = ${backend_bucket}"
echo "remote_state_bucket = ${backend_bucket}"

sed -i "s/TERRAFORM_STATE_BUCKET/${backend_bucket}/" ./common.auto.tfvars
sed -i "s/REMOTE_STATE_BUCKET/${backend_bucket}/" ./common.auto.tfvars

export NETWORKS_STEP_TERRAFORM_SERVICE_ACCOUNT_EMAIL=$(terraform -chdir="../terraform-example-foundation/0-bootstrap/" output -raw networks_step_terraform_service_account_email)
echo "terraform_service_account = ${NETWORKS_STEP_TERRAFORM_SERVICE_ACCOUNT_EMAIL}"
Expand Down
9 changes: 6 additions & 3 deletions 4-projects/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ commands. The `-T` flag is needed for Linux, but causes problems for MacOS.
1. Use `terraform output` to get the backend bucket value from 0-bootstrap output.

```bash
export backend_bucket=$(terraform -chdir="../terraform-example-foundation/0-bootstrap/" output -raw gcs_bucket_tfstate)
echo "backend_bucket = ${backend_bucket}"
export remote_state_bucket=$(terraform -chdir="../terraform-example-foundation/0-bootstrap/" output -raw gcs_bucket_tfstate)
echo "remote_state_bucket = ${remote_state_bucket}"

sed -i "s/TERRAFORM_STATE_BUCKET/${backend_bucket}/" ./common.auto.tfvars
sed -i "s/REMOTE_STATE_BUCKET/${remote_state_bucket}/" ./common.auto.tfvars
```

1. Commit changes.
Expand All @@ -141,6 +141,9 @@ commands. The `-T` flag is needed for Linux, but causes problems for MacOS.
1. Update `backend.tf` with your backend bucket from 0-bootstrap output.

```bash
export backend_bucket=$(terraform -chdir="../terraform-example-foundation/0-bootstrap/" output -raw projects_gcs_bucket_tfstate)
echo "backend_bucket = ${backend_bucket}"

for i in `find -name 'backend.tf'`; do sed -i "s/UPDATE_ME/${backend_bucket}/" $i; done
```

Expand Down