obriensystems
commented
6 months ago Do TEF alignment after 421 https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/issues/387
keep
- ssc-notification randomization for multi-tenant deployment https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/pull/385/files
- bucket name length - https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/pull/386/files
-
Changes
Adjust
- local terraform https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/pull/384/files
- and https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/pull/393
Help with upstream sync
- revert non-production back to tef nonproduction as part of #387
changes 0-bootstrap to 3-networks-dual-svpc
michaelobrien@mbp7 pbmm-on-gcp-onboarding % git status
On branch gh421-cb-enable
Your branch is up to date with 'origin/gh421-cb-enable'.
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: 0-bootstrap/README.md
renamed: 0-bootstrap/cb.tf.dont_use -> 0-bootstrap/cb.tf
renamed: 0-bootstrap/outputs.tf.dont_use -> 0-bootstrap/outputs.tf
renamed: 0-bootstrap/terraform-local.tf -> 0-bootstrap/terraform-local.tf.example
modified: 0-bootstrap/terraform.example.tfvars
deleted: 0-bootstrap/terraform.mod.tfvars
modified: 1-org/envs/shared/terraform.example.tfvars
deleted: 1-org/envs/shared/terraform.mod.tfvars
modified: 2-environments/terraform.example.tfvars
deleted: 2-environments/terraform.mod.tfvars
deleted: 3-networks-dual-svpc/access_context.auto.mod.tfvars
modified: 3-networks-dual-svpc/common.auto.example.tfvars
deleted: 3-networks-dual-svpc/common.auto.mod.tfvars
deleted: 3-networks-dual-svpc/shared.auto.mod.tfvars
michaelobrien@mbp7 pbmm-on-gcp-onboarding % git commit -m "#421 - 0-boot to 3-net-dual-svpc"
[gh421-cb-enable e3b75d2] #421 - 0-boot to 3-net-dual-svpc
14 files changed, 87 insertions(+), 220 deletions(-)
rename 0-bootstrap/{cb.tf.dont_use => cb.tf} (100%)
rename 0-bootstrap/{outputs.tf.dont_use => outputs.tf} (96%)
rename 0-bootstrap/{terraform-local.tf => terraform-local.tf.example} (54%)
delete mode 100644 0-bootstrap/terraform.mod.tfvars
delete mode 100644 1-org/envs/shared/terraform.mod.tfvars
delete mode 100644 2-environments/terraform.mod.tfvars
delete mode 100644 3-networks-dual-svpc/access_context.auto.mod.tfvars
delete mode 100644 3-networks-dual-svpc/common.auto.mod.tfvars
delete mode 100644 3-networks-dual-svpc/shared.auto.mod.tfvars
michaelobrien@mbp7 pbmm-on-gcp-onboarding % git push origin gh421-cb-enable
Enumerating objects: 22, done.
Counting objects: 100% (22/22), done.
Delta compression using up to 10 threads
Compressing objects: 100% (12/12), done.
Writing objects: 100% (13/13), 4.22 KiB | 4.22 MiB/s, done.
Total 13 (delta 9), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (9/9), completed with 8 local objects.
remote:
remote: GitHub found 5 vulnerabilities on GoogleCloudPlatform/pbmm-on-gcp-onboarding's default branch (2 critical, 3 moderate). To find out more, visit:
remote: https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/security/dependabot
remote:
To github.com:GoogleCloudPlatform/pbmm-on-gcp-onboarding.git
d7344f5..e3b75d2 gh421-cb-enable -> gh421-cb-enable
github-actions[bot]
branch: https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/tree/gh421-cb-enable The current main is a partial local terraform retrofit that has a pending pr to complete the addition of local terraform capability - see workaround branch for now in #420
For example, in 0-bootstrap, the previous yaml for CB - cb.tf is commented as https://github.com/GoogleCloudPlatform/pbmm-on-gcp-onboarding/blob/main/0-bootstrap/cb.tf.dont_use Also the variables and output tf files need to be retrofitted back with the CB/CSR sections commented - in prep for use - like we do for github/githlab/tc
Either as part of #399 or earlier - put back the build so that cb.tf is listed as cb.tf.example with full readme instructions in addition to the variables/output changes.