fix(terraform): logic to handle empty list

particuleio · Jan 16, 2019 · ab4d92a · ab4d92a
1 parent 334fd5c
commit ab4d92a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 30 deletions.
diff --git a/terraform/modules/eks-addons/kiam.tf b/terraform/modules/eks-addons/kiam.tf
@@ -2,9 +2,9 @@ locals {
   values_kiam = <<VALUES
 agent:
   tlsFiles:
-    key: ${base64encode(tls_private_key.kiam_agent_key.private_key_pem)}
-    cert: ${base64encode(tls_locally_signed_cert.kiam_agent_crt.cert_pem)}
-    ca: ${base64encode(tls_self_signed_cert.kiam_ca_crt.cert_pem)}
+    key: ${base64encode(join(",", tls_private_key.kiam_agent_key.*.private_key_pem))}
+    cert: ${base64encode(join(",", tls_locally_signed_cert.kiam_agent_crt.*.cert_pem))}
+    ca: ${base64encode(join(",", tls_self_signed_cert.kiam_ca_crt.*.cert_pem))}
   image:
     tag: ${var.kiam["version"]}
   host:
@@ -19,9 +19,9 @@ server:
   probes:
     serverAddress: "127.0.0.1"
   tlsFiles:
-    key: ${base64encode(tls_private_key.kiam_server_key.private_key_pem)}
-    cert: ${base64encode(tls_locally_signed_cert.kiam_server_crt.cert_pem)}
-    ca: ${base64encode(tls_self_signed_cert.kiam_ca_crt.cert_pem)}
+    key: ${base64encode(join(",", tls_private_key.kiam_server_key.*.private_key_pem))}
+    cert: ${base64encode(join(",", tls_locally_signed_cert.kiam_server_crt.*.cert_pem))}
+    ca: ${base64encode(join(",", tls_self_signed_cert.kiam_ca_crt.*.cert_pem))}
   image:
     tag: ${var.kiam["version"]}
   nodeSelector:
@@ -30,7 +30,7 @@ server:
     - operator: Exists
       effect: NoSchedule
       key: "node-role.kubernetes.io/controller"
-  assumeRoleArn: ${data.terraform_remote_state.eks.kiam-server-role-arn[0]}
+  assumeRoleArn: ${join(",",data.terraform_remote_state.eks.*.kiam-server-role-arn[0])}
   extraHostPathMounts:
     - name: ssl-certs
       mountPath: /etc/ssl/certs
@@ -40,11 +40,6 @@ VALUES
 }
 
 resource "helm_release" "kiam" {
-  depends_on = [
-    "kubernetes_service_account.tiller",
-    "kubernetes_cluster_role_binding.tiller",
-  ]
-
   count     = "${var.kiam["enabled"] ? 1 : 0 }"
   name      = "kiam"
   chart     = "stable/kiam"

diff --git a/terraform/modules/eks-addons/kube-prometheus.tf b/terraform/modules/eks-addons/kube-prometheus.tf
@@ -1,7 +1,7 @@
 locals {
   values_prometheus_operator = <<VALUES
 grafana:
-  adminPassword: ${random_string.grafana_password.result}
+  adminPassword: ${join(",", random_string.grafana_password.*.result)}
   persistence:
     enabled: true
     storageClassName: gp2
@@ -34,16 +34,12 @@ VALUES
 }
 
 resource "random_string" "grafana_password" {
+  count     = "${var.prometheus_operator["enabled"] ? 1 : 0 }"
   length  = 16
   special = false
 }
 
 resource "helm_release" "prometheus_operator" {
-  depends_on = [
-    "kubernetes_service_account.tiller",
-    "kubernetes_cluster_role_binding.tiller",
-  ]
-
   count     = "${var.prometheus_operator["enabled"] ? 1 : 0 }"
   name      = "prometheus-operator"
   chart     = "stable/prometheus-operator"
@@ -53,5 +49,5 @@ resource "helm_release" "prometheus_operator" {
 }
 
 output "grafana_password" {
-  value = "${random_string.grafana_password.result}"
+  value = "${random_string.grafana_password.*.result}"
 }
diff --git a/terraform/modules/eks-addons/metrics-server.tf b/terraform/modules/eks-addons/metrics-server.tf
@@ -9,11 +9,6 @@ VALUES
 }
 
 resource "helm_release" "metrics_server" {
-  depends_on = [
-    "kubernetes_service_account.tiller",
-    "kubernetes_cluster_role_binding.tiller",
-  ]
-
   count     = "${var.metrics_server["enabled"] ? 1 : 0 }"
   name      = "metrics-server"
   chart     = "stable/metrics-server"

diff --git a/terraform/modules/eks-addons/nginx-ingress.tf b/terraform/modules/eks-addons/nginx-ingress.tf
@@ -18,11 +18,6 @@ VALUES
 }
 
 resource "helm_release" "nginx_ingress" {
-  depends_on = [
-    "kubernetes_service_account.tiller",
-    "kubernetes_cluster_role_binding.tiller",
-  ]
-
   count     = "${var.nginx_ingress["enabled"] ? 1 : 0 }"
   name      = "nginx-ingress"
   chart     = "stable/nginx-ingress"

diff --git a/terraform/modules/eks-addons/virtual-kubelet.tf b/terraform/modules/eks-addons/virtual-kubelet.tf
@@ -72,7 +72,7 @@ resource "kubernetes_deployment" "virtual-kubelet" {
         }
 
         annotations {
-          "iam.amazonaws.com/role" = "${data.terraform_remote_state.eks.eks-virtual-kubelet-role-arn[0]}"
+          "iam.amazonaws.com/role" = "${join(",", data.terraform_remote_state.eks.*.eks-virtual-kubelet-role-arn[0])}"
         }
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,7 +72,7 @@ resource "kubernetes_deployment" "virtual-kubelet" { @@
             }
             annotations {
-              "iam.amazonaws.com/role" = "${data.terraform_remote_state.eks.eks-virtual-kubelet-role-arn[0]}"
+              "iam.amazonaws.com/role" = "${join(",", data.terraform_remote_state.eks.*.eks-virtual-kubelet-role-arn[0])}"
             }
           }
@@ Expand Down @@