Merge pull request #1021 from kinvolk/invidian/fix-assets

bootkube: feed output using local rather than local_file content
kinvolk · Oct 1, 2020 · 1ae5de9 · 1ae5de9
2 parents 2d55a8b + fff55e9
commit 1ae5de9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/assets/terraform-modules/bootkube/assets.tf b/assets/terraform-modules/bootkube/assets.tf
@@ -85,12 +85,8 @@ resource "local_file" "kubernetes" {
   })
 }
 
-# Populate bootstrap-secrets chart values file named bootstrap-secrets.yaml.
-resource "local_file" "bootstrap-secrets" {
-  count = var.enable_tls_bootstrap == true ? 1 : 0
-
-  filename = "${var.asset_dir}/charts/kube-system/bootstrap-secrets.yaml"
-  content = templatefile("${path.module}/resources/charts/bootstrap-secrets.yaml", {
+locals {
+  bootstrap_secrets = templatefile("${path.module}/resources/charts/bootstrap-secrets.yaml", {
     bootstrap_tokens = [
       for token in var.bootstrap_tokens :
       {
@@ -101,6 +97,14 @@ resource "local_file" "bootstrap-secrets" {
   })
 }
 
+# Populate bootstrap-secrets chart values file named bootstrap-secrets.yaml.
+resource "local_file" "bootstrap-secrets" {
+  count = var.enable_tls_bootstrap == true ? 1 : 0
+
+  filename = "${var.asset_dir}/charts/kube-system/bootstrap-secrets.yaml"
+  content  = local.bootstrap_secrets
+}
+
 locals {
   kubelet = var.disable_self_hosted_kubelet == false ? 1 : 0
 }

diff --git a/assets/terraform-modules/bootkube/outputs.tf b/assets/terraform-modules/bootkube/outputs.tf
@@ -92,5 +92,5 @@ output "lokomotive_values" {
 }
 
 output "bootstrap-secrets_values" {
-  value = var.enable_tls_bootstrap ? local_file.bootstrap-secrets[0].content : ""
+  value = var.enable_tls_bootstrap ? local.bootstrap_secrets : ""
 }