generate doc and modules

terraform-google-modules · Aug 17, 2019 · a9794ef · a9794ef
1 parent a148b81
commit a9794ef
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -169,14 +169,11 @@ resource "google_container_cluster" "primary" {
     }
   }
 
-  workload_identity_config {
+  dynamic "workload_identity_config" {
+    for_each = list(var.identity_namespace)
 
-    dynamic "workload_identity_config" {
-      for_each = var.identity_namespace
-
-      content {
-        identity_namespace = workload_identity_config
-      }
+    content {
+      identity_namespace = local.cluster_workload_identity_config.identity_namespace
     }
   }
 }

diff --git a/modules/beta-private-cluster/main.tf b/modules/beta-private-cluster/main.tf
@@ -123,6 +123,9 @@ locals {
   cluster_pod_security_policy_enabled      = local.cluster_output_pod_security_policy_enabled
   cluster_intranode_visibility_enabled     = local.cluster_output_intranode_visbility_enabled
   cluster_vertical_pod_autoscaling_enabled = local.cluster_output_vertical_pod_autoscaling_enabled
+  cluster_workload_identity_config = {
+    identity_namespace = var.identity_namespace
+  }
   # /BETA features
 }
 

diff --git a/modules/beta-private-cluster/variables.tf b/modules/beta-private-cluster/variables.tf
@@ -376,8 +376,8 @@ variable "enable_vertical_pod_autoscaling" {
 
 variable "identity_namespace" {
   description = "Workload Identity namespace"
-  type        = list(string)
-  default     = []
+  type        = string
+  default     = ""
 }
 
 
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -164,14 +164,11 @@ resource "google_container_cluster" "primary" {
     }
   }
 
-  workload_identity_config {
+  dynamic "workload_identity_config" {
+    for_each = list(var.identity_namespace)
 
-    dynamic "workload_identity_config" {
-      for_each = var.identity_namespace
-
-      content {
-        identity_namespace = workload_identity_config
-      }
+    content {
+      identity_namespace = local.cluster_workload_identity_config.identity_namespace
     }
   }
 }

diff --git a/modules/beta-public-cluster/main.tf b/modules/beta-public-cluster/main.tf
@@ -123,6 +123,9 @@ locals {
   cluster_pod_security_policy_enabled      = local.cluster_output_pod_security_policy_enabled
   cluster_intranode_visibility_enabled     = local.cluster_output_intranode_visbility_enabled
   cluster_vertical_pod_autoscaling_enabled = local.cluster_output_vertical_pod_autoscaling_enabled
+  cluster_workload_identity_config = {
+    identity_namespace = var.identity_namespace
+  }
   # /BETA features
 }
 

diff --git a/modules/beta-public-cluster/variables.tf b/modules/beta-public-cluster/variables.tf
@@ -352,8 +352,8 @@ variable "enable_vertical_pod_autoscaling" {
 
 variable "identity_namespace" {
   description = "Workload Identity namespace"
-  type        = list(string)
-  default     = []
+  type        = string
+  default     = ""
 }