From 92937f0081fb296eef0e6644bd3fd8241e51ea79 Mon Sep 17 00:00:00 2001
From: phaer <hello@phaer.org>
Date: Fri, 11 Feb 2022 22:47:57 +0100
Subject: [PATCH] cleanup first control plane provisioning...

* move yaml to subdirectory of /tmp
* reformat loop waiting for /readyz endpoint
* add logging message
* split provisioner because sensitive var.hcloud_token prohibits
  log output
---
 master.tf                        | 27 ++++++++++++++++++---------
 templates/kustomization.yaml.tpl |  1 +
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/master.tf b/master.tf
index b75b6c9..59c2d71 100644
--- a/master.tf
+++ b/master.tf
@@ -70,13 +70,13 @@ resource "hcloud_server" "first_control_plane" {
   # Upload kustomization.yaml, containing Hetzner CSI & CSM, as well as kured.
   provisioner "file" {
     content     = local.post_install_kustomization
-    destination = "/tmp/kustomization.yaml"
+    destination = "/tmp/post_install/kustomization.yaml"
   }
 
   # Upload traefik config
   provisioner "file" {
     content     = local.traefik_config
-    destination = "/tmp/traefik.yaml"
+    destination = "/tmp/post_install/traefik.yaml"
   }
 
   # Run the first control plane
@@ -95,15 +95,24 @@ resource "hcloud_server" "first_control_plane" {
           echo "Initiating the cluster..."
           sleep 2
         done
+        timeout 120 bash <<EOF
+          while [[ "$(curl -s -o /dev/null -w ''%%{http_code}'' curl -k https://localhost:6443/readyz)" != "200" ]]
+          do
+            echo "Waiting for cluster to become ready"
+            sleep 1
+          done
+        EOF
       EOT
-      , <<-EOT
-         timeout 120 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%%{http_code}'' curl -k https://localhost:6443/readyz)" != "200" ]]; do sleep 1; done'
-      EOT
-      , "kubectl -n kube-system create secret generic hcloud --from-literal=token=${var.hcloud_token} --from-literal=network=${hcloud_network.k3s.name}",
+    ]
+  }
+
+  # Provision kubernetes resources for CSI, CCM, kured, traefik, etc
+  provisioner "remote-exec" {
+    inline = [
+      "kubectl -n kube-system create secret generic hcloud --from-literal=token=${var.hcloud_token} --from-literal=network=${hcloud_network.k3s.name}",
       "kubectl -n kube-system create secret generic hcloud-csi --from-literal=token=${var.hcloud_token}",
-      "kubectl apply -k /tmp/",
-      "kubectl apply -f /tmp/traefik.yaml",
-      "rm /tmp/traefik.yaml /tmp/kustomization.yaml"
+      "kubectl apply -k /tmp/post_install",
+      "rm -rf /tmp/post_install"
     ]
   }
 
diff --git a/templates/kustomization.yaml.tpl b/templates/kustomization.yaml.tpl
index 61d4f1a..8042097 100644
--- a/templates/kustomization.yaml.tpl
+++ b/templates/kustomization.yaml.tpl
@@ -6,6 +6,7 @@ resources:
 - "https://github.com/hetznercloud/hcloud-cloud-controller-manager/releases/download/${ccm_version}/ccm-networks.yaml"
 - "https://raw.githubusercontent.com/hetznercloud/csi-driver/${csi_version}/deploy/kubernetes/hcloud-csi.yml"
 - "https://github.com/weaveworks/kured/releases/download/${kured_version}/kured-${kured_version}-dockerhub.yaml"
+- ./traefik.yaml
 
 patchesStrategicMerge:
 - |-