feat!: promote notification config & dns to ga (terraform-google-modules#1327)

* feat: support notification config &dns in ga * feat: support notification config &dns in ga

Author: ericyz

README.md

@@ -146,6 +146,7 @@ Then perform the following commands on the root folder:
 | description | The description of the cluster | `string` | `""` | no |
 | disable\_default\_snat | Whether to disable the default SNAT to support the private use of public IP addresses | `bool` | `false` | no |
 | disable\_legacy\_metadata\_endpoints | Disable the /0.1/ and /v1beta1/ metadata server endpoints on the node. Changing this value will cause all node pools to be recreated. | `bool` | `true` | no |
+| dns\_cache | The status of the NodeLocal DNSCache addon. | `bool` | `false` | no |
 | enable\_binary\_authorization | Enable BinAuthZ Admission controller | `bool` | `false` | no |
 | enable\_network\_egress\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |
 | enable\_resource\_consumption\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | `bool` | `true` | no |
@@ -185,6 +186,7 @@ Then perform the following commands on the root folder:
 | node\_pools\_tags | Map of lists containing node network tags by node-pool name | `map(list(string))` | <pre>{<br> "all": [],<br> "default-node-pool": []<br>}</pre> | no |
 | node\_pools\_taints | Map of lists containing node taints by node-pool name | `map(list(object({ key = string, value = string, effect = string })))` | <pre>{<br> "all": [],<br> "default-node-pool": []<br>}</pre> | no |
 | non\_masquerade\_cidrs | List of strings in CIDR notation that specify the IP address ranges that do not use IP masquerading. | `list(string)` | <pre>[<br> "10.0.0.0/8",<br> "172.16.0.0/12",<br> "192.168.0.0/16"<br>]</pre> | no |
+| notification\_config\_topic | The desired Pub/Sub topic to which notifications will be sent by GKE. Format is projects/{project}/topics/{topic}. | `string` | `""` | no |
 | project\_id | The project ID to host the cluster in (required) | `string` | n/a | yes |
 | region | The region to host the cluster in (optional if zonal cluster / required if regional) | `string` | `null` | no |
 | regional | Whether is a regional cluster (zonal cluster if set false. WARNING: changing this after cluster creation is destructive!) | `bool` | `true` | no |

autogen/main/cluster.tf.tmpl

@@ -211,11 +211,16 @@ resource "google_container_cluster" "primary" {
  disabled = !var.horizontal_pod_autoscaling
  }
 
+
  {% if autopilot_cluster != true %}
  network_policy_config {
  disabled = !var.network_policy
  }
 
+ dns_cache_config {
+ enabled = var.dns_cache
+ }
+
  gcp_filestore_csi_driver_config {
  enabled = var.filestore_csi_driver
  }
@@ -235,10 +240,6 @@ resource "google_container_cluster" "primary" {
  }
  }
 
- dns_cache_config {
- enabled = var.dns_cache
- }
-
  dynamic "gce_persistent_disk_csi_driver_config" {
  for_each = local.cluster_gce_pd_csi_config
 
@@ -462,14 +463,12 @@ resource "google_container_cluster" "primary" {
  }
  }
 
- {% if beta_cluster %}
  notification_config {
  pubsub {
  enabled = var.notification_config_topic != "" ? true : false
  topic = var.notification_config_topic
  }
  }
