feat: add missing dns_cache output in non beta (terraform-google-modules#1864)

Signed-off-by: drfaust92 <ilia.lazebnik@gmail.com>

Author: DrFaust92

README.md

@@ -50,6 +50,7 @@ module "gke" {
  network_policy = false
  horizontal_pod_autoscaling = true
  filestore_csi_driver = false
+ dns_cache = false
 
  node_pools = [
  {
@@ -242,6 +243,7 @@ Then perform the following commands on the root folder:
 |------|-------------|
 | ca\_certificate | Cluster ca certificate (base64 encoded) |
 | cluster\_id | Cluster ID |
+| dns\_cache\_enabled | Whether DNS Cache enabled |
 | endpoint | Cluster endpoint |
 | fleet\_membership | Fleet membership (if registered) |
 | gateway\_api\_channel | The gateway api channel of this cluster. |

autogen/main/README.md

@@ -90,8 +90,8 @@ module "gke" {
  {% if beta_cluster and autopilot_cluster != true %}
  istio = true
  cloudrun = true
- dns_cache = false
  {% endif %}
+ dns_cache = false
 
 {% if autopilot_cluster != true %}
  node_pools = [

autogen/main/main.tf.tmpl

@@ -232,7 +232,6 @@ locals {
 {% if beta_cluster %}
  # BETA features
  cluster_istio_enabled = ! local.cluster_output_istio_disabled
- cluster_dns_cache_enabled = var.dns_cache
  {% if autopilot_cluster != true %}
  cluster_telemetry_type_is_set = var.cluster_telemetry_type != null
  {% endif %}
@@ -242,6 +241,7 @@ locals {
  # /BETA features
 {% endif %}
 
+ cluster_dns_cache_enabled = var.dns_cache
  cluster_maintenance_window_is_recurring = var.maintenance_recurrence != "" && var.maintenance_end_time != "" ? [1] : []
  cluster_maintenance_window_is_daily = length(local.cluster_maintenance_window_is_recurring) > 0 ? [] : [1]
 }

autogen/main/outputs.tf.tmpl

@@ -198,6 +198,11 @@ output "peering_name" {
  value = local.cluster_peering_name
 }
 {% endif %}
+
+output "dns_cache_enabled" {
+ description = "Whether DNS Cache enabled"
+ value = local.cluster_dns_cache_enabled
+}
 {% if beta_cluster %}
 
 output "cloudrun_enabled" {
@@ -214,11 +219,6 @@ output "istio_enabled" {
  value = local.cluster_istio_enabled
 }
 
-output "dns_cache_enabled" {
- description = "Whether DNS Cache enabled"
- value = local.cluster_dns_cache_enabled
-}
-
 output "pod_security_policy_enabled" {
  description = "Whether pod security policy is enabled"
  value = local.cluster_pod_security_policy_enabled

main.tf

@@ -171,6 +171,7 @@ locals {
  }] : []
 
 
+ cluster_dns_cache_enabled = var.dns_cache
  cluster_maintenance_window_is_recurring = var.maintenance_recurrence != "" && var.maintenance_end_time != "" ? [1] : []
  cluster_maintenance_window_is_daily = length(local.cluster_maintenance_window_is_recurring) > 0 ? [] : [1]
 }

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

@@ -54,6 +54,7 @@ module "gke" {
  enable_private_endpoint = true
  enable_private_nodes = true
  master_ipv4_cidr_block = "10.0.0.0/28"
+ dns_cache = false
 
 }
 ```

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

@@ -127,12 +127,12 @@ locals {
 
  # BETA features
  cluster_istio_enabled = !local.cluster_output_istio_disabled
- cluster_dns_cache_enabled = var.dns_cache
  cluster_pod_security_policy_enabled = local.cluster_output_pod_security_policy_enabled
  cluster_intranode_visibility_enabled = local.cluster_output_intranode_visbility_enabled
 
  # /BETA features
 
+ cluster_dns_cache_enabled = var.dns_cache
  cluster_maintenance_window_is_recurring = var.maintenance_recurrence != "" && var.maintenance_end_time != "" ? [1] : []
  cluster_maintenance_window_is_daily = length(local.cluster_maintenance_window_is_recurring) > 0 ? [] : [1]
 }

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

@@ -159,6 +159,11 @@ output "peering_name" {
  value = local.cluster_peering_name
 }
 
+output "dns_cache_enabled" {
+ description = "Whether DNS Cache enabled"
+ value = local.cluster_dns_cache_enabled
+}
+
 output "cloudrun_enabled" {
  description = "Whether CloudRun enabled"
  value = false
@@ -169,11 +174,6 @@ output "istio_enabled" {
  value = local.cluster_istio_enabled
 }
 
-output "dns_cache_enabled" {
- description = "Whether DNS Cache enabled"
- value = local.cluster_dns_cache_enabled
-}
-
 output "pod_security_policy_enabled" {
  description = "Whether pod security policy is enabled"
  value = local.cluster_pod_security_policy_enabled

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

@@ -48,6 +48,7 @@ module "gke" {
  ip_range_services = "us-central1-01-gke-01-services"
  horizontal_pod_autoscaling = true
  filestore_csi_driver = false
+ dns_cache = false
 
 }
 ```

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

@@ -126,12 +126,12 @@ locals {
 
  # BETA features
  cluster_istio_enabled = !local.cluster_output_istio_disabled
- cluster_dns_cache_enabled = var.dns_cache
  cluster_pod_security_policy_enabled = local.cluster_output_pod_security_policy_enabled
  cluster_intranode_visibility_enabled = local.cluster_output_intranode_visbility_enabled
 
  # /BETA features
 
+ cluster_dns_cache_enabled = var.dns_cache
  cluster_maintenance_window_is_recurring = var.maintenance_recurrence != "" && var.maintenance_end_time != "" ? [1] : []
  cluster_maintenance_window_is_daily = length(local.cluster_maintenance_window_is_recurring) > 0 ? [] : [1]
 }