fix: Explicitly specify VPC-native clusters for beta modules.

morgante · morgante · commit ec65028ae434 · 2020-07-08T22:23:12.000-04:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -171,6 +171,9 @@ resource "google_container_cluster" "primary" {
     {% endif %}
   }
 
+  {% if beta_cluster %}
+  networking_mode = "VPC_NATIVE"
+  {% endif %}
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods
     services_secondary_range_name = var.ip_range_services
diff --git a/autogen/main/versions.tf.tmpl b/autogen/main/versions.tf.tmpl
@@ -19,7 +19,7 @@ terraform {
 
   required_providers {
 {% if beta_cluster %}
-    google-beta = ">= 3.23.0, <4.0.0"
+    google-beta = ">= 3.29.0, <4.0.0"
 {% else %}
     google = ">= 3.16, <4.0.0"
 {% endif %}
diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 3.23.0"
+  version = "~> 3.29.0"
   region  = var.region
 }
 
diff --git a/examples/node_pool_update_variant_beta/main.tf b/examples/node_pool_update_variant_beta/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version     = "~> 3.23.0"
+  version     = "~> 3.29.0"
   credentials = file(var.credentials_path)
   region      = var.region
 }
diff --git a/examples/regional_private_node_pool_oauth_scopes/provider.tf b/examples/regional_private_node_pool_oauth_scopes/provider.tf
@@ -15,9 +15,9 @@
  */
 
 provider "google" {
-  version = "3.16.0"
+  version = "~> 3.16.0"
 }
 
 provider "google-beta" {
-  version = "3.23.0"
+  version = "~> 3.29.0"
 }
diff --git a/examples/safer_cluster/main.tf b/examples/safer_cluster/main.tf
@@ -34,7 +34,7 @@ provider "google" {
 }
 
 provider "google-beta" {
-  version = "~> 3.23.0"
+  version = "~> 3.29.0"
 }
 
 module "gke" {
diff --git a/examples/safer_cluster_iap_bastion/provider.tf b/examples/safer_cluster_iap_bastion/provider.tf
@@ -15,9 +15,9 @@
  */
 
 provider "google" {
-  version = "~>  3.23"
+  version = "~> 3.29.0"
 }
 
 provider "google-beta" {
-  version = "~>  3.23"
+  version = "~> 3.29.0"
 }
diff --git a/examples/simple_regional_beta/main.tf b/examples/simple_regional_beta/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 3.23.0"
+  version = "~> 3.29.0"
   region  = var.region
 }
 
diff --git a/examples/simple_regional_private_beta/main.tf b/examples/simple_regional_private_beta/main.tf
@@ -24,7 +24,7 @@ provider "google" {
 }
 
 provider "google-beta" {
-  version = "~> 3.23.0"
+  version = "~> 3.29.0"
   region  = var.region
 }
 
diff --git a/examples/simple_zonal_with_asm/main.tf b/examples/simple_zonal_with_asm/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 3.23.0"
+  version = "~> 3.29.0"
   region  = var.region
 }
 
diff --git a/examples/workload_metadata_config/main.tf b/examples/workload_metadata_config/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 3.23.0"
+  version = "~> 3.29.0"
   region  = var.region
 }
 
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -155,6 +155,7 @@ resource "google_container_cluster" "primary" {
     }
   }
 
+  networking_mode = "VPC_NATIVE"
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods
     services_secondary_range_name = var.ip_range_services
diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = "~> 0.12.6"
 
   required_providers {
-    google-beta = ">= 3.23.0, <4.0.0"
+    google-beta = ">= 3.29.0, <4.0.0"
   }
 }
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -155,6 +155,7 @@ resource "google_container_cluster" "primary" {
     }
   }
 
+  networking_mode = "VPC_NATIVE"
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods
     services_secondary_range_name = var.ip_range_services
diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = "~> 0.12.6"
 
   required_providers {
-    google-beta = ">= 3.23.0, <4.0.0"
+    google-beta = ">= 3.29.0, <4.0.0"
   }
 }
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -155,6 +155,7 @@ resource "google_container_cluster" "primary" {
     }
   }
 
+  networking_mode = "VPC_NATIVE"
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods
     services_secondary_range_name = var.ip_range_services
diff --git a/modules/beta-public-cluster-update-variant/versions.tf b/modules/beta-public-cluster-update-variant/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = "~> 0.12.6"
 
   required_providers {
-    google-beta = ">= 3.23.0, <4.0.0"
+    google-beta = ">= 3.29.0, <4.0.0"
   }
 }
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -155,6 +155,7 @@ resource "google_container_cluster" "primary" {
     }
   }
 
+  networking_mode = "VPC_NATIVE"
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods
     services_secondary_range_name = var.ip_range_services
diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = "~> 0.12.6"
 
   required_providers {
-    google-beta = ">= 3.23.0, <4.0.0"
+    google-beta = ">= 3.29.0, <4.0.0"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,9 @@ resource "google_container_cluster" "primary" {`
`171`	`171`	`{% endif %}`
`172`	`172`	`}`
`173`	`173`
	`174`	`+ {% if beta_cluster %}`
	`175`	`+ networking_mode = "VPC_NATIVE"`
	`176`	`+ {% endif %}`
`174`	`177`	`ip_allocation_policy {`
`175`	`178`	`cluster_secondary_range_name = var.ip_range_pods`
`176`	`179`	`services_secondary_range_name = var.ip_range_services`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ locals {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`provider "google-beta" {`
`22`		`- version = "~> 3.23.0"`
	`22`	`+ version = "~> 3.29.0"`
`23`	`23`	`region = var.region`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`provider "google" {`
`18`		`- version = "3.16.0"`
	`18`	`+ version = "~> 3.16.0"`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`provider "google-beta" {`
`22`		`- version = "3.23.0"`
	`22`	`+ version = "~> 3.29.0"`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ provider "google" {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`provider "google-beta" {`
`37`		`- version = "~> 3.23.0"`
	`37`	`+ version = "~> 3.29.0"`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`module "gke" {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ provider "google" {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`provider "google-beta" {`
`27`		`- version = "~> 3.23.0"`
	`27`	`+ version = "~> 3.29.0"`
`28`	`28`	`region = var.region`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ resource "google_container_cluster" "primary" {`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
	`158`	`+ networking_mode = "VPC_NATIVE"`
`158`	`159`	`ip_allocation_policy {`
`159`	`160`	`cluster_secondary_range_name = var.ip_range_pods`
`160`	`161`	`services_secondary_range_name = var.ip_range_services`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ terraform {`
`18`	`18`	`required_version = "~> 0.12.6"`
`19`	`19`
`20`	`20`	`required_providers {`
`21`		`- google-beta = ">= 3.23.0, <4.0.0"`
	`21`	`+ google-beta = ">= 3.29.0, <4.0.0"`
`22`	`22`	`}`
`23`	`23`	`}`