Add default googleapi route creation to net-vpc

GoogleCloudPlatform · May 26, 2023 · 7a91a7e · 7a91a7e
1 parent 868507e
commit 7a91a7e
Show file tree

Hide file tree

Showing 17 changed files with 133 additions and 196 deletions.
diff --git a/fast/stages/2-networking-a-peering/landing.tf b/fast/stages/2-networking-a-peering/landing.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,17 +51,9 @@ module "landing-vpc" {
     inbound = true
   }
   # set explicit routes for googleapis in case the default route is deleted
-  routes = {
-    private-googleapis = {
-      dest_range    = "199.36.153.8/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
-    restricted-googleapis = {
-      dest_range    = "199.36.153.4/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
+  create_default_routes = {
+    private    = true
+    restricted = true
   }
   data_folder = "${var.factories_config.data_dir}/subnets/landing"
 }

diff --git a/fast/stages/2-networking-a-peering/spoke-dev.tf b/fast/stages/2-networking-a-peering/spoke-dev.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,17 +53,9 @@ module "dev-spoke-vpc" {
   data_folder = "${var.factories_config.data_dir}/subnets/dev"
   psa_config  = try(var.psa_ranges.dev, null)
   # set explicit routes for googleapis in case the default route is deleted
-  routes = {
-    private-googleapis = {
-      dest_range    = "199.36.153.8/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
-    restricted-googleapis = {
-      dest_range    = "199.36.153.4/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
+  create_default_routes = {
+    private    = true
+    restricted = true
   }
 }
 

diff --git a/fast/stages/2-networking-a-peering/spoke-prod.tf b/fast/stages/2-networking-a-peering/spoke-prod.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,17 +52,9 @@ module "prod-spoke-vpc" {
   data_folder = "${var.factories_config.data_dir}/subnets/prod"
   psa_config  = try(var.psa_ranges.prod, null)
   # set explicit routes for googleapis in case the default route is deleted
-  routes = {
-    private-googleapis = {
-      dest_range    = "199.36.153.8/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
-    restricted-googleapis = {
-      dest_range    = "199.36.153.4/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
+  create_default_routes = {
+    private    = true
+    restricted = true
   }
 }
 

diff --git a/fast/stages/2-networking-b-vpn/landing.tf b/fast/stages/2-networking-b-vpn/landing.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,17 +51,9 @@ module "landing-vpc" {
     inbound = true
   }
   # set explicit routes for googleapis in case the default route is deleted
-  routes = {
-    private-googleapis = {
-      dest_range    = "199.36.153.8/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
-    restricted-googleapis = {
-      dest_range    = "199.36.153.4/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
+  create_default_routes = {
+    private    = true
+    restricted = true
   }
   data_folder = "${var.factories_config.data_dir}/subnets/landing"
 }

diff --git a/fast/stages/2-networking-b-vpn/spoke-dev.tf b/fast/stages/2-networking-b-vpn/spoke-dev.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,17 +53,9 @@ module "dev-spoke-vpc" {
   data_folder = "${var.factories_config.data_dir}/subnets/dev"
   psa_config  = try(var.psa_ranges.dev, null)
   # set explicit routes for googleapis in case the default route is deleted
-  routes = {
-    private-googleapis = {
-      dest_range    = "199.36.153.8/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
-    restricted-googleapis = {
-      dest_range    = "199.36.153.4/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
+  create_default_routes = {
+    private    = true
+    restricted = true
   }
 }
 

diff --git a/fast/stages/2-networking-b-vpn/spoke-prod.tf b/fast/stages/2-networking-b-vpn/spoke-prod.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,17 +52,9 @@ module "prod-spoke-vpc" {
   data_folder = "${var.factories_config.data_dir}/subnets/prod"
   psa_config  = try(var.psa_ranges.prod, null)
   # set explicit routes for googleapis in case the default route is deleted
-  routes = {
-    private-googleapis = {
-      dest_range    = "199.36.153.8/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
-    restricted-googleapis = {
-      dest_range    = "199.36.153.4/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
+  create_default_routes = {
+    private    = true
+    restricted = true
   }
 }
 

diff --git a/fast/stages/2-networking-c-nva/landing.tf b/fast/stages/2-networking-c-nva/landing.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -116,17 +116,9 @@ module "landing-trusted-vpc" {
     inbound = true
   }
   # Set explicit routes for googleapis in case the default route is deleted
-  routes = {
-    private-googleapis = {
-      dest_range    = "199.36.153.8/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
-    restricted-googleapis = {
-      dest_range    = "199.36.153.4/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
+  create_default_routes = {
+    private    = true
+    restricted = true
   }
 }
 

diff --git a/fast/stages/2-networking-c-nva/spoke-dev.tf b/fast/stages/2-networking-c-nva/spoke-dev.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,19 +53,11 @@ module "dev-spoke-vpc" {
   delete_default_routes_on_create = true
   psa_config                      = try(var.psa_ranges.dev, null)
   # Set explicit routes for googleapis; send everything else to NVAs
+  create_default_routes = {
+    private    = true
+    restricted = true
+  }
   routes = {
-    private-googleapis = {
-      dest_range    = "199.36.153.8/30"
-      priority      = 999
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
-    restricted-googleapis = {
-      dest_range    = "199.36.153.4/30"
-      priority      = 999
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
     nva-primary-to-primary = {
       dest_range    = "0.0.0.0/0"
       priority      = 1000

diff --git a/fast/stages/2-networking-c-nva/spoke-prod.tf b/fast/stages/2-networking-c-nva/spoke-prod.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,19 +52,11 @@ module "prod-spoke-vpc" {
   delete_default_routes_on_create = true
   psa_config                      = try(var.psa_ranges.prod, null)
   # Set explicit routes for googleapis; send everything else to NVAs
+  create_default_routes = {
+    private    = true
+    restricted = true
+  }
   routes = {
-    private-googleapis = {
-      dest_range    = "199.36.153.8/30"
-      priority      = 999
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
-    restricted-googleapis = {
-      dest_range    = "199.36.153.4/30"
-      priority      = 999
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
     nva-primary-to-primary = {
       dest_range    = "0.0.0.0/0"
       priority      = 1000

diff --git a/fast/stages/2-networking-d-separate-envs/spoke-dev.tf b/fast/stages/2-networking-d-separate-envs/spoke-dev.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,17 +53,9 @@ module "dev-spoke-vpc" {
   data_folder = "${var.factories_config.data_dir}/subnets/dev"
   psa_config  = try(var.psa_ranges.dev, null)
   # set explicit routes for googleapis in case the default route is deleted
-  routes = {
-    private-googleapis = {
-      dest_range    = "199.36.153.8/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
-    restricted-googleapis = {
-      dest_range    = "199.36.153.4/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
+  create_default_routes = {
+    private    = true
+    restricted = true
   }
 }
 

diff --git a/fast/stages/2-networking-d-separate-envs/spoke-prod.tf b/fast/stages/2-networking-d-separate-envs/spoke-prod.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,17 +52,9 @@ module "prod-spoke-vpc" {
   data_folder = "${var.factories_config.data_dir}/subnets/prod"
   psa_config  = try(var.psa_ranges.prod, null)
   # set explicit routes for googleapis in case the default route is deleted
-  routes = {
-    private-googleapis = {
-      dest_range    = "199.36.153.8/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
-    restricted-googleapis = {
-      dest_range    = "199.36.153.4/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
+  create_default_routes = {
+    private    = true
+    restricted = true
   }
 }
 

diff --git a/fast/stages/2-networking-e-nva-bgp/landing.tf b/fast/stages/2-networking-e-nva-bgp/landing.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -117,17 +117,9 @@ module "landing-trusted-vpc" {
     inbound = true
   }
   # Set explicit routes for googleapis in case the default route is deleted
-  routes = {
-    private-googleapis = {
-      dest_range    = "199.36.153.8/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
-    restricted-googleapis = {
-      dest_range    = "199.36.153.4/30"
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
+  create_default_routes = {
+    private    = true
+    restricted = true
   }
 }
 

diff --git a/fast/stages/2-networking-e-nva-bgp/spoke-dev.tf b/fast/stages/2-networking-e-nva-bgp/spoke-dev.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,19 +53,9 @@ module "dev-spoke-vpc" {
   delete_default_routes_on_create = true
   psa_config                      = try(var.psa_ranges.dev, null)
   # Set explicit routes for googleapis; send everything else to NVAs
-  routes = {
-    private-googleapis = {
-      dest_range    = "199.36.153.8/30"
-      priority      = 999
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
-    restricted-googleapis = {
-      dest_range    = "199.36.153.4/30"
-      priority      = 999
-      next_hop_type = "gateway"
-      next_hop      = "default-internet-gateway"
-    }
+  create_default_routes = {
+    private    = true
+    restricted = true
   }
 }