Consistent subnetting across datasets + contexts (#3460)

2025-10-23 21:14:05 +02:00
parent 35fcde9fa2
commit 885ba2fb05
22 changed files with 42 additions and 112 deletions
--- a/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/dev/subnets/dev-dataplatform.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/dev/subnets/dev-dataplatform.yaml
@@ -1,13 +0,0 @@
-# skip boilerplate check
-
-# yaml-language-server: $schema=../../../schemas/subnet.schema.json
-
-name: dev-dataplatform
-region: $locations:primary
-description: Default subnet for dev Data Platform
-ip_cidr_range: 10.68.2.0/24
-secondary_ip_ranges:
-  pods:
-    ip_cidr_range: 100.69.0.0/16
-  services:
-    ip_cidr_range: 100.71.2.0/24
--- a/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/dev/subnets/dev-default.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/dev/subnets/dev-default.yaml
@@ -1,8 +1,8 @@
 # skip boilerplate check

-# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+# yaml-language-server: $schema=../../../../../schemas/subnet.schema.json

 name: dev-default
 region: $locations:primary
-ip_cidr_range: 10.68.0.0/24
+ip_cidr_range: 10.73.0.0/24
 description: Default primary-region subnet for dev
--- a/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/dev/subnets/dev-gke-nodes.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/dev/subnets/dev-gke-nodes.yaml
@@ -1,13 +0,0 @@
-# skip boilerplate check
-
-# yaml-language-server: $schema=../../../schemas/subnet.schema.json
-
-name: dev-gke-nodes
-region: $locations:primary
-description: Default subnet for prod gke nodes
-ip_cidr_range: 10.68.1.0/24
-secondary_ip_ranges:
-  pods:
-    ip_cidr_range: 100.68.0.0/16
-  services:
-    ip_cidr_range: 100.71.1.0/24
--- a/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/hub/.config.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/hub/.config.yaml
@@ -9,7 +9,7 @@ name: hub
 delete_default_routes_on_create: false
 routers:
  vpn-router:
-    region: europe-west8
+    region: $locations:primary
    asn: 64514
 routes:
  gateway:
--- a/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/hub/subnets/hub-default.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/hub/subnets/hub-default.yaml
@@ -1,8 +1,8 @@
 # skip boilerplate check

-# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+# yaml-language-server: $schema=../../../../../schemas/subnet.schema.json

 name: hub-default
 region: $locations:primary
-ip_cidr_range: 10.64.255.0/24
+ip_cidr_range: 10.71.0.0/24
 description: Default primary-region subnet for hub
--- a/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/prod/subnets/prod-default.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/prod/subnets/prod-default.yaml
@@ -1,6 +1,6 @@
 # skip boilerplate check

-# yaml-language-server: $schema=../../../schemas/subnet.schema.json
+# yaml-language-server: $schema=../../../../../schemas/subnet.schema.json

 name: prod-default
 region: $locations:primary
--- a/fast/stages/2-networking/datasets/hub-and-spokes-peerings/vpcs/dev/subnets/dev-default.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-peerings/vpcs/dev/subnets/dev-default.yaml
@@ -3,6 +3,6 @@
 # yaml-language-server: $schema=../../../../../schemas/subnet.schema.json

 name: dev-default
-region: $locations:secondary
+region: $locations:primary
 ip_cidr_range: 10.73.0.0/24
-description: Default europe-west12 subnet for dev
+description: Default primary-region subnet for dev
--- a/fast/stages/2-networking/datasets/hub-and-spokes-peerings/vpcs/hub/subnets/hub-default.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-peerings/vpcs/hub/subnets/hub-default.yaml
@@ -3,6 +3,6 @@
 # yaml-language-server: $schema=../../../../../schemas/subnet.schema.json

 name: hub-default
-region: $locations:secondary
+region: $locations:primary
 ip_cidr_range: 10.71.0.0/24
-description: Default europe-west12 subnet for hub
+description: Default primary-region subnet for hub
--- a/fast/stages/2-networking/datasets/hub-and-spokes-vpns/README.md
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-vpns/README.md
@@ -43,7 +43,7 @@ For example, the connection from the hub to the `prod` spoke is defined in `vpcs

 ```yaml
 name: to-prod
-region: europe-west8
+region: $locations:primary
 peer_gateways:
  default:
    gcp: $vpn_gateways:prod/to-hub
@@ -57,7 +57,7 @@ And the corresponding connection from the `prod` spoke to the hub is in `vpcs/pr

 ```yaml
 name: to-hub
-region: europe-west8
+region: $locations:primary
 peer_gateways:
  default:
    gcp: $vpn_gateways:hub/to-prod
@@ -79,7 +79,7 @@ e.g. in `vpcs/hub/.config.yaml`:
 # [...]
 nat_config:
  nat-ew8:
-    region: europe-west8
+    region: $locations:primary
 # [...]
 ```

--- a/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/dev/.config.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/dev/.config.yaml
@@ -10,5 +10,5 @@ delete_default_routes_on_create: false
 mtu: 1500
 routers:
  vpn-router:
-    region: europe-west8
+    region: $locations:primary
    asn: 64516
--- a/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/dev/subnets/dev-default.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/dev/subnets/dev-default.yaml
@@ -3,6 +3,6 @@
 # yaml-language-server: $schema=../../../../../schemas/subnet.schema.json

 name: dev-default
-region: $locations:secondary
+region: $locations:primary
 ip_cidr_range: 10.73.0.0/24
-description: Default europe-west12 subnet for dev
+description: Default primary-region subnet for dev
--- a/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/dev/vpns/to-hub.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/dev/vpns/to-hub.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.

 name: to-hub
-region: europe-west8
+region: $locations:primary
 peer_gateways:
  default:
    gcp: $vpn_gateways:hub/to-dev
--- a/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/hub/.config.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/hub/.config.yaml
@@ -9,10 +9,10 @@ name: hub
 delete_default_routes_on_create: false
 nat_config:
  nat-ew8:
-    region: europe-west8
+    region: $locations:primary
 routers:
  vpn-router:
-    region: europe-west8
+    region: $locations:primary
    asn: 64514
    custom_advertise:
      ip_ranges:
--- a/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/hub/subnets/hub-default.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/hub/subnets/hub-default.yaml
@@ -3,6 +3,6 @@
 # yaml-language-server: $schema=../../../../../schemas/subnet.schema.json

 name: hub-default
-region: $locations:secondary
+region: $locations:primary
 ip_cidr_range: 10.71.0.0/24
-description: Default europe-west12 subnet for hub
+description: Default primary-region subnet for hub
--- a/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/hub/vpns/onprem.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/hub/vpns/onprem.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.

 name: to-onprem
-region: europe-west8
+region: $locations:primary
 peer_gateways:
  default:
    external:
--- a/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/hub/vpns/to-dev.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/hub/vpns/to-dev.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.

 name: to-dev
-region: europe-west8
+region: $locations:primary
 peer_gateways:
  default:
    gcp: $vpn_gateways:dev/to-hub
--- a/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/hub/vpns/to-prod.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/hub/vpns/to-prod.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.

 name: to-prod
-region: europe-west8
+region: $locations:primary
 peer_gateways:
  default:
    gcp: $vpn_gateways:prod/to-hub
--- a/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/prod/.config.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/prod/.config.yaml
@@ -10,5 +10,5 @@ delete_default_routes_on_create: false
 mtu: 1500
 routers:
  vpn-router:
-    region: europe-west8
+    region: $locations:primary
    asn: 64515
--- a/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/prod/vpns/to-hub.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-vpns/vpcs/prod/vpns/to-hub.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.

 name: to-hub
-region: europe-west8
+region: $locations:primary
 peer_gateways:
  default:
    gcp: $vpn_gateways:hub/to-prod
--- a/tests/fast/stages/s2_networking/ncc.yaml
+++ b/tests/fast/stages/s2_networking/ncc.yaml
@@ -1645,31 +1645,9 @@ values:
    project: fast-dev-net-dev-0
    tags: null
    timeouts: null
-  module.vpcs["dev"].google_compute_subnetwork.subnetwork["europe-west8/dev-dataplatform"]:
-    description: Default subnet for dev Data Platform
-    ip_cidr_range: 10.68.2.0/24
-    ip_collection: null
-    ipv6_access_type: null
-    log_config: []
-    name: dev-dataplatform
-    network: dev
-    private_ip_google_access: true
-    project: fast-dev-net-dev-0
-    region: europe-west8
-    reserved_internal_range: null
-    role: null
-    secondary_ip_range:
-      - ip_cidr_range: 100.69.0.0/16
-        range_name: pods
-        reserved_internal_range: null
-      - ip_cidr_range: 100.71.2.0/24
-        range_name: services
-        reserved_internal_range: null
-    send_secondary_ip_range_if_empty: true
-    timeouts: null
  module.vpcs["dev"].google_compute_subnetwork.subnetwork["europe-west8/dev-default"]:
    description: Default primary-region subnet for dev
-    ip_cidr_range: 10.68.0.0/24
+    ip_cidr_range: 10.73.0.0/24
    ip_collection: null
    ipv6_access_type: null
    log_config: []
@@ -1682,28 +1660,6 @@ values:
    role: null
    send_secondary_ip_range_if_empty: true
    timeouts: null
-  module.vpcs["dev"].google_compute_subnetwork.subnetwork["europe-west8/dev-gke-nodes"]:
-    description: Default subnet for prod gke nodes
-    ip_cidr_range: 10.68.1.0/24
-    ip_collection: null
-    ipv6_access_type: null
-    log_config: []
-    name: dev-gke-nodes
-    network: dev
-    private_ip_google_access: true
-    project: fast-dev-net-dev-0
-    region: europe-west8
-    reserved_internal_range: null
-    role: null
-    secondary_ip_range:
-      - ip_cidr_range: 100.68.0.0/16
-        range_name: pods
-        reserved_internal_range: null
-      - ip_cidr_range: 100.71.1.0/24
-        range_name: services
-        reserved_internal_range: null
-    send_secondary_ip_range_if_empty: true
-    timeouts: null
  module.vpcs["dev"].google_dns_policy.default[0]:
    alternative_name_server_config: []
    description: Managed by Terraform
@@ -1767,7 +1723,7 @@ values:
    timeouts: null
  module.vpcs["hub"].google_compute_subnetwork.subnetwork["europe-west8/hub-default"]:
    description: Default primary-region subnet for hub
-    ip_cidr_range: 10.64.255.0/24
+    ip_cidr_range: 10.71.0.0/24
    ip_collection: null
    ipv6_access_type: null
    log_config: []
@@ -2072,7 +2028,7 @@ counts:
  google_compute_router_nat: 2
  google_compute_router_peer: 2
  google_compute_shared_vpc_host_project: 3
-  google_compute_subnetwork: 6
+  google_compute_subnetwork: 4
  google_compute_vpn_tunnel: 2
  google_dns_managed_zone: 5
  google_dns_policy: 3
@@ -2091,5 +2047,5 @@ counts:
  google_storage_bucket_object: 2
  modules: 23
  random_id: 3
-  resources: 185
+  resources: 183
  terraform_data: 1
--- a/tests/fast/stages/s2_networking/peerings.yaml
+++ b/tests/fast/stages/s2_networking/peerings.yaml
@@ -1654,8 +1654,8 @@ values:
    project: fast-dev-net-dev-0
    tags: null
    timeouts: null
-  module.vpcs["dev"].google_compute_subnetwork.subnetwork["europe-west12/dev-default"]:
-    description: Default europe-west12 subnet for dev
+  module.vpcs["dev"].google_compute_subnetwork.subnetwork["europe-west8/dev-default"]:
+    description: Default primary-region subnet for dev
    ip_cidr_range: 10.73.0.0/24
    ip_collection: null
    ipv6_access_type: null
@@ -1664,7 +1664,7 @@ values:
    network: dev
    private_ip_google_access: true
    project: fast-dev-net-dev-0
-    region: europe-west12
+    region: europe-west8
    reserved_internal_range: null
    role: null
    send_secondary_ip_range_if_empty: true
@@ -1730,8 +1730,8 @@ values:
    project: fast-prod-net-core-0
    tags: null
    timeouts: null
-  module.vpcs["hub"].google_compute_subnetwork.subnetwork["europe-west12/hub-default"]:
-    description: Default europe-west12 subnet for hub
+  module.vpcs["hub"].google_compute_subnetwork.subnetwork["europe-west8/hub-default"]:
+    description: Default primary-region subnet for hub
    ip_cidr_range: 10.71.0.0/24
    ip_collection: null
    ipv6_access_type: null
@@ -1740,7 +1740,7 @@ values:
    network: hub
    private_ip_google_access: true
    project: fast-prod-net-core-0
-    region: europe-west12
+    region: europe-west8
    reserved_internal_range: null
    role: null
    send_secondary_ip_range_if_empty: true
--- a/tests/fast/stages/s2_networking/vpns.yaml
+++ b/tests/fast/stages/s2_networking/vpns.yaml
@@ -1640,8 +1640,8 @@ values:
    project: fast-dev-net-dev-0
    tags: null
    timeouts: null
-  module.vpcs["dev"].google_compute_subnetwork.subnetwork["europe-west12/dev-default"]:
-    description: Default europe-west12 subnet for dev
+  module.vpcs["dev"].google_compute_subnetwork.subnetwork["europe-west8/dev-default"]:
+    description: Default primary-region subnet for dev
    ip_cidr_range: 10.73.0.0/24
    ip_collection: null
    ipv6_access_type: null
@@ -1650,7 +1650,7 @@ values:
    network: dev
    private_ip_google_access: true
    project: fast-dev-net-dev-0
-    region: europe-west12
+    region: europe-west8
    reserved_internal_range: null
    role: null
    send_secondary_ip_range_if_empty: true
@@ -1716,8 +1716,8 @@ values:
    project: fast-prod-net-core-0
    tags: null
    timeouts: null
-  module.vpcs["hub"].google_compute_subnetwork.subnetwork["europe-west12/hub-default"]:
-    description: Default europe-west12 subnet for hub
+  module.vpcs["hub"].google_compute_subnetwork.subnetwork["europe-west8/hub-default"]:
+    description: Default primary-region subnet for hub
    ip_cidr_range: 10.71.0.0/24
    ip_collection: null
    ipv6_access_type: null
@@ -1726,7 +1726,7 @@ values:
    network: hub
    private_ip_google_access: true
    project: fast-prod-net-core-0
-    region: europe-west12
+    region: europe-west8
    reserved_internal_range: null
    role: null
    send_secondary_ip_range_if_empty: true