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

yorinasub17 · web-flow · commit 3ff147f9ce1e · 2019-10-23T09:07:59.000-07:00
Fix regression from v0.6.0: kubergrunt expects base64 encoded data
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
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ resource "null_resource" "tiller_tls_ca_certs" {`
`282`	`282`	`# Use environment variables for Kubernetes credentials to avoid leaking into the logs`
`283`	`283`	`environment = {`
`284`	`284`	`KUBECTL_SERVER_ENDPOINT = var.kubectl_server_endpoint`
`285`		`- KUBECTL_CA_DATA = base64decode(var.kubectl_ca_b64_data)`
	`285`	`+ KUBECTL_CA_DATA = var.kubectl_ca_b64_data`
`286`	`286`	`KUBECTL_TOKEN = var.kubectl_token`
`287`	`287`	`}`
`288`	`288`	`}`
`@@ -336,7 +336,7 @@ resource "null_resource" "tiller_tls_certs" {`
`336`	`336`	`# Use environment variables for Kubernetes credentials to avoid leaking into the logs`
`337`	`337`	`environment = {`
`338`	`338`	`KUBECTL_SERVER_ENDPOINT = var.kubectl_server_endpoint`
`339`		`- KUBECTL_CA_DATA = base64decode(var.kubectl_ca_b64_data)`
	`339`	`+ KUBECTL_CA_DATA = var.kubectl_ca_b64_data`
`340`	`340`	`KUBECTL_TOKEN = var.kubectl_token`
`341`	`341`	`}`
`342`	`342`	`}`