Merge remote-tracking branch 'origin/master' into fast-dev

2025-11-24 09:56:12 +00:00
parent ba4ed1a7a9 741e2926c3
commit 6f8097d2eb
236 changed files with 868 additions and 694 deletions
--- a/fast/project-templates/managed-kafka/versions.tf
+++ b/fast/project-templates/managed-kafka/versions.tf
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# Fabric release: v49.0.0
+# Fabric release: v49.1.0

 terraform {
  required_version = ">= 1.12.2"
@@ -27,9 +27,9 @@ terraform {
    }
  }
  provider_meta "google" {
-    module_name = "google-pso-tool/cloud-foundation-fabric/fast/project-templates/managed-kafka:v49.0.0-tf"
+    module_name = "google-pso-tool/cloud-foundation-fabric/fast/project-templates/managed-kafka:v49.1.0-tf"
  }
  provider_meta "google-beta" {
-    module_name = "google-pso-tool/cloud-foundation-fabric/fast/project-templates/managed-kafka:v49.0.0-tf"
+    module_name = "google-pso-tool/cloud-foundation-fabric/fast/project-templates/managed-kafka:v49.1.0-tf"
  }
 }
--- a/fast/stages/0-org-setup/factory.tf
+++ b/fast/stages/0-org-setup/factory.tf
@@ -34,7 +34,12 @@ module "factory" {
  )
  data_overrides = local.project_defaults.overrides
  context = merge(local.ctx, {
-    condition_vars = local.ctx_condition_vars
+    condition_vars = merge(local.ctx_condition_vars, {
+      custom_roles = merge(
+        try(local.ctx.condition_vars.custom_roles, {}),
+        module.organization[0].custom_role_id
+      )
+    })
    custom_roles = merge(
      local.ctx.custom_roles,
      module.organization[0].custom_role_id
--- a/fast/stages/0-org-setup/fast_version.txt
+++ b/fast/stages/0-org-setup/fast_version.txt
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# FAST release: v49.0.0
+# FAST release: v49.1.0
--- a/fast/stages/1-vpcsc/fast_version.txt
+++ b/fast/stages/1-vpcsc/fast_version.txt
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# FAST release: v49.0.0
+# FAST release: v49.1.0
--- a/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/dev/.config.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/dev/.config.yaml
@@ -6,7 +6,7 @@

 project_id: $project_ids:net-dev-0
 name: dev-0
-delete_default_routes_on_create: false
+delete_default_routes_on_create: true
 mtu: 1500
 nat_config:
  nat-primary:
@@ -14,3 +14,8 @@ nat_config:
 ncc_config:
  hub: $ncc_hubs:hub
  group: $ncc_groups:hub/default
+routes:
+  default:
+    dest_range: 0.0.0.0/0
+    next_hop_type: "gateway"
+    next_hop: "default-internet-gateway"
--- 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
@@ -6,15 +6,13 @@

 project_id: $project_ids:net-core-0
 name: hub-0
-delete_default_routes_on_create: false
+delete_default_routes_on_create: true
 routers:
  vpn-router:
    region: $locations:primary
    asn: 64514
 routes:
-  gateway:
-    # The configuration above is purely illustrative. Adjust as needed.
-    dest_range: "8.8.8.8/32"
-    priority: 100
+  default:
+    dest_range: 0.0.0.0/0
    next_hop_type: "gateway"
    next_hop: "default-internet-gateway"
--- a/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/prod/.config.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-ncc/vpcs/prod/.config.yaml
@@ -6,7 +6,7 @@

 project_id: $project_ids:net-prod-0
 name: prod-0
-delete_default_routes_on_create: false
+delete_default_routes_on_create: true
 mtu: 1500
 nat_config:
  nat-primary:
@@ -21,6 +21,11 @@ psa_configs:
    import_routes: true
    peered_domains:
      - "test."
+routes:
+  default:
+    dest_range: 0.0.0.0/0
+    next_hop_type: "gateway"
+    next_hop: "default-internet-gateway"
 subnets_proxy_only:
  - ip_cidr_range: 10.72.240.0/24
    region: $locations:primary
--- a/fast/stages/2-networking/datasets/hub-and-spokes-nva/vpcs/hub/.config.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-nva/vpcs/hub/.config.yaml
@@ -6,10 +6,9 @@

 project_id: $project_ids:net-core-0
 name: hub-0
-delete_default_routes_on_create: false
+delete_default_routes_on_create: true
 routes:
-  gateway:
-    dest_range: "8.8.8.8/32"
-    priority: 100
+  default:
+    dest_range: 0.0.0.0/0
    next_hop_type: "gateway"
    next_hop: "default-internet-gateway"
--- a/fast/stages/2-networking/datasets/hub-and-spokes-peerings/vpcs/dev/.config.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-peerings/vpcs/dev/.config.yaml
@@ -6,7 +6,7 @@

 project_id: $project_ids:net-dev-0
 name: dev-0
-delete_default_routes_on_create: false
+delete_default_routes_on_create: true
 mtu: 1500
 nat_config:
  nat-ew8:
@@ -14,3 +14,8 @@ nat_config:
 peering_config:
  to-hub:
    peer_network: $networks:hub
+routes:
+  default:
+    dest_range: 0.0.0.0/0
+    next_hop_type: "gateway"
+    next_hop: "default-internet-gateway"
--- a/fast/stages/2-networking/datasets/hub-and-spokes-peerings/vpcs/hub/.config.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-peerings/vpcs/hub/.config.yaml
@@ -6,22 +6,21 @@

 project_id: $project_ids:net-core-0
 name: hub-0
-delete_default_routes_on_create: false
+delete_default_routes_on_create: true
 nat_config:
  nat-ew8:
    region: $locations:primary
-routers:
-  vpn-router:
-    region: $locations:primary
-    asn: 64514
-routes:
-  gateway:
-    dest_range: "8.8.8.8/32"
-    priority: 100
-    next_hop_type: "gateway"
-    next_hop: "default-internet-gateway"
 peering_config:
  to-prod:
    peer_network: $networks:prod
  to-dev:
    peer_network: $networks:dev
+routers:
+  vpn-router:
+    region: $locations:primary
+    asn: 64514
+routes:
+  default:
+    dest_range: 0.0.0.0/0
+    next_hop_type: "gateway"
+    next_hop: "default-internet-gateway"
--- a/fast/stages/2-networking/datasets/hub-and-spokes-peerings/vpcs/prod/.config.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-peerings/vpcs/prod/.config.yaml
@@ -6,7 +6,7 @@

 project_id: $project_ids:net-prod-0
 name: prod-0
-delete_default_routes_on_create: false
+delete_default_routes_on_create: true
 mtu: 1500
 nat_config:
  nat-ew8:
@@ -21,6 +21,11 @@ psa_configs:
    import_routes: true
    peered_domains:
      - "test."
+routes:
+  default:
+    dest_range: 0.0.0.0/0
+    next_hop_type: "gateway"
+    next_hop: "default-internet-gateway"
 subnets_proxy_only:
  - ip_cidr_range: 10.72.240.0/24
    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
@@ -6,9 +6,14 @@

 project_id: $project_ids:net-dev-0
 name: dev-0
-delete_default_routes_on_create: false
+delete_default_routes_on_create: true
 mtu: 1500
 routers:
  vpn-router:
    region: $locations:primary
    asn: 64516
+routes:
+  default:
+    dest_range: 0.0.0.0/0
+    next_hop_type: "gateway"
+    next_hop: "default-internet-gateway"
--- 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
@@ -6,7 +6,7 @@

 project_id: $project_ids:net-core-0
 name: hub-0
-delete_default_routes_on_create: false
+delete_default_routes_on_create: true
 nat_config:
  nat-ew8:
    region: $locations:primary
@@ -20,8 +20,7 @@ routers:
        "172.16.0.0/12": "rfc1918-172"
        "192.168.0.0/16": "rfc1918-192"
 routes:
-  gateway:
-    dest_range: "8.8.8.8/32"
-    priority: 100
+  default:
+    dest_range: 0.0.0.0/0
    next_hop_type: "gateway"
    next_hop: "default-internet-gateway"
--- 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
@@ -6,9 +6,14 @@

 project_id: $project_ids:net-prod-0
 name: prod-0
-delete_default_routes_on_create: false
+delete_default_routes_on_create: true
 mtu: 1500
 routers:
  vpn-router:
    region: $locations:primary
    asn: 64515
+routes:
+  default:
+    dest_range: 0.0.0.0/0
+    next_hop_type: "gateway"
+    next_hop: "default-internet-gateway"
--- a/fast/stages/2-networking/fast_version.txt
+++ b/fast/stages/2-networking/fast_version.txt
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# FAST release: v49.0.0
+# FAST release: v49.1.0
--- a/fast/stages/2-project-factory/fast_version.txt
+++ b/fast/stages/2-project-factory/fast_version.txt
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# FAST release: v49.0.0
+# FAST release: v49.1.0
--- a/fast/stages/2-security/fast_version.txt
+++ b/fast/stages/2-security/fast_version.txt
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# FAST release: v49.0.0
+# FAST release: v49.1.0
--- a/fast/stages/3-data-platform-dev/fast_version.txt
+++ b/fast/stages/3-data-platform-dev/fast_version.txt
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# FAST release: v49.0.0
+# FAST release: v49.1.0
--- a/fast/stages/3-gcve-dev/fast_version.txt
+++ b/fast/stages/3-gcve-dev/fast_version.txt
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# FAST release: v49.0.0
+# FAST release: v49.1.0
--- a/fast/stages/3-gke-dev/fast_version.txt
+++ b/fast/stages/3-gke-dev/fast_version.txt
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# FAST release: v49.0.0
+# FAST release: v49.1.0
--- a/fast/stages/3-secops-dev/fast_version.txt
+++ b/fast/stages/3-secops-dev/fast_version.txt
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# FAST release: v49.0.0
+# FAST release: v49.1.0