Merge pull request #45 from gruntwork-io/yori-fix-regression

Fix regression from v0.6.0: kubergrunt expects base64 encoded data
gruntwork-io · Oct 23, 2019 · 3ff147f · 3ff147f
2 parents d99ec1c + 21064e9
commit 3ff147f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/k8s-tiller/main.tf b/modules/k8s-tiller/main.tf
@@ -282,7 +282,7 @@ resource "null_resource" "tiller_tls_ca_certs" {
     # Use environment variables for Kubernetes credentials to avoid leaking into the logs
     environment = {
       KUBECTL_SERVER_ENDPOINT = var.kubectl_server_endpoint
-      KUBECTL_CA_DATA         = base64decode(var.kubectl_ca_b64_data)
+      KUBECTL_CA_DATA         = var.kubectl_ca_b64_data
       KUBECTL_TOKEN           = var.kubectl_token
     }
   }
@@ -336,7 +336,7 @@ resource "null_resource" "tiller_tls_certs" {
     # Use environment variables for Kubernetes credentials to avoid leaking into the logs
     environment = {
       KUBECTL_SERVER_ENDPOINT = var.kubectl_server_endpoint
-      KUBECTL_CA_DATA         = base64decode(var.kubectl_ca_b64_data)
+      KUBECTL_CA_DATA         = var.kubectl_ca_b64_data
       KUBECTL_TOKEN           = var.kubectl_token
     }
   }