fix: support custom service account for autopilot (#1550)

terraform-google-modules · Jan 31, 2023 · 52e25ab · 52e25ab
1 parent d59542c
commit 52e25ab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -162,7 +162,7 @@ resource "google_container_cluster" "primary" {
   {% if autopilot_cluster == true %}
   cluster_autoscaling {
     dynamic "auto_provisioning_defaults" {
-      for_each = var.create_service_account ? [1] : []
+      for_each = (var.create_service_account || var.service_account != "") ? [1] : []
 
       content {
         service_account = local.service_account

diff --git a/modules/beta-autopilot-private-cluster/cluster.tf b/modules/beta-autopilot-private-cluster/cluster.tf
@@ -71,7 +71,7 @@ resource "google_container_cluster" "primary" {
 
   cluster_autoscaling {
     dynamic "auto_provisioning_defaults" {
-      for_each = var.create_service_account ? [1] : []
+      for_each = (var.create_service_account || var.service_account != "") ? [1] : []
 
       content {
         service_account = local.service_account

diff --git a/modules/beta-autopilot-public-cluster/cluster.tf b/modules/beta-autopilot-public-cluster/cluster.tf
@@ -71,7 +71,7 @@ resource "google_container_cluster" "primary" {
 
   cluster_autoscaling {
     dynamic "auto_provisioning_defaults" {
-      for_each = var.create_service_account ? [1] : []
+      for_each = (var.create_service_account || var.service_account != "") ? [1] : []
 
       content {
         service_account = local.service_account