- {% endif %}
 }
 {% if autopilot_cluster != true %}
 /******************************************

autogen/main/variables.tf.tmpl

@@ -401,18 +401,16 @@ variable "master_global_access_enabled" {
 }
 {% endif %}
 {% endif %}
-{% if beta_cluster %}
 
 variable "dns_cache" {
  type = bool
- description = "(Beta) The status of the NodeLocal DNSCache addon."
+ description = "The status of the NodeLocal DNSCache addon."
  {% if autopilot_cluster == true %}
  default = true
  {% else %}
  default = false
  {% endif %}
 }
-{% endif %}
 
 variable "authenticator_security_group" {
  type = string
@@ -482,13 +480,13 @@ variable "disable_default_snat" {
  default = false
 }
 
-{% if beta_cluster %}
 variable "notification_config_topic" {
  type = string
  description = "The desired Pub/Sub topic to which notifications will be sent by GKE. Format is projects/{project}/topics/{topic}."
  default = ""
 }
 
+{% if beta_cluster %}
 variable "enable_tpu" {
  type = bool
  description = "Enable Cloud TPU resources in the cluster. WARNING: changing this after cluster creation is destructive!"

cluster.tf

@@ -118,10 +118,15 @@ resource "google_container_cluster" "primary" {
  disabled = !var.horizontal_pod_autoscaling
  }
 
+
  network_policy_config {
  disabled = !var.network_policy
  }
 
+ dns_cache_config {
+ enabled = var.dns_cache
+ }
+
  gcp_filestore_csi_driver_config {
  enabled = var.filestore_csi_driver
  }
@@ -278,6 +283,12 @@ resource "google_container_cluster" "primary" {
  }
  }
 
+ notification_config {
+ pubsub {
+ enabled = var.notification_config_topic != "" ? true : false
+ topic = var.notification_config_topic
+ }
+ }
 }
 /******************************************
  Create Container Cluster node pools

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

@@ -82,7 +82,7 @@ Then perform the following commands on the root folder:
 | deploy\_using\_private\_endpoint | (Beta) A toggle for Terraform and kubectl to connect to the master's internal IP address during deployment. | `bool` | `false` | no |
 | description | The description of the cluster | `string` | `""` | no |
 | disable\_default\_snat | Whether to disable the default SNAT to support the private use of public IP addresses | `bool` | `false` | no |
-| dns\_cache | (Beta) The status of the NodeLocal DNSCache addon. | `bool` | `true` | no |
+| dns\_cache | The status of the NodeLocal DNSCache addon. | `bool` | `true` | no |
 | enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
 | enable\_network\_egress\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |
 | enable\_private\_endpoint | (Beta) Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |

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

@@ -97,6 +97,7 @@ resource "google_container_cluster" "primary" {
  disabled = !var.horizontal_pod_autoscaling
  }
 
+
  }
 
  datapath_provider = var.datapath_provider

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

@@ -291,7 +291,7 @@ variable "master_global_access_enabled" {
 
 variable "dns_cache" {
  type = bool
- description = "(Beta) The status of the NodeLocal DNSCache addon."
+ description = "The status of the NodeLocal DNSCache addon."
  default = true
 }
 

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

@@ -75,7 +75,7 @@ Then perform the following commands on the root folder:
 | datapath\_provider | The desired datapath provider for this cluster. By default, `DATAPATH_PROVIDER_UNSPECIFIED` enables the IPTables-based kube-proxy implementation. `ADVANCED_DATAPATH` enables Dataplane-V2 feature. | `string` | `"DATAPATH_PROVIDER_UNSPECIFIED"` | no |
 | description | The description of the cluster | `string` | `""` | no |
 | disable\_default\_snat | Whether to disable the default SNAT to support the private use of public IP addresses | `bool` | `false` | no |
-| dns\_cache | (Beta) The status of the NodeLocal DNSCache addon. | `bool` | `true` | no |
+| dns\_cache | The status of the NodeLocal DNSCache addon. | `bool` | `true` | no |
 | enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
 | enable\_network\_egress\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |
 | enable\_resource\_consumption\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | `bool` | `true` | no |

modules/beta-autopilot-public-cluster/cluster.tf

@@ -97,6 +97,7 @@ resource "google_container_cluster" "primary" {
  disabled = !var.horizontal_pod_autoscaling
  }
 
+
  }
 
  datapath_provider = var.datapath_provider

modules/beta-autopilot-public-cluster/variables.tf

@@ -260,7 +260,7 @@ variable "skip_provisioners" {
 
 variable "dns_cache" {
  type = bool
- description = "(Beta) The status of the NodeLocal DNSCache addon."
+ description = "The status of the NodeLocal DNSCache addon."
  default = true
 }