Skip to content

Commit

Permalink
fix: alternative deployment methods minor issues fix (#1065)
Browse files Browse the repository at this point in the history
Co-authored-by: Daniel Andrade <dandrade@ciandt.com>
  • Loading branch information
romanini-ciandt and daniel-cit committed Jan 8, 2024
1 parent 336487b commit e09d174
Show file tree
Hide file tree
Showing 15 changed files with 282 additions and 134 deletions.
30 changes: 30 additions & 0 deletions 0-bootstrap/README-GitHub.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,12 @@ export the GitHub fine grained access token as an environment variable:
1. The merge will trigger a GitHub Action that will apply the terraform configuration for the `production` environment.
1. Review merge output in GitHub https://github.com/GITHUB-OWNER/GITHUB-BOOTSTRAP-REPO/actions under `tf-apply`.

1. Before moving to the next step, go back to the parent directory.

```bash
cd ..
```

**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.
They will [fail](../docs/TROUBLESHOOTING.md#error-unsupported-attribute) if the state is not copied to the Cloud Storage bucket.

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

1. Before moving to the next step, go back to the parent directory.

```bash
cd ..
```


## Deploying step 2-environments

Expand Down Expand Up @@ -470,6 +482,12 @@ See any of the envs folder [README.md](../2-environments/envs/production/README.
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),
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.

1. Before moving to the next step, go back to the parent directory.

```bash
cd ..
```

## Deploying step 3-networks-dual-svpc

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.
Expand Down Expand Up @@ -631,6 +649,12 @@ An environment variable `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` will be set with th
unset GOOGLE_IMPERSONATE_SERVICE_ACCOUNT
```

1. Before moving to the next step, go back to the parent directory.

```bash
cd ..
```

1. You can now move to the instructions in the [4-projects](#deploying-step-4-projects) stage.

## Deploying step 3-networks-hub-and-spoke
Expand Down Expand Up @@ -782,6 +806,12 @@ An environment variable `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` will be set with th
unset GOOGLE_IMPERSONATE_SERVICE_ACCOUNT
```

1. Before moving to the next step, go back to the parent directory.

```bash
cd ..
```

1. You can now move to the instructions in the [4-projects](#deploying-step-4-projects) stage.

## Deploying step 4-projects
Expand Down
30 changes: 30 additions & 0 deletions 0-bootstrap/README-GitLab.md
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,12 @@ export the GitLab personal or group access token as an environment variable:
1. Review merge output in GitLab https://gitlab.com/GITLAB-OWNER/GITLAB-BOOTSTRAP-REPO/-/pipelines under `tf-apply`.
1. If the GitLab pipelines is successful, apply the next environment.

1. Before moving to the next step, go back to the parent directory.

```bash
cd ..
```

**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.
They will [fail](../docs/TROUBLESHOOTING.md#error-unsupported-attribute) if the state is not copied to the Cloud Storage bucket.

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

1. Before moving to the next step, go back to the parent directory.

```bash
cd ..
```

## Deploying step 2-environments

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

1. Before moving to the next step, go back to the parent directory.

```bash
cd ..
```

1. You can now move to the instructions in the network stage.
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),
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.
Expand Down Expand Up @@ -634,6 +652,12 @@ An environment variable `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` will be set with th
unset GOOGLE_IMPERSONATE_SERVICE_ACCOUNT
```

1. Before moving to the next step, go back to the parent directory.

```bash
cd ..
```

1. You can now move to the instructions in the [4-projects](#deploying-step-4-projects) stage.

## Deploying step 3-networks-hub-and-spoke
Expand Down Expand Up @@ -763,6 +787,12 @@ An environment variable `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` will be set with th
unset GOOGLE_IMPERSONATE_SERVICE_ACCOUNT
```

1. Before moving to the next step, go back to the parent directory.

```bash
cd ..
```

1. You can now move to the instructions in the [4-projects](#deploying-step-4-projects) stage.

## Deploying step 4-projects
Expand Down

0 comments on commit e09d174

Please sign in to comment.