Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update subnet sample yaml files to use subnet_secondary_ranges #1203

Merged
merged 7 commits into from
Mar 5, 2023
Merged

Update subnet sample yaml files to use subnet_secondary_ranges #1203

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b991786
Replaces 'secondary_ip_range:' with 'secondary_ip_ranges:' in samples
jmound Mar 1, 2023
cd2bed5
Replaces 'secondary_ip_range:' with 'secondary_ip_ranges:' in tests/
jmound Mar 1, 2023
5ccbe79
reverts previous commit- files in tests/ don't need to be changed
jmound Mar 2, 2023
ef5080d
Merge branch 'master' into update-subnet-secondary-ranges
jmound Mar 2, 2023
de2e4f7
Merge branch 'master' into update-subnet-secondary-ranges
ludoo Mar 3, 2023
febe59d
Merge branch 'master' into update-subnet-secondary-ranges
ludoo Mar 5, 2023
a16c33f
Merge branch 'master' into update-subnet-secondary-ranges
ludoo Mar 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fast/stages/2-networking-a-peering/data/subnets/dev/dev-dataplatform-ew1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
region: europe-west1
description: Default subnet for dev Data Platform
ip_cidr_range: 10.128.48.0/24
secondary_ip_range:
secondary_ip_ranges:
pods: 100.128.48.0/20
services: 100.255.48.0/24
2 changes: 1 addition & 1 deletion fast/stages/2-networking-a-peering/data/subnets/dev/dev-gke-nodes-ew1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
region: europe-west1
description: Default subnet for prod gke nodes
ip_cidr_range: 10.64.0.0/24
secondary_ip_range:
secondary_ip_ranges:
pods: 100.64.0.0/16
services: 192.168.1.0/24
2 changes: 1 addition & 1 deletion fast/stages/2-networking-b-vpn/data/subnets/dev/dev-dataplatform-ew1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
region: europe-west1
description: Default subnet for dev Data Platform
ip_cidr_range: 10.128.48.0/24
secondary_ip_range:
secondary_ip_ranges:
pods: 100.128.48.0/20
services: 100.255.48.0/24
2 changes: 1 addition & 1 deletion fast/stages/2-networking-b-vpn/data/subnets/dev/dev-gke-nodes-ew1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
region: europe-west1
description: Default subnet for prod gke nodes
ip_cidr_range: 10.64.0.0/24
secondary_ip_range:
secondary_ip_ranges:
pods: 100.64.0.0/16
services: 192.168.1.0/24
2 changes: 1 addition & 1 deletion fast/stages/2-networking-d-separate-envs/data/subnets/dev/dev-dataplatform-ew1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
region: europe-west1
description: Default subnet for dev Data Platform
ip_cidr_range: 10.128.48.0/24
secondary_ip_range:
secondary_ip_ranges:
pods: 100.128.48.0/20
services: 100.255.48.0/24
4 changes: 2 additions & 2 deletions tests/modules/net_vpc/examples/factory.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ values:
project: my-project
region: europe-west1
role: null
secondary_ip_range:
secondary_ip_ranges:
juliocc marked this conversation as resolved.
Show resolved Hide resolved
- ip_cidr_range: 192.168.0.0/24
range_name: secondary-range-a
module.vpc.google_compute_subnetwork.subnetwork["europe-west4/subnet-simple"]:
Expand All @@ -43,7 +43,7 @@ values:
project: my-project
region: europe-west4
role: null
secondary_ip_range: []
secondary_ip_ranges: []
module.vpc.google_compute_subnetwork_iam_binding.binding["europe-west1/subnet-detailed.roles/compute.networkUser"]:
condition: []
members:
Expand Down
2 changes: 1 addition & 1 deletion tests/modules/net_vpc/examples/shared-vpc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ values:
host_project: my-project
service_project: project2
module.vpc-host.google_compute_subnetwork.subnetwork["europe-west1/subnet-1"]:
secondary_ip_range:
secondary_ip_ranges:
- ip_cidr_range: 172.16.0.0/20
range_name: pods
- ip_cidr_range: 192.168.0.0/24
Expand Down
4 changes: 2 additions & 2 deletions tests/modules/net_vpc/examples/simple.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ values:
project: my-project
region: europe-west1
role: null
secondary_ip_range:
secondary_ip_ranges:
- ip_cidr_range: 172.16.0.0/20
range_name: pods
- ip_cidr_range: 192.168.0.0/24
Expand All @@ -43,7 +43,7 @@ values:
project: my-project
region: europe-west2
role: null
secondary_ip_range: []
secondary_ip_ranges: []

counts:
google_compute_network: 1
Expand Down
8 changes: 4 additions & 4 deletions tests/modules/net_vpc/examples/subnet-options.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ values:
private_ip_google_access: false
project: my-project
region: europe-west1
secondary_ip_range: []
secondary_ip_ranges: []
module.vpc.google_compute_subnetwork.subnetwork["europe-west1/simple"]:
description: Terraform-managed.
ip_cidr_range: 10.0.0.0/24
Expand All @@ -33,7 +33,7 @@ values:
private_ip_google_access: true
project: my-project
region: europe-west1
secondary_ip_range: []
secondary_ip_ranges: []
module.vpc.google_compute_subnetwork.subnetwork["europe-west1/with-flow-logs"]:
description: Terraform-managed.
ip_cidr_range: 10.0.3.0/24
Expand All @@ -49,7 +49,7 @@ values:
project: my-project
region: europe-west1
role: null
secondary_ip_range: []
secondary_ip_ranges: []
module.vpc.google_compute_subnetwork.subnetwork["europe-west1/with-secondary-ranges"]:
description: Terraform-managed.
ip_cidr_range: 10.0.2.0/24
Expand All @@ -59,7 +59,7 @@ values:
project: my-project
region: europe-west1
role: null
secondary_ip_range:
secondary_ip_ranges:
- ip_cidr_range: 192.168.0.0/24
range_name: a
- ip_cidr_range: 192.168.1.0/24
Expand Down