feat: promote max_pods_per_node, max_surge, and max_unavailable fields to ga (#1318)

DrFaust92 · web-flow · commit ed64058fa57b · 2022-07-19T09:46:42.000-05:00
* promote fields to ga

* revert network_config
diff --git a/README.md b/README.md
@@ -251,6 +251,9 @@ The node_pools variable takes the following parameters:
 | machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
 | min_cpu_platform | Minimum CPU platform to be used by the nodes in the pool. The nodes may be scheduled on the specified or newer CPU platform. | " " | Optional |
 | max_count | Maximum number of nodes in the NodePool. Must be >= min_count | 100 | Optional |
+| max_pods_per_node | The maximum number of pods per node in this cluster | null | Optional |
+| max_surge | The number of additional nodes that can be added to the node pool during an upgrade. Increasing max_surge raises the number of nodes that can be upgraded simultaneously. Can be set to 0 or greater. | 1 | Optional |
+| max_unavailable | The number of nodes that can be simultaneously unavailable during an upgrade. Increasing max_unavailable raises the number of nodes that can be upgraded in parallel. Can be set to 0 or greater. | 0 | Optional |
 | min_count | Minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true | 1 | Optional |
 | name | The name of the node pool |  | Required |
 | node_count | The number of nodes in the nodepool when autoscaling is false. Otherwise defaults to 1. Only valid for non-autoscaling clusers |  | Required |
diff --git a/autogen/main/README.md b/autogen/main/README.md
@@ -211,11 +211,9 @@ The node_pools variable takes the following parameters:
 | machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
 | min_cpu_platform | Minimum CPU platform to be used by the nodes in the pool. The nodes may be scheduled on the specified or newer CPU platform. | " " | Optional |
 | max_count | Maximum number of nodes in the NodePool. Must be >= min_count | 100 | Optional |
-{% if beta_cluster %}
 | max_pods_per_node | The maximum number of pods per node in this cluster | null | Optional |
 | max_surge | The number of additional nodes that can be added to the node pool during an upgrade. Increasing max_surge raises the number of nodes that can be upgraded simultaneously. Can be set to 0 or greater. | 1 | Optional |
 | max_unavailable | The number of nodes that can be simultaneously unavailable during an upgrade. Increasing max_unavailable raises the number of nodes that can be upgraded in parallel. Can be set to 0 or greater. | 0 | Optional |
-{% endif %}
 | min_count | Minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true | 1 | Optional |
 | name | The name of the node pool |  | Required |
 {% if beta_cluster %}
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -610,12 +610,10 @@ resource "google_container_node_pool" "pools" {
     auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
   }
 
-  {% if beta_cluster %}
   upgrade_settings {
     max_surge       = lookup(each.value, "max_surge", 1)
     max_unavailable = lookup(each.value, "max_unavailable", 0)
   }
-  {% endif %}
 
   node_config {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
diff --git a/cluster.tf b/cluster.tf
@@ -303,6 +303,10 @@ resource "google_container_node_pool" "pools" {
     auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
   }
 
+  upgrade_settings {
+    max_surge       = lookup(each.value, "max_surge", 1)
+    max_unavailable = lookup(each.value, "max_unavailable", 0)
+  }
 
   node_config {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
diff --git a/modules/private-cluster-update-variant/README.md b/modules/private-cluster-update-variant/README.md
@@ -285,6 +285,9 @@ The node_pools variable takes the following parameters:
 | machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
 | min_cpu_platform | Minimum CPU platform to be used by the nodes in the pool. The nodes may be scheduled on the specified or newer CPU platform. | " " | Optional |
 | max_count | Maximum number of nodes in the NodePool. Must be >= min_count | 100 | Optional |
+| max_pods_per_node | The maximum number of pods per node in this cluster | null | Optional |
+| max_surge | The number of additional nodes that can be added to the node pool during an upgrade. Increasing max_surge raises the number of nodes that can be upgraded simultaneously. Can be set to 0 or greater. | 1 | Optional |
+| max_unavailable | The number of nodes that can be simultaneously unavailable during an upgrade. Increasing max_unavailable raises the number of nodes that can be upgraded in parallel. Can be set to 0 or greater. | 0 | Optional |
 | min_count | Minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true | 1 | Optional |
 | name | The name of the node pool |  | Required |
 | node_count | The number of nodes in the nodepool when autoscaling is false. Otherwise defaults to 1. Only valid for non-autoscaling clusers |  | Required |
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -407,6 +407,10 @@ resource "google_container_node_pool" "pools" {
     auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
   }
 
+  upgrade_settings {
+    max_surge       = lookup(each.value, "max_surge", 1)
+    max_unavailable = lookup(each.value, "max_unavailable", 0)
+  }
 
   node_config {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")
diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md
@@ -263,6 +263,9 @@ The node_pools variable takes the following parameters:
 | machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
 | min_cpu_platform | Minimum CPU platform to be used by the nodes in the pool. The nodes may be scheduled on the specified or newer CPU platform. | " " | Optional |
 | max_count | Maximum number of nodes in the NodePool. Must be >= min_count | 100 | Optional |
+| max_pods_per_node | The maximum number of pods per node in this cluster | null | Optional |
+| max_surge | The number of additional nodes that can be added to the node pool during an upgrade. Increasing max_surge raises the number of nodes that can be upgraded simultaneously. Can be set to 0 or greater. | 1 | Optional |
+| max_unavailable | The number of nodes that can be simultaneously unavailable during an upgrade. Increasing max_unavailable raises the number of nodes that can be upgraded in parallel. Can be set to 0 or greater. | 0 | Optional |
 | min_count | Minimum number of nodes in the NodePool. Must be >=0 and <= max_count. Should be used when autoscaling is true | 1 | Optional |
 | name | The name of the node pool |  | Required |
 | node_count | The number of nodes in the nodepool when autoscaling is false. Otherwise defaults to 1. Only valid for non-autoscaling clusers |  | Required |
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -316,6 +316,10 @@ resource "google_container_node_pool" "pools" {
     auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
   }
 
+  upgrade_settings {
+    max_surge       = lookup(each.value, "max_surge", 1)
+    max_unavailable = lookup(each.value, "max_unavailable", 0)
+  }
 
   node_config {
     image_type       = lookup(each.value, "image_type", "COS_CONTAINERD")

Original file line number	Diff line number	Diff line change
`@@ -610,12 +610,10 @@ resource "google_container_node_pool" "pools" {`
`610`	`610`	`auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)`
`611`	`611`	`}`
`612`	`612`
`613`		`- {% if beta_cluster %}`
`614`	`613`	`upgrade_settings {`
`615`	`614`	`max_surge = lookup(each.value, "max_surge", 1)`
`616`	`615`	`max_unavailable = lookup(each.value, "max_unavailable", 0)`
`617`	`616`	`}`
`618`		`- {% endif %}`
`619`	`617`
`620`	`618`	`node_config {`
`621`	`619`	`image_type = lookup(each.value, "image_type", "COS_CONTAINERD")`
Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,10 @@ resource "google_container_node_pool" "pools" {`
`303`	`303`	`auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)`
`304`	`304`	`}`
`305`	`305`
	`306`	`+ upgrade_settings {`
	`307`	`+ max_surge = lookup(each.value, "max_surge", 1)`
	`308`	`+ max_unavailable = lookup(each.value, "max_unavailable", 0)`
	`309`	`+ }`
`306`	`310`
`307`	`311`	`node_config {`
`308`	`312`	`image_type = lookup(each.value, "image_type", "COS_CONTAINERD")`
Original file line number	Diff line number	Diff line change
`@@ -407,6 +407,10 @@ resource "google_container_node_pool" "pools" {`
`407`	`407`	`auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)`
`408`	`408`	`}`
`409`	`409`
	`410`	`+ upgrade_settings {`
	`411`	`+ max_surge = lookup(each.value, "max_surge", 1)`
	`412`	`+ max_unavailable = lookup(each.value, "max_unavailable", 0)`
	`413`	`+ }`
`410`	`414`
`411`	`415`	`node_config {`
`412`	`416`	`image_type = lookup(each.value, "image_type", "COS_CONTAINERD")`
Original file line number	Diff line number	Diff line change
`@@ -316,6 +316,10 @@ resource "google_container_node_pool" "pools" {`
`316`	`316`	`auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)`
`317`	`317`	`}`
`318`	`318`
	`319`	`+ upgrade_settings {`
	`320`	`+ max_surge = lookup(each.value, "max_surge", 1)`
	`321`	`+ max_unavailable = lookup(each.value, "max_unavailable", 0)`
	`322`	`+ }`
`319`	`323`
`320`	`324`	`node_config {`
`321`	`325`	`image_type = lookup(each.value, "image_type", "COS_CONTAINERD")`