Skip autopilot for now, require != 6.3.0, update non-beta versions.tf

wyardley · wyardley · commit de88008e1b16 · 2024-09-24T17:47:24.000-07:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -270,12 +270,8 @@ resource "google_container_cluster" "primary" {
   }
 {% if autopilot_cluster %}
   dynamic "node_pool_auto_config" {
-    for_each = length(var.network_tags) > 0 || var.add_cluster_firewall_rules || var.add_master_webhook_firewall_rules || var.add_shadow_firewall_rules || var.insecure_kubelet_readonly_port_enabled !="" ? [1] : []
+    for_each = length(var.network_tags) > 0 || var.add_cluster_firewall_rules || var.add_master_webhook_firewall_rules || var.add_shadow_firewall_rules ? [1] : []
     content {
-      dynamic "node_kubelet_config" {
-        for_each = var.insecure_kubelet_readonly_port_enabled != "" ? [1] : []
-          insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled
-      }
       network_tags {
         tags = var.add_cluster_firewall_rules || var.add_master_webhook_firewall_rules || var.add_shadow_firewall_rules ? concat(var.network_tags, [local.cluster_network_tag]) : var.network_tags
       }
diff --git a/autogen/main/versions.tf.tmpl b/autogen/main/versions.tf.tmpl
@@ -24,11 +24,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.44.0, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
@@ -89,7 +89,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 7"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-autopilot-private-cluster/cluster.tf b/modules/beta-autopilot-private-cluster/cluster.tf
@@ -118,12 +118,8 @@ resource "google_container_cluster" "primary" {
     }
   }
   dynamic "node_pool_auto_config" {
-    for_each = length(var.network_tags) > 0 || var.add_cluster_firewall_rules || var.add_master_webhook_firewall_rules || var.add_shadow_firewall_rules || var.insecure_kubelet_readonly_port_enabled != "" ? [1] : []
+    for_each = length(var.network_tags) > 0 || var.add_cluster_firewall_rules || var.add_master_webhook_firewall_rules || var.add_shadow_firewall_rules ? [1] : []
     content {
-      dynamic "node_kubelet_config" {
-        for_each                               = var.insecure_kubelet_readonly_port_enabled != "" ? [1] : []
-        insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled
-      }
       network_tags {
         tags = var.add_cluster_firewall_rules || var.add_master_webhook_firewall_rules || var.add_shadow_firewall_rules ? concat(var.network_tags, [local.cluster_network_tag]) : var.network_tags
       }
diff --git a/modules/beta-autopilot-public-cluster/cluster.tf b/modules/beta-autopilot-public-cluster/cluster.tf
@@ -118,12 +118,8 @@ resource "google_container_cluster" "primary" {
     }
   }
   dynamic "node_pool_auto_config" {
-    for_each = length(var.network_tags) > 0 || var.add_cluster_firewall_rules || var.add_master_webhook_firewall_rules || var.add_shadow_firewall_rules || var.insecure_kubelet_readonly_port_enabled != "" ? [1] : []
+    for_each = length(var.network_tags) > 0 || var.add_cluster_firewall_rules || var.add_master_webhook_firewall_rules || var.add_shadow_firewall_rules ? [1] : []
     content {
-      dynamic "node_kubelet_config" {
-        for_each                               = var.insecure_kubelet_readonly_port_enabled != "" ? [1] : []
-        insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled
-      }
       network_tags {
         tags = var.add_cluster_firewall_rules || var.add_master_webhook_firewall_rules || var.add_shadow_firewall_rules ? concat(var.network_tags, [local.cluster_network_tag]) : var.network_tags
       }
diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.44.0, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.44.0, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-public-cluster-update-variant/versions.tf b/modules/beta-public-cluster-update-variant/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.44.0, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.44.0, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf
@@ -21,7 +21,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 7"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf
@@ -21,7 +21,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 7"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/versions.tf b/versions.tf
@@ -21,7 +21,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.40.0, < 7"
+      version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

Original file line number	Diff line number	Diff line change
`@@ -270,12 +270,8 @@ resource "google_container_cluster" "primary" {`
`270`	`270`	`}`
`271`	`271`	`{% if autopilot_cluster %}`
`272`	`272`	`dynamic "node_pool_auto_config" {`
`273`		`- for_each = length(var.network_tags) > 0 \|\| var.add_cluster_firewall_rules \|\| var.add_master_webhook_firewall_rules \|\| var.add_shadow_firewall_rules \|\| var.insecure_kubelet_readonly_port_enabled !="" ? [1] : []`
	`273`	`+ for_each = length(var.network_tags) > 0 \|\| var.add_cluster_firewall_rules \|\| var.add_master_webhook_firewall_rules \|\| var.add_shadow_firewall_rules ? [1] : []`
`274`	`274`	`content {`
`275`		`- dynamic "node_kubelet_config" {`
`276`		`- for_each = var.insecure_kubelet_readonly_port_enabled != "" ? [1] : []`
`277`		`- insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled`
`278`		`- }`
`279`	`275`	`network_tags {`
`280`	`276`	`tags = var.add_cluster_firewall_rules \|\| var.add_master_webhook_firewall_rules \|\| var.add_shadow_firewall_rules ? concat(var.network_tags, [local.cluster_network_tag]) : var.network_tags`
`281`	`277`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,12 +118,8 @@ resource "google_container_cluster" "primary" {`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`dynamic "node_pool_auto_config" {`
`121`		`- for_each = length(var.network_tags) > 0 \|\| var.add_cluster_firewall_rules \|\| var.add_master_webhook_firewall_rules \|\| var.add_shadow_firewall_rules \|\| var.insecure_kubelet_readonly_port_enabled != "" ? [1] : []`
	`121`	`+ for_each = length(var.network_tags) > 0 \|\| var.add_cluster_firewall_rules \|\| var.add_master_webhook_firewall_rules \|\| var.add_shadow_firewall_rules ? [1] : []`
`122`	`122`	`content {`
`123`		`- dynamic "node_kubelet_config" {`
`124`		`- for_each = var.insecure_kubelet_readonly_port_enabled != "" ? [1] : []`
`125`		`- insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled`
`126`		`- }`
`127`	`123`	`network_tags {`
`128`	`124`	`tags = var.add_cluster_firewall_rules \|\| var.add_master_webhook_firewall_rules \|\| var.add_shadow_firewall_rules ? concat(var.network_tags, [local.cluster_network_tag]) : var.network_tags`
`129`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ terraform {`
`21`	`21`	`required_providers {`
`22`	`22`	`google = {`
`23`	`23`	`source = "hashicorp/google"`
`24`		`- version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0"`
	`24`	`+ version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"`
`25`	`25`	`}`
`26`	`26`	`google-beta = {`
`27`	`27`	`source = "hashicorp/google-beta"`
`28`		`- version = ">= 5.44.0, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0"`
	`28`	`+ version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"`
`29`	`29`	`}`
`30`	`30`	`kubernetes = {`
`31`	`31`	`source = "hashicorp/kubernetes"`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ terraform {`
`21`	`21`	`required_providers {`
`22`	`22`	`google = {`
`23`	`23`	`source = "hashicorp/google"`
`24`		`- version = ">= 5.40.0, < 7"`
	`24`	`+ version = ">= 5.44.1, < 7, !=6.0.0, !=6.0.1, !=6.1.0, !=6.2.0, !=6.3.0"`
`25`	`25`	`}`
`26`	`26`	`kubernetes = {`
`27`	`27`	`source = "hashicorp/kubernetes"`