diff --git a/3-networks-dual-svpc/envs/shared/dns-hub.tf b/3-networks-dual-svpc/envs/shared/dns-hub.tf index a5a5cf6b81..507d94fe42 100644 --- a/3-networks-dual-svpc/envs/shared/dns-hub.tf +++ b/3-networks-dual-svpc/envs/shared/dns-hub.tf @@ -91,7 +91,7 @@ module "dns-forwarding-zone" { module "dns_hub_region1_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-c-dns-hub-${local.default_region1}-cr1" project = local.dns_hub_project_id @@ -105,7 +105,7 @@ module "dns_hub_region1_router1" { module "dns_hub_region1_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-c-dns-hub-${local.default_region1}-cr2" project = local.dns_hub_project_id @@ -119,7 +119,7 @@ module "dns_hub_region1_router2" { module "dns_hub_region2_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-c-dns-hub-${local.default_region2}-cr3" project = local.dns_hub_project_id @@ -133,7 +133,7 @@ module "dns_hub_region2_router1" { module "dns_hub_region2_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-c-dns-hub-${local.default_region2}-cr4" project = local.dns_hub_project_id diff --git a/3-networks-dual-svpc/modules/base_shared_vpc/main.tf b/3-networks-dual-svpc/modules/base_shared_vpc/main.tf index ba1ca796d7..ed6caa6cf3 100644 --- a/3-networks-dual-svpc/modules/base_shared_vpc/main.tf +++ b/3-networks-dual-svpc/modules/base_shared_vpc/main.tf @@ -92,7 +92,7 @@ resource "google_service_networking_connection" "private_vpc_connection" { module "region1_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-${local.vpc_name}-${var.default_region1}-cr1" project = var.project_id @@ -107,7 +107,7 @@ module "region1_router1" { module "region1_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-${local.vpc_name}-${var.default_region1}-cr2" project = var.project_id @@ -122,7 +122,7 @@ module "region1_router2" { module "region2_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-${local.vpc_name}-${var.default_region2}-cr3" project = var.project_id @@ -137,7 +137,7 @@ module "region2_router1" { module "region2_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-${local.vpc_name}-${var.default_region2}-cr4" project = var.project_id diff --git a/3-networks-dual-svpc/modules/dedicated_interconnect/main.tf b/3-networks-dual-svpc/modules/dedicated_interconnect/main.tf index add0af28da..5d2f81dd08 100644 --- a/3-networks-dual-svpc/modules/dedicated_interconnect/main.tf +++ b/3-networks-dual-svpc/modules/dedicated_interconnect/main.tf @@ -23,7 +23,7 @@ locals { module "interconnect_attachment1_region1" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 5.0" name = "vl-${var.region1_interconnect1_onprem_dc}-${var.region1_interconnect1_location}-${var.vpc_name}-${var.region1}-${local.suffix1}" project = var.interconnect_project_id @@ -46,7 +46,7 @@ module "interconnect_attachment1_region1" { module "interconnect_attachment2_region1" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 5.0" name = "vl-${var.region1_interconnect2_onprem_dc}-${var.region1_interconnect2_location}-${var.vpc_name}-${var.region1}-${local.suffix2}" project = var.interconnect_project_id @@ -69,7 +69,7 @@ module "interconnect_attachment2_region1" { module "interconnect_attachment1_region2" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 5.0" name = "vl-${var.region2_interconnect1_onprem_dc}-${var.region2_interconnect1_location}-${var.vpc_name}-${var.region2}-${local.suffix3}" project = var.interconnect_project_id @@ -92,7 +92,7 @@ module "interconnect_attachment1_region2" { module "interconnect_attachment2_region2" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 5.0" name = "vl-${var.region2_interconnect2_onprem_dc}-${var.region2_interconnect2_location}-${var.vpc_name}-${var.region2}-${local.suffix4}" project = var.interconnect_project_id diff --git a/3-networks-dual-svpc/modules/restricted_shared_vpc/main.tf b/3-networks-dual-svpc/modules/restricted_shared_vpc/main.tf index 259b3d3534..60780eaceb 100644 --- a/3-networks-dual-svpc/modules/restricted_shared_vpc/main.tf +++ b/3-networks-dual-svpc/modules/restricted_shared_vpc/main.tf @@ -96,7 +96,7 @@ resource "google_service_networking_connection" "private_vpc_connection" { module "region1_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-${local.vpc_name}-${var.default_region1}-cr5" project = var.project_id @@ -111,7 +111,7 @@ module "region1_router1" { module "region1_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-${local.vpc_name}-${var.default_region1}-cr6" project = var.project_id @@ -126,7 +126,7 @@ module "region1_router2" { module "region2_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-${local.vpc_name}-${var.default_region2}-cr7" project = var.project_id @@ -141,7 +141,7 @@ module "region2_router1" { module "region2_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-${local.vpc_name}-${var.default_region2}-cr8" project = var.project_id diff --git a/3-networks-hub-and-spoke/envs/shared/dns-hub.tf b/3-networks-hub-and-spoke/envs/shared/dns-hub.tf index dff2ec0ce3..b380641060 100644 --- a/3-networks-hub-and-spoke/envs/shared/dns-hub.tf +++ b/3-networks-hub-and-spoke/envs/shared/dns-hub.tf @@ -91,7 +91,7 @@ module "dns-forwarding-zone" { module "dns_hub_region1_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-c-dns-hub-${local.default_region1}-cr1" project = local.dns_hub_project_id @@ -105,7 +105,7 @@ module "dns_hub_region1_router1" { module "dns_hub_region1_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-c-dns-hub-${local.default_region1}-cr2" project = local.dns_hub_project_id @@ -119,7 +119,7 @@ module "dns_hub_region1_router2" { module "dns_hub_region2_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-c-dns-hub-${local.default_region2}-cr3" project = local.dns_hub_project_id @@ -133,7 +133,7 @@ module "dns_hub_region2_router1" { module "dns_hub_region2_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" name = "cr-c-dns-hub-${local.default_region2}-cr4" project = local.dns_hub_project_id diff --git a/3-networks-hub-and-spoke/modules/base_shared_vpc/main.tf b/3-networks-hub-and-spoke/modules/base_shared_vpc/main.tf index 0a3c9656dd..9b2297d07f 100644 --- a/3-networks-hub-and-spoke/modules/base_shared_vpc/main.tf +++ b/3-networks-hub-and-spoke/modules/base_shared_vpc/main.tf @@ -116,7 +116,7 @@ resource "google_service_networking_connection" "private_vpc_connection" { module "region1_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region1}-cr1" @@ -132,7 +132,7 @@ module "region1_router1" { module "region1_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region1}-cr2" @@ -148,7 +148,7 @@ module "region1_router2" { module "region2_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region2}-cr3" @@ -164,7 +164,7 @@ module "region2_router1" { module "region2_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region2}-cr4" diff --git a/3-networks-hub-and-spoke/modules/dedicated_interconnect/main.tf b/3-networks-hub-and-spoke/modules/dedicated_interconnect/main.tf index db99c7045b..476f3b0c46 100644 --- a/3-networks-hub-and-spoke/modules/dedicated_interconnect/main.tf +++ b/3-networks-hub-and-spoke/modules/dedicated_interconnect/main.tf @@ -23,7 +23,7 @@ locals { module "interconnect_attachment1_region1" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 5.0" name = "vl-${var.region1_interconnect1_onprem_dc}-${var.region1_interconnect1_location}-${var.vpc_name}-${var.region1}-${local.suffix1}" project = var.interconnect_project_id @@ -46,7 +46,7 @@ module "interconnect_attachment1_region1" { module "interconnect_attachment2_region1" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 5.0" name = "vl-${var.region1_interconnect2_onprem_dc}-${var.region1_interconnect2_location}-${var.vpc_name}-${var.region1}-${local.suffix2}" project = var.interconnect_project_id @@ -69,7 +69,7 @@ module "interconnect_attachment2_region1" { module "interconnect_attachment1_region2" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 5.0" name = "vl-${var.region2_interconnect1_onprem_dc}-${var.region2_interconnect1_location}-${var.vpc_name}-${var.region2}-${local.suffix3}" project = var.interconnect_project_id @@ -92,7 +92,7 @@ module "interconnect_attachment1_region2" { module "interconnect_attachment2_region2" { source = "terraform-google-modules/cloud-router/google//modules/interconnect_attachment" - version = "~> 4.0" + version = "~> 5.0" name = "vl-${var.region2_interconnect2_onprem_dc}-${var.region2_interconnect2_location}-${var.vpc_name}-${var.region2}-${local.suffix4}" project = var.interconnect_project_id diff --git a/3-networks-hub-and-spoke/modules/restricted_shared_vpc/main.tf b/3-networks-hub-and-spoke/modules/restricted_shared_vpc/main.tf index 6cf82860fe..1d65c133d0 100644 --- a/3-networks-hub-and-spoke/modules/restricted_shared_vpc/main.tf +++ b/3-networks-hub-and-spoke/modules/restricted_shared_vpc/main.tf @@ -120,7 +120,7 @@ resource "google_service_networking_connection" "private_vpc_connection" { module "region1_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region1}-cr5" @@ -136,7 +136,7 @@ module "region1_router1" { module "region1_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region1}-cr6" @@ -152,7 +152,7 @@ module "region1_router2" { module "region2_router1" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region2}-cr7" @@ -168,7 +168,7 @@ module "region2_router1" { module "region2_router2" { source = "terraform-google-modules/cloud-router/google" - version = "~> 4.0" + version = "~> 5.0" count = var.mode != "spoke" ? 1 : 0 name = "cr-${local.vpc_name}-${var.default_region2}-cr8"