helm provider fixes (#399)

fixes for helm provider - thanks @ajaymare

Author: shamusx

modules/addons/cert-manager/main.tf

@@ -1,5 +1,5 @@
 provider "helm" {
-  kubernetes {
+  kubernetes = {
     host                   = var.k8s_host
     cluster_ca_certificate = base64decode(var.k8s_cluster_ca_certificate)
     token                  = var.k8s_client_token
@@ -29,15 +29,16 @@ resource "helm_release" "cert_manager" {
   namespace        = "cert-manager"
   timeout          = 900
 
-  set {
-    name  = "installCRDs"
-    value = "true"
-  }
-  set {
-    name  = "featureGates"
-    value = "ExperimentalCertificateSigningRequestControllers=true"
-  }
-
+  set = [
+    {
+      name  = "installCRDs"
+      value = "true"
+    },
+    {
+      name  = "featureGates"
+      value = "ExperimentalCertificateSigningRequestControllers=true"
+    }
+  ]
 }
 
 resource "time_sleep" "wait_90_seconds" {

modules/addons/ratelimit/main.tf

@@ -1,5 +1,5 @@
 provider "helm" {
-  kubernetes {
+  kubernetes = {
     host                   = var.k8s_host
     cluster_ca_certificate = base64decode(var.k8s_cluster_ca_certificate)
     token                  = var.k8s_client_token
@@ -21,12 +21,14 @@ resource "helm_release" "redis" {
   namespace        = var.namespace
   timeout          = 900
 
-  set {
-    name  = "auth.password"
-    value = random_password.redis.result
-  }
-  set {
-    name  = "architecture"
-    value = "standalone"
-  }
+  set = [
+    {
+      name  = "auth.password"
+      value = random_password.redis.result
+    },
+    {
+      name  = "architecture"
+      value = "standalone"
+    }
+  ]
 }

modules/tsb/cp/main.tf

@@ -1,5 +1,5 @@
 provider "helm" {
-  kubernetes {
+  kubernetes ={
     host                   = var.k8s_host
     cluster_ca_certificate = base64decode(var.k8s_cluster_ca_certificate)
     token                  = var.k8s_client_token
@@ -97,19 +97,20 @@ resource "helm_release" "controlplane" {
     ratelimit_namespace          = var.ratelimit_namespace
   })]
 
-  set {
-    name  = "secrets.tsb.cacert"
-    value = var.tsb_cacert
-  }
-  set {
-    name  = "secrets.xcp.rootca"
-    value = var.tsb_cacert
-  }
-
-  set {
-    name  = "secrets.elasticsearch.cacert"
-    value = var.es_cacert
-  }
+  set = [
+    {
+      name  = "secrets.tsb.cacert"
+      value = var.tsb_cacert
+    },
+    {
+      name  = "secrets.xcp.rootca"
+      value = var.tsb_cacert
+    },
+    {
+      name  = "secrets.elasticsearch.cacert"
+      value = var.es_cacert
+    }
+  ]
   depends_on = [ kubernetes_namespace.istio-system ]
 }
 

modules/tsb/mp/main.tf

@@ -1,5 +1,5 @@
 provider "helm" {
-  kubernetes {
+  kubernetes = {
     host                   = var.k8s_host
     cluster_ca_certificate = base64decode(var.k8s_cluster_ca_certificate)
     token                  = var.k8s_client_token
@@ -83,23 +83,24 @@ resource "helm_release" "managementplane" {
     tsb_fqdn     = var.tsb_fqdn
     cloud        = can(regex("eks", var.k8s_host)) ? "aws" : "none"
   })]
-  set {
-    name  = "secrets.tsb.cert"
-    value = data.kubernetes_secret.tsb_server_cert.data["tls.crt"]
-  }
-  set {
-    name  = "secrets.tsb.key"
-    value = data.kubernetes_secret.tsb_server_cert.data["tls.key"]
-  }
-
-  set {
-    name  = "secrets.xcp.rootca"
-    value = data.kubernetes_secret.selfsigned_ca.data["tls.crt"]
-  }
-  set {
-    name  = "secrets.xcp.rootcakey"
-    value = data.kubernetes_secret.selfsigned_ca.data["tls.key"]
-  }
+  set = [
+    {
+      name  = "secrets.tsb.cert"
+      value = data.kubernetes_secret.tsb_server_cert.data["tls.crt"]
+    },
+    {
+      name  = "secrets.tsb.key"
+      value = data.kubernetes_secret.tsb_server_cert.data["tls.key"]
+    },
+    {
+      name  = "secrets.xcp.rootca"
+      value = data.kubernetes_secret.selfsigned_ca.data["tls.crt"]
+    },
+    {
+      name  = "secrets.xcp.rootcakey"
+      value = data.kubernetes_secret.selfsigned_ca.data["tls.key"]
+    }
+  ]
 }
 
 resource "time_sleep" "wait_240_seconds" {

tsb/mp/providers.tf

@@ -18,7 +18,7 @@ provider "kubernetes" {
 }
 
 provider "helm" {
-  kubernetes {
+  kubernetes = {
     host                   = data.terraform_remote_state.infra.outputs.host
     cluster_ca_certificate = base64decode(data.terraform_remote_state.infra.outputs.cluster_ca_certificate)
     token                  = data.terraform_remote_state.infra.outputs.token