Merge pull request #32 from gruntwork-io/yori-fix-basic-tiller

Forgot environment variables
gruntwork-io · May 6, 2019 · d4d2c46 · d4d2c46
2 parents 08b878b + a1651f5
commit d4d2c46
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/examples/gke-basic-tiller/main.tf b/examples/gke-basic-tiller/main.tf
@@ -307,6 +307,13 @@ module "tiller" {
 resource "null_resource" "wait_for_tiller" {
   provisioner "local-exec" {
     command = "kubergrunt helm wait-for-tiller --tiller-namespace ${local.tiller_namespace} --tiller-deployment-name ${module.tiller.deployment_name} --expected-tiller-version ${local.tiller_version} ${local.kubectl_auth_config}"
+
+    # Use environment variables for Kubernetes credentials to avoid leaking into the logs
+    environment = {
+      KUBECTL_SERVER_ENDPOINT = "${data.template_file.gke_host_endpoint.rendered}"
+      KUBECTL_CA_DATA         = "${base64encode(data.template_file.cluster_ca_certificate.rendered)}"
+      KUBECTL_TOKEN           = "${data.template_file.access_token.rendered}"
+    }
   }
 }
 

diff --git a/examples/gke-private-tiller/main.tf b/examples/gke-private-tiller/main.tf
@@ -324,6 +324,13 @@ module "tiller" {
 resource "null_resource" "wait_for_tiller" {
   provisioner "local-exec" {
     command = "kubergrunt helm wait-for-tiller --tiller-namespace ${local.tiller_namespace} --tiller-deployment-name ${module.tiller.deployment_name} --expected-tiller-version ${local.tiller_version} ${local.kubectl_auth_config}"
+
+    # Use environment variables for Kubernetes credentials to avoid leaking into the logs
+    environment = {
+      KUBECTL_SERVER_ENDPOINT = "${data.template_file.gke_host_endpoint.rendered}"
+      KUBECTL_CA_DATA         = "${base64encode(data.template_file.cluster_ca_certificate.rendered)}"
+      KUBECTL_TOKEN           = "${data.template_file.access_token.rendered}"
+    }
   }
 }