Skip to content

Commit 4f4e250

Browse files
fix: github manual instructions
1 parent e4fa9c4 commit 4f4e250

1 file changed

Lines changed: 7 additions & 16 deletions

File tree

0-bootstrap/README-GitHub.md

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,14 @@ export the GitHub fine grained access token as an environment variable:
223223
export backend_bucket=$(terraform output -raw gcs_bucket_tfstate)
224224
echo "backend_bucket = ${backend_bucket}"
225225

226+
export backend_bucket_projects=$(terraform output -raw projects_gcs_bucket_tfstate)
227+
echo "backend_bucket_projects = ${backend_bucket_projects}"
228+
226229
cp backend.tf.example backend.tf
227-
cd ../../../
230+
cd ..
228231

229232
for i in `find . -name 'backend.tf'`; do sed -i'' -e "s/UPDATE_ME/${backend_bucket}/" $i; done
230-
for i in `find . -name 'backend.tf'`; do sed -i'' -e "s/UPDATE_PROJECTS_BACKEND/${backend_bucket}/" $i; done
233+
for i in `find . -name 'backend.tf'`; do sed -i'' -e "s/UPDATE_PROJECTS_BACKEND/${backend_bucket_projects}/" $i; done
231234

232235
cd gcp-bootstrap/envs/shared
233236
```
@@ -657,16 +660,7 @@ An environment variable `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` will be set with th
657660
git push --set-upstream origin production
658661
```
659662
660-
1. Open a merge request in GitLab https://gitlab.com/GITLAB-OWNER/GITLAB-NETWORKS-REPO/-/merge_requests?scope=all&state=opened from the `production` branch to the `plan` branch and review the output.
661-
662-
> NOTE: Development and Non-production branches depends on the production branch to be deployed first, for the `3-networks-dual-svpc`.
663-
664-
1. Push your plan branch.
665-
666-
```bash
667-
git checkout plan --set-upstream origin plan
668-
git push
669-
```
663+
> NOTE: Development and Non-production branches depends on the production branch to be deployed first, for the `3-networks-svpc`.
670664
671665
1. Open a pull request in GitHub https://github.com/GITHUB-OWNER/GITHUB-NETWORKS-REPO/pull/new/plan from the `production` branch to the `development` branch and review the output.
672666
1. The Pull request will trigger a GitHub Action that will run Terraform `init`/`plan`/`validate` in the `development` environment.
@@ -862,16 +856,13 @@ An environment variable `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` will be set with th
862856
git clone git@github.com:<GITHUB-OWNER>/<GITHUB-PROJECTS-REPO>.git gcp-projects
863857
```
864858
865-
1. Navigate into the repo. All subsequent
866-
steps assume you are running them from the `gcp-projects` directory.
859+
1. Navigate into the repo. All subsequent steps assume you are running them from the `gcp-projects` directory.
867860
If you run them from another directory, adjust your copy paths accordingly.
868861
869862
```bash
870863
cd gcp-projects
871864
```
872865
873-
874-
875866
1. Seed the repository if it has not been initialized yet.
876867
877868
```bash

0 commit comments

Comments
 (0)