feat!: Promote node sysctl config to GA (#1536)

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Andrew Peabody <andrewpeabody@google.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bharath KKB <bharathkrishnakb@gmail.com>

Author: 5 people

README.md

@@ -188,6 +188,7 @@ Then perform the following commands on the root folder:
 | node\_metadata | Specifies how node metadata is exposed to the workload running on the node | `string` | `"GKE_METADATA"` | no |
 | node\_pools | List of maps containing node pools | `list(map(any))` | <pre>[<br> {<br> "name": "default-node-pool"<br> }<br>]</pre> | no |
 | node\_pools\_labels | Map of maps containing node labels by node-pool name | `map(map(string))` | <pre>{<br> "all": {},<br> "default-node-pool": {}<br>}</pre> | no |
+| node\_pools\_linux\_node\_configs\_sysctls | Map of maps containing linux node config sysctls by node-pool name | `map(map(string))` | <pre>{<br> "all": {},<br> "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_metadata | Map of maps containing node metadata by node-pool name | `map(map(string))` | <pre>{<br> "all": {},<br> "default-node-pool": {}<br>}</pre> | no |
 | node\_pools\_oauth\_scopes | Map of lists containing node oauth scopes by node-pool name | `map(list(string))` | <pre>{<br> "all": [<br> "https://www.googleapis.com/auth/cloud-platform"<br> ],<br> "default-node-pool": []<br>}</pre> | no |
 | node\_pools\_resource\_labels | Map of maps containing resource labels by node-pool name | `map(map(string))` | <pre>{<br> "all": {},<br> "default-node-pool": {}<br>}</pre> | no |
@@ -310,7 +311,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
 - [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x
 #### Terraform and Plugins
 - [Terraform](https://www.terraform.io/downloads.html) 0.13+
-- [Terraform Provider for GCP][terraform-provider-google] v4.47
+- [Terraform Provider for GCP][terraform-provider-google] v4.51
 #### gcloud
 Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.
 See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.

autogen/main/README.md

@@ -256,9 +256,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
 #### Terraform and Plugins
 - [Terraform](https://www.terraform.io/downloads.html) 0.13+
 {% if beta_cluster %}
-- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v4.47
+- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v4.51
 {% else %}
-- [Terraform Provider for GCP][terraform-provider-google] v4.47
+- [Terraform Provider for GCP][terraform-provider-google] v4.51
 {% endif %}
 #### gcloud
 Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.

autogen/main/cluster.tf.tmpl

@@ -803,6 +803,7 @@ resource "google_container_node_pool" "windows_pools" {
  cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
  }
  }
+ {% endif %}
 
  {% if i == 0 %}
  dynamic "linux_node_config" {
@@ -819,7 +820,6 @@ resource "google_container_node_pool" "windows_pools" {
  }
  }
  {% endif %}
- {% endif %}
 
  boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")
 

autogen/main/variables.tf.tmpl

@@ -191,7 +191,6 @@ variable "node_pools_metadata" {
  default-node-pool = {}
  }
 }
-{% if beta_cluster %}
 
 variable "node_pools_linux_node_configs_sysctls" {
  type = map(map(string))
@@ -204,7 +203,6 @@ variable "node_pools_linux_node_configs_sysctls" {
  }
 }
 {% endif %}
-{% endif %}
 
 variable "enable_cost_allocation" {
  type = bool

autogen/main/variables_defaults.tf.tmpl

@@ -104,7 +104,6 @@ locals {
  ),
  var.node_pools_oauth_scopes
  )
- {% if beta_cluster %}
 
  node_pools_linux_node_configs_sysctls = merge(
  { all = {} },
@@ -115,6 +114,5 @@ locals {
  ),
  var.node_pools_linux_node_configs_sysctls
  )
- {% endif %}
 }
 {% endif %}

autogen/main/versions.tf.tmpl

@@ -24,7 +24,7 @@ terraform {
  required_providers {
  google-beta = {
  source = "hashicorp/google-beta"
- version = ">= 4.47.0, < 5.0"
+ version = ">= 4.51.0, < 5.0"
  }
  kubernetes = {
  source = "hashicorp/kubernetes"
@@ -38,7 +38,7 @@ terraform {
  required_providers {
  google = {
  source = "hashicorp/google"
- version = ">= 4.47.0, < 5.0"
+ version = ">= 4.51.0, < 5.0"
  }
  kubernetes = {
  source = "hashicorp/kubernetes"

cluster.tf

@@ -499,6 +499,20 @@ resource "google_container_node_pool" "pools" {
  }
 
 
+ dynamic "linux_node_config" {
+ for_each = length(merge(
+ local.node_pools_linux_node_configs_sysctls["all"],
+ local.node_pools_linux_node_configs_sysctls[each.value["name"]]
+ )) != 0 ? [1] : []
+
+ content {
+ sysctls = merge(
+ local.node_pools_linux_node_configs_sysctls["all"],
+ local.node_pools_linux_node_configs_sysctls[each.value["name"]]
+ )
+ }
+ }
+
  boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")
 
  shielded_instance_config {
@@ -657,6 +671,7 @@ resource "google_container_node_pool" "windows_pools" {
  }
 
 
+
  boot_disk_kms_key = lookup(each.value, "boot_disk_kms_key", "")
 
  shielded_instance_config {

modules/beta-autopilot-private-cluster/README.md

@@ -187,7 +187,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
 - [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x
 #### Terraform and Plugins
 - [Terraform](https://www.terraform.io/downloads.html) 0.13+
-- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v4.47
+- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v4.51
 #### gcloud
 Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.
 See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.

modules/beta-autopilot-private-cluster/versions.tf

@@ -21,7 +21,7 @@ terraform {
  required_providers {
  google-beta = {
  source = "hashicorp/google-beta"
- version = ">= 4.47.0, < 5.0"
+ version = ">= 4.51.0, < 5.0"
  }
  kubernetes = {
  source = "hashicorp/kubernetes"

modules/beta-autopilot-public-cluster/README.md

@@ -174,7 +174,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
 - [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x
 #### Terraform and Plugins
 - [Terraform](https://www.terraform.io/downloads.html) 0.13+
-- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v4.47
+- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v4.51
 #### gcloud
 Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.
 See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.