Skip to content

Commit e09d174

Browse files
fix: alternative deployment methods minor issues fix (#1065)
Co-authored-by: Daniel Andrade <[email protected]>
1 parent 336487b commit e09d174

File tree

15 files changed

+282
-134
lines changed

15 files changed

+282
-134
lines changed

0-bootstrap/README-GitHub.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,12 @@ export the GitHub fine grained access token as an environment variable:
241241
1. The merge will trigger a GitHub Action that will apply the terraform configuration for the `production` environment.
242242
1. Review merge output in GitHub https://github.com/GITHUB-OWNER/GITHUB-BOOTSTRAP-REPO/actions under `tf-apply`.
243243

244+
1. Before moving to the next step, go back to the parent directory.
245+
246+
```bash
247+
cd ..
248+
```
249+
244250
**Note 1:** The stages after `0-bootstrap` use `terraform_remote_state` data source to read common configuration like the organization ID from the output of the `0-bootstrap` stage.
245251
They will [fail](../docs/TROUBLESHOOTING.md#error-unsupported-attribute) if the state is not copied to the Cloud Storage bucket.
246252

@@ -362,6 +368,12 @@ See the shared folder [README.md](../1-org/envs/shared/README.md#inputs) for add
362368
1. The merge will trigger a GitHub Action that will apply the terraform configuration for the `production` environment.
363369
1. Review merge output in GitHub https://github.com/GITHUB-OWNER/GITHUB-ORGANIZATION-REPO/actions under `tf-apply`.
364370

371+
1. Before moving to the next step, go back to the parent directory.
372+
373+
```bash
374+
cd ..
375+
```
376+
365377

366378
## Deploying step 2-environments
367379

@@ -470,6 +482,12 @@ See any of the envs folder [README.md](../2-environments/envs/production/README.
470482
To use the [Dual Shared VPC](https://cloud.google.com/architecture/security-foundations/networking#vpcsharedvpc-id7-1-shared-vpc-) network mode go to [Deploying step 3-networks-dual-svpc](#deploying-step-3-networks-dual-svpc),
471483
or go to [Deploying step 3-networks-hub-and-spoke](#deploying-step-3-networks-hub-and-spoke) to use the [Hub and Spoke](https://cloud.google.com/architecture/security-foundations/networking#hub-and-spoke) network mode.
472484

485+
1. Before moving to the next step, go back to the parent directory.
486+
487+
```bash
488+
cd ..
489+
```
490+
473491
## Deploying step 3-networks-dual-svpc
474492

475493
1. Clone the repository you created to host the `3-networks-dual-svpc` terraform configuration at the same level of the `terraform-example-foundation` folder.
@@ -631,6 +649,12 @@ An environment variable `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` will be set with th
631649
unset GOOGLE_IMPERSONATE_SERVICE_ACCOUNT
632650
```
633651
652+
1. Before moving to the next step, go back to the parent directory.
653+
654+
```bash
655+
cd ..
656+
```
657+
634658
1. You can now move to the instructions in the [4-projects](#deploying-step-4-projects) stage.
635659
636660
## Deploying step 3-networks-hub-and-spoke
@@ -782,6 +806,12 @@ An environment variable `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` will be set with th
782806
unset GOOGLE_IMPERSONATE_SERVICE_ACCOUNT
783807
```
784808
809+
1. Before moving to the next step, go back to the parent directory.
810+
811+
```bash
812+
cd ..
813+
```
814+
785815
1. You can now move to the instructions in the [4-projects](#deploying-step-4-projects) stage.
786816
787817
## Deploying step 4-projects

0-bootstrap/README-GitLab.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,12 @@ export the GitLab personal or group access token as an environment variable:
310310
1. Review merge output in GitLab https://gitlab.com/GITLAB-OWNER/GITLAB-BOOTSTRAP-REPO/-/pipelines under `tf-apply`.
311311
1. If the GitLab pipelines is successful, apply the next environment.
312312

313+
1. Before moving to the next step, go back to the parent directory.
314+
315+
```bash
316+
cd ..
317+
```
318+
313319
**Note 1:** The stages after `0-bootstrap` use `terraform_remote_state` data source to read common configuration like the organization ID from the output of the `0-bootstrap` stage.
314320
They will [fail](../docs/TROUBLESHOOTING.md#error-unsupported-attribute) if the state is not copied to the Cloud Storage bucket.
315321

@@ -415,6 +421,12 @@ See the shared folder [README.md](../1-org/envs/shared/README.md#inputs) for add
415421
1. Review merge output in GitLab https://gitlab.com/GITLAB-OWNER/GITLAB-ORGANIZATION-REPO/-/pipelines under `tf-apply`.
416422
1. If the GitLab pipelines is successful, apply the next environment.
417423

424+
1. Before moving to the next step, go back to the parent directory.
425+
426+
```bash
427+
cd ..
428+
```
429+
418430
## Deploying step 2-environments
419431

420432
1. Navigate into the repo. All subsequent
@@ -491,6 +503,12 @@ See any of the envs folder [README.md](../2-environments/envs/production/README.
491503
1. The merge will trigger a GitLab pipelines that will apply the terraform configuration for the `production` environment.
492504
1. Review merge output in GitLab https://gitlab.com/GITLAB-OWNER/GITLAB-ENVIRONMENTS-REPO/-/pipelines under `tf-apply`.
493505

506+
1. Before moving to the next step, go back to the parent directory.
507+
508+
```bash
509+
cd ..
510+
```
511+
494512
1. You can now move to the instructions in the network stage.
495513
To use the [Dual Shared VPC](https://cloud.google.com/architecture/security-foundations/networking#vpcsharedvpc-id7-1-shared-vpc-) network mode go to [Deploying step 3-networks-dual-svpc](#deploying-step-3-networks-dual-svpc),
496514
or go to [Deploying step 3-networks-hub-and-spoke](#deploying-step-3-networks-hub-and-spoke) to use the [Hub and Spoke](https://cloud.google.com/architecture/security-foundations/networking#hub-and-spoke) network mode.
@@ -634,6 +652,12 @@ An environment variable `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` will be set with th
634652
unset GOOGLE_IMPERSONATE_SERVICE_ACCOUNT
635653
```
636654
655+
1. Before moving to the next step, go back to the parent directory.
656+
657+
```bash
658+
cd ..
659+
```
660+
637661
1. You can now move to the instructions in the [4-projects](#deploying-step-4-projects) stage.
638662
639663
## Deploying step 3-networks-hub-and-spoke
@@ -763,6 +787,12 @@ An environment variable `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` will be set with th
763787
unset GOOGLE_IMPERSONATE_SERVICE_ACCOUNT
764788
```
765789
790+
1. Before moving to the next step, go back to the parent directory.
791+
792+
```bash
793+
cd ..
794+
```
795+
766796
1. You can now move to the instructions in the [4-projects](#deploying-step-4-projects) stage.
767797
768798
## Deploying step 4-projects

0 commit comments

Comments
 (0)