diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index f1fed8114..0618e193e 100644 --- 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 index f506a4fe4..2616a7006 100644 --- 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 index 4f9caf5a8..321534494 100644 --- 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 } @@ -48,6 +48,7 @@ module "gke" { }, { name = "pool-02" + machine_type = "n1-standard-2" min_count = 1 max_count = 2 local_ssd_count = 0 diff --git a/examples/node_pool_update_variant/main.tf b/examples/node_pool_update_variant/main.tf index d52df4a36..700ea9d5f 100644 --- a/examples/node_pool_update_variant/main.tf +++ b/examples/node_pool_update_variant/main.tf @@ -63,6 +63,7 @@ module "gke" { }, { name = "pool-02" + machine_type = "n1-standard-2" min_count = 1 max_count = 2 disk_size_gb = 30 diff --git a/examples/node_pool_update_variant_beta/main.tf b/examples/node_pool_update_variant_beta/main.tf index e4a56f7ac..407b7f565 100644 --- 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 } @@ -64,6 +64,7 @@ module "gke" { }, { name = "pool-02" + machine_type = "n1-standard-2" min_count = 1 max_count = 2 disk_size_gb = 30 diff --git a/examples/regional_private_node_pool_oauth_scopes/provider.tf b/examples/regional_private_node_pool_oauth_scopes/provider.tf index 1d4769e24..e1c1042b8 100644 --- 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 index 2533f5862..df2e55326 100644 --- 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/cluster.tf b/examples/safer_cluster_iap_bastion/cluster.tf index cfaa0ec86..8ec538b47 100644 --- a/examples/safer_cluster_iap_bastion/cluster.tf +++ b/examples/safer_cluster_iap_bastion/cluster.tf @@ -15,8 +15,8 @@ */ module "gke" { - source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster" - version = "~> 9.0" + source = "../../modules/safer-cluster" + project_id = module.enabled_google_apis.project_id name = var.cluster_name region = var.region diff --git a/examples/safer_cluster_iap_bastion/provider.tf b/examples/safer_cluster_iap_bastion/provider.tf index e61d12fb1..32d96a52a 100644 --- 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 index 1dc08e044..81b053c82 100644 --- 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 index 881746717..4336225fa 100644 --- 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 index df9a1ab2d..4b4fee6ea 100644 --- 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 index 80198899f..49a567d7a 100644 --- 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 index 86b402689..3ac0e9da5 100644 --- 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 index f0900c1cb..83be3ce1f 100644 --- 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 index bab6d001d..a568541f9 100644 --- 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 index f0900c1cb..83be3ce1f 100644 --- 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 index 62b284722..45505cd8b 100644 --- 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 index f0900c1cb..83be3ce1f 100644 --- 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 index f66045c4e..497f6e43d 100644 --- 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 index f0900c1cb..83be3ce1f 100644 --- 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" } } diff --git a/test/fixtures/sandbox_enabled/example.tf b/test/fixtures/sandbox_enabled/example.tf index b485b575a..01f3913ce 100644 --- a/test/fixtures/sandbox_enabled/example.tf +++ b/test/fixtures/sandbox_enabled/example.tf @@ -32,8 +32,9 @@ module "example" { node_pools = [ { - name = "default-node-pool" - image_type = "COS_CONTAINERD" + name = "default-node-pool" + image_type = "COS_CONTAINERD" + machine_type = "n1-standard-2" }, ] } diff --git a/test/integration/node_pool/controls/gcloud.rb b/test/integration/node_pool/controls/gcloud.rb index d9d305042..03ee609fd 100644 --- a/test/integration/node_pool/controls/gcloud.rb +++ b/test/integration/node_pool/controls/gcloud.rb @@ -190,7 +190,7 @@ including( "name" => "pool-02", "config" => including( - "machineType" => "e2-medium", + "machineType" => "n1-standard-2", ), ) )