Skip to content

Commit 25335d5

Browse files
renato-rudnickirenato-rudnicki
committed
rename variables and small fixes
1 parent 10c4f95 commit 25335d5

33 files changed

+289
-310
lines changed

‎0-bootstrap/README-GitHub.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -565,15 +565,15 @@ or go to [Deploying step 3-networks-hub-and-spoke](#deploying-step-3-networks-hu
565565
chmod 755 ./tf-wrapper.sh
566566
```
567567

568-
1. Rename `common.auto.example.tfvars` to `common.auto.tfvars`, rename `shared.auto.example.tfvars` to `shared.auto.tfvars` and rename `access_context.auto.example.tfvars` to `access_context.auto.tfvars`.
568+
1. Rename `common.auto.example.tfvars` to `common.auto.tfvars`, rename `production.auto.example.tfvars` to `production.auto.tfvars` and rename `access_context.auto.example.tfvars` to `access_context.auto.tfvars`.
569569

570570
```bash
571571
mv common.auto.example.tfvars common.auto.tfvars
572-
mv shared.auto.example.tfvars shared.auto.tfvars
572+
mv production.auto.example.tfvars production.auto.tfvars
573573
mv access_context.auto.example.tfvars access_context.auto.tfvars
574574
```
575575

576-
1. Update the file `shared.auto.tfvars` with the values for the `target_name_server_addresses`.
576+
1. Update the file `production.auto.tfvars` with the values for the `target_name_server_addresses`.
577577
1. Update the file `access_context.auto.tfvars` with the organization's `access_context_manager_policy_id`.
578578
579579
```bash

‎0-bootstrap/README-GitLab.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -568,15 +568,15 @@ or go to [Deploying step 3-networks-hub-and-spoke](#deploying-step-3-networks-hu
568568
chmod 755 ./*.sh
569569
```
570570

571-
1. Rename `common.auto.example.tfvars` to `common.auto.tfvars`, rename `shared.auto.example.tfvars` to `shared.auto.tfvars` and rename `access_context.auto.example.tfvars` to `access_context.auto.tfvars`.
571+
1. Rename `common.auto.example.tfvars` to `common.auto.tfvars`, rename `production.auto.example.tfvars` to `production.auto.tfvars` and rename `access_context.auto.example.tfvars` to `access_context.auto.tfvars`.
572572

573573
```bash
574574
mv common.auto.example.tfvars common.auto.tfvars
575-
mv shared.auto.example.tfvars shared.auto.tfvars
575+
mv production.auto.example.tfvars production.auto.tfvars
576576
mv access_context.auto.example.tfvars access_context.auto.tfvars
577577
```
578578

579-
1. Update the file `shared.auto.tfvars` with the values for the `target_name_server_addresses`.
579+
1. Update the file `production.auto.tfvars` with the values for the `target_name_server_addresses`.
580580
1. Update the file `access_context.auto.tfvars` with the organization's `access_context_manager_policy_id`.
581581
582582
```bash

‎0-bootstrap/README-Jenkins.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -599,16 +599,16 @@ Here you will configure a VPN Network tunnel to enable connectivity between the
599599
sed -i'' -e "s/CICD_PROJECT_ID/${CICD_PROJECT_ID}/" ./Jenkinsfile
600600
```
601601

602-
1. Rename `common.auto.example.tfvars` to `common.auto.tfvars`, rename `shared.auto.example.tfvars` to `shared.auto.tfvars` and rename `access_context.auto.example.tfvars` to `access_context.auto.tfvars`.
602+
1. Rename `common.auto.example.tfvars` to `common.auto.tfvars`, rename `production.auto.example.tfvars` to `production.auto.tfvars` and rename `access_context.auto.example.tfvars` to `access_context.auto.tfvars`.
603603

604604
```bash
605605
mv common.auto.example.tfvars common.auto.tfvars
606-
mv shared.auto.example.tfvars shared.auto.tfvars
606+
mv production.auto.example.tfvars production.auto.tfvars
607607
mv access_context.auto.example.tfvars access_context.auto.tfvars
608608
```
609609

610610
1. Update `common.auto.tfvars` file with values from your environment and bootstrap. See any of the envs folder [README.md](../3-networks-dual-svpc/envs/production/README.md) files for additional information on the values in the `common.auto.tfvars` file.
611-
1. Update `shared.auto.tfvars` file with the `target_name_server_addresses`.
611+
1. Update `production.auto.tfvars` file with the `target_name_server_addresses`.
612612
1. Update `access_context.auto.tfvars` file with the `access_context_manager_policy_id`.
613613
1. Use `terraform output` to get the backend bucket and networks step Terraform Service Account values from gcp-bootstrap output.
614614

‎0-bootstrap/README-Terraform-Cloud.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,15 +476,15 @@ or go to [Deploying step 3-networks-hub-and-spoke](#deploying-step-3-networks-hu
476476
chmod 755 ./tf-wrapper.sh
477477
```
478478

479-
1. Rename `common.auto.example.tfvars` to `common.auto.tfvars`, rename `shared.auto.example.tfvars` to `shared.auto.tfvars` and rename `access_context.auto.example.tfvars` to `access_context.auto.tfvars`.
479+
1. Rename `common.auto.example.tfvars` to `common.auto.tfvars`, rename `production.auto.example.tfvars` to `production.auto.tfvars` and rename `access_context.auto.example.tfvars` to `access_context.auto.tfvars`.
480480

481481
```bash
482482
mv common.auto.example.tfvars common.auto.tfvars
483-
mv shared.auto.example.tfvars shared.auto.tfvars
483+
mv production.auto.example.tfvars production.auto.tfvars
484484
mv access_context.auto.example.tfvars access_context.auto.tfvars
485485
```
486486

487-
1. Update the file `shared.auto.tfvars` with the values for the `target_name_server_addresses`.
487+
1. Update the file `production.auto.tfvars` with the values for the `target_name_server_addresses`.
488488
1. Update the file `access_context.auto.tfvars` with the organization's `access_context_manager_policy_id`.
489489
490490
```bash

‎3-networks-dual-svpc/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,16 +163,16 @@ Run `terraform output cloudbuild_project_id` in the `0-bootstrap` folder to get
163163
chmod 755 ./tf-wrapper.sh
164164
```
165165

166-
1. Rename `common.auto.example.tfvars` to `common.auto.tfvars`, rename `shared.auto.example.tfvars` to `shared.auto.tfvars` and rename `access_context.auto.example.tfvars` to `access_context.auto.tfvars`.
166+
1. Rename `common.auto.example.tfvars` to `common.auto.tfvars`, rename `production.auto.example.tfvars` to `production.auto.tfvars` and rename `access_context.auto.example.tfvars` to `access_context.auto.tfvars`.
167167

168168
```bash
169169
mv common.auto.example.tfvars common.auto.tfvars
170-
mv shared.auto.example.tfvars shared.auto.tfvars
170+
mv production.auto.example.tfvars production.auto.tfvars
171171
mv access_context.auto.example.tfvars access_context.auto.tfvars
172172
```
173173

174174
1. Update `common.auto.tfvars` file with values from your environment and bootstrap. See any of the envs folder [README.md](./envs/production/README.md) files for additional information on the values in the `common.auto.tfvars` file.
175-
Update `shared.auto.tfvars` file with the `target_name_server_addresses`.
175+
Update `production.auto.tfvars` file with the `target_name_server_addresses`.
176176
Update `access_context.auto.tfvars` file with the `access_context_manager_policy_id`.
177177
Use `terraform output` to get the backend bucket value from 0-bootstrap output.
178178

@@ -305,16 +305,16 @@ See `0-bootstrap` [README-GitHub.md](../0-bootstrap/README-GitHub.md#deploying-s
305305
git checkout -b production
306306
```
307307

308-
1. Rename `common.auto.example.tfvars` to `common.auto.tfvars`, rename `shared.auto.example.tfvars` to `shared.auto.tfvars` and rename `access_context.auto.example.tfvars` to `access_context.auto.tfvars`.
308+
1. Rename `common.auto.example.tfvars` to `common.auto.tfvars`, rename `production.auto.example.tfvars` to `production.auto.tfvars` and rename `access_context.auto.example.tfvars` to `access_context.auto.tfvars`.
309309

310310
```bash
311311
mv common.auto.example.tfvars common.auto.tfvars
312-
mv shared.auto.example.tfvars shared.auto.tfvars
312+
mv production.auto.example.tfvars production.auto.tfvars
313313
mv access_context.auto.example.tfvars access_context.auto.tfvars
314314
```
315315

316316
1. Update `common.auto.tfvars` file with values from your environment and bootstrap. See any of the envs folder [README.md](./envs/production/README.md) files for additional information on the values in the `common.auto.tfvars` file.
317-
1. Update `shared.auto.tfvars` file with the `target_name_server_addresses`.
317+
1. Update `production.auto.tfvars` file with the `target_name_server_addresses`.
318318
1. Update `access_context.auto.tfvars` file with the `access_context_manager_policy_id`.
319319
1. Use `terraform output` to get the backend bucket value from gcp-bootstrap output.
320320

‎3-networks-dual-svpc/envs/production/main.tf‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,48 +20,48 @@ locals {
2020
/*
2121
* Base network ranges
2222
*/
23-
base_private_service_cidr = "10.16.16.0/21"
23+
base_private_service_cidr = "10.16.24.0/21"
2424
base_subnet_primary_ranges = {
25-
(local.default_region1) = "10.0.128.0/18"
26-
(local.default_region2) = "10.1.128.0/18"
25+
(local.default_region1) = "10.0.192.0/18"
26+
(local.default_region2) = "10.1.192.0/18"
2727
}
2828
base_subnet_proxy_ranges = {
29-
(local.default_region1) = "10.18.4.0/23"
30-
(local.default_region2) = "10.19.4.0/23"
29+
(local.default_region1) = "10.18.6.0/23"
30+
(local.default_region2) = "10.19.6.0/23"
3131
}
3232
base_subnet_secondary_ranges = {
3333
(local.default_region1) = [
3434
{
3535
range_name = "rn-${local.environment_code}-shared-base-${local.default_region1}-gke-pod"
36-
ip_cidr_range = "100.64.128.0/18"
36+
ip_cidr_range = "100.64.192.0/18"
3737
},
3838
{
3939
range_name = "rn-${local.environment_code}-shared-base-${local.default_region1}-gke-svc"
40-
ip_cidr_range = "100.65.128.0/18"
40+
ip_cidr_range = "100.65.192.0/18"
4141
}
4242
]
4343
}
4444
/*
4545
* Restricted network ranges
4646
*/
47-
restricted_private_service_cidr = "10.16.48.0/21"
47+
restricted_private_service_cidr = "10.16.56.0/21"
4848
restricted_subnet_primary_ranges = {
49-
(local.default_region1) = "10.8.128.0/18"
50-
(local.default_region2) = "10.9.128.0/18"
49+
(local.default_region1) = "10.8.192.0/18"
50+
(local.default_region2) = "10.9.192.0/18"
5151
}
5252
restricted_subnet_proxy_ranges = {
53-
(local.default_region1) = "10.26.4.0/23"
54-
(local.default_region2) = "10.27.4.0/23"
53+
(local.default_region1) = "10.26.6.0/23"
54+
(local.default_region2) = "10.27.6.0/23"
5555
}
5656
restricted_subnet_secondary_ranges = {
5757
(local.default_region1) = [
5858
{
5959
range_name = "rn-${local.environment_code}-shared-restricted-${local.default_region1}-gke-pod"
60-
ip_cidr_range = "100.72.128.0/18"
60+
ip_cidr_range = "100.72.192.0/18"
6161
},
6262
{
6363
range_name = "rn-${local.environment_code}-shared-restricted-${local.default_region1}-gke-svc"
64-
ip_cidr_range = "100.73.128.0/18"
64+
ip_cidr_range = "100.73.192.0/18"
6565
}
6666
]
6767
}

‎3-networks-dual-svpc/envs/production/shared.auto.tfvars‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎3-networks-dual-svpc/envs/shared/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
| bgp\_asn\_dns | BGP Autonomous System Number (ASN). | `number` | `64667` | no |
1414
| dns\_enable\_logging | Toggle DNS logging for VPC DNS. | `bool` | `true` | no |
1515
| domain | The DNS name of forwarding managed zone, for instance 'example.com'. Must end with a period. | `string` | n/a | yes |
16-
| enable\_partner\_interconnect | Enable Partner Interconnect in the environment. | `bool` | `false` | no |
1716
| firewall\_policies\_enable\_logging | Toggle hierarchical firewall logging. | `bool` | `true` | no |
18-
| preactivate\_partner\_interconnect | Preactivate Partner Interconnect VLAN attachment in the environment. | `bool` | `false` | no |
1917
| remote\_state\_bucket | Backend bucket to load Terraform Remote State Data from previous steps. | `string` | n/a | yes |
2018
| tfc\_org\_name | Name of the TFC organization | `string` | `""` | no |
2119
| vpc\_flow\_logs | enable\_logging: set to true to enable VPC flow logging for the subnetworks.<br> aggregation\_interval: Toggles the aggregation interval for collecting flow logs. Increasing the interval time will reduce the amount of generated flow logs for long lasting connections. Possible values are: INTERVAL\_5\_SEC, INTERVAL\_30\_SEC, INTERVAL\_1\_MIN, INTERVAL\_5\_MIN, INTERVAL\_10\_MIN, INTERVAL\_15\_MIN.<br> flow\_sampling: Set the sampling rate of VPC flow logs within the subnetwork where 1.0 means all collected logs are reported and 0.0 means no logs are reported. The value of the field must be in [0, 1].<br> metadata: Configures whether metadata fields should be added to the reported VPC flow logs. Possible values are: EXCLUDE\_ALL\_METADATA, INCLUDE\_ALL\_METADATA, CUSTOM\_METADATA.<br> metadata\_fields: ist of metadata fields that should be added to reported logs. Can only be specified if VPC flow logs for this subnetwork is enabled and "metadata" is set to CUSTOM\_METADATA.<br> filter\_expr: Export filter used to define which VPC flow logs should be logged, as as CEL expression. See https://cloud.google.com/vpc/docs/flow-logs#filtering for details on how to format this field. | <pre>object({<br> enable_logging = optional(string, "true")<br> aggregation_interval = optional(string, "INTERVAL_5_SEC")<br> flow_sampling = optional(string, "0.5")<br> metadata = optional(string, "INCLUDE_ALL_METADATA")<br> metadata_fields = optional(list(string), [])<br> filter_expr = optional(string, "true")<br> })</pre> | `{}` | no |

‎3-networks-dual-svpc/envs/shared/interconnect.tf.example‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎3-networks-dual-svpc/envs/shared/partner_interconnect.auto.tfvars.example‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)