Merge pull request #273 from kbst/fix-gke-db-encryption

Fix GKE db encryption default to null not false
kbst · Mar 1, 2022 · 07e2b8d · 07e2b8d
2 parents feb1f71 + 6e436f0
commit 07e2b8d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/google/_modules/gke/cluster.tf b/google/_modules/gke/cluster.tf
@@ -28,7 +28,7 @@ resource "google_container_cluster" "current" {
   dynamic "database_encryption" {
     for_each = var.cluster_database_encryption_key_name != null ? toset([1]) : toset([])
     content {
-      state = "ENCRYPTED"
+      state    = "ENCRYPTED"
       key_name = var.cluster_database_encryption_key_name
     }
   }

diff --git a/google/cluster/configuration.tf b/google/cluster/configuration.tf
@@ -57,10 +57,10 @@ locals {
   enable_private_nodes = lookup(local.cfg, "enable_private_nodes", true)
   master_cidr_block    = lookup(local.cfg, "master_cidr_block", "172.16.0.32/28")
 
-  cluster_ipv4_cidr_block = lookup(local.cfg, "cluster_ipv4_cidr_block", null)
+  cluster_ipv4_cidr_block  = lookup(local.cfg, "cluster_ipv4_cidr_block", null)
   services_ipv4_cidr_block = lookup(local.cfg, "services_ipv4_cidr_block", null)
 
-  cluster_database_encryption_key_name = lookup(local.cfg, "cluster_database_encryption_key_name", false)
+  cluster_database_encryption_key_name = lookup(local.cfg, "cluster_database_encryption_key_name", null)
 
   # by default include cloud_nat when private nodes are enabled
   enable_cloud_nat                       = lookup(local.cfg, "enable_cloud_nat", local.enable_private_nodes)
@@ -75,6 +75,6 @@ locals {
   master_authorized_networks_config_cidr_blocks_lookup = lookup(local.cfg, "master_authorized_networks_config_cidr_blocks", null)
   master_authorized_networks_config_cidr_blocks        = local.master_authorized_networks_config_cidr_blocks_lookup == null ? null : split(",", local.master_authorized_networks_config_cidr_blocks_lookup)
 
-  enable_intranode_visibility = lookup(local.cfg, "enable_intranode_visibility", false )
+  enable_intranode_visibility = lookup(local.cfg, "enable_intranode_visibility", false)
   enable_tpu                  = lookup(local.cfg, "enable_tpu", false)
 }