From 25c9aefea83850ef74826c9b30fc7731f0bba2ea Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Sat, 4 Nov 2023 19:32:06 +0100
Subject: [PATCH] Try saving files in existing tmpfile directory

---
 .../templates/cloud-init-k8s-manager.tftpl     | 18 +++++++++---------
 .../templates/cloud-init-k8s-worker.tftpl      | 12 ++++++------
 .../k8s-cluster/templates/cluster-setup.sh     |  2 +-
 .../k8s-cluster/templates/install-packages.sh  |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/terraform/modules/k8s-cluster/templates/cloud-init-k8s-manager.tftpl b/terraform/modules/k8s-cluster/templates/cloud-init-k8s-manager.tftpl
index 01065b3..33725e2 100644
--- a/terraform/modules/k8s-cluster/templates/cloud-init-k8s-manager.tftpl
+++ b/terraform/modules/k8s-cluster/templates/cloud-init-k8s-manager.tftpl
@@ -17,41 +17,41 @@ package_reboot_if_required: true
 write_files:
   - owner: root:root
     content: "${microk8s_config}"
-    path: /run/terraform/.microk8s.yaml
+    path: /run/tmpfiles.d/.microk8s.yaml
     encoding: base64
   - owner: root:root
     content: "${packages_setup}"
-    path: /run/terraform/install-packages.sh
+    path: /run/tmpfiles.d/install-packages.sh
     encoding: base64
   - owner: root:root
     content: "${firewall_setup}"
-    path: /run/terraform/firewall-setup.sh
+    path: /run/tmpfiles.d/firewall-setup.sh
     encoding: base64
   - owner: root:root
     content: "${ssh_setup}"
-    path: /run/terraform/ssh-setup.sh
+    path: /run/tmpfiles.d/ssh-setup.sh
     encoding: base64
   - owner: root:root
     content: "${microk8s_setup}"
-    path: /run/terraform/microk8s-setup.sh
+    path: /run/tmpfiles.d/microk8s-setup.sh
     encoding: base64
 %{ if main_node ~}
   - owner: root:root
     content: "${cluster_setup}"
-    path: /run/terraform/cluster-setup.sh
+    path: /run/tmpfiles.d/cluster-setup.sh
     encoding: base64
     permissions: "0755"
   - owner: root:root
     content: "${cluster_setup_values}"
-    path: /run/terraform/cluster-setup-values.yaml
+    path: /run/tmpfiles.d/cluster-setup-values.yaml
     encoding: base64
   - owner: root:root
     content: "${argocd_ha_values}"
-    path: /run/terraform/argocd-values-ha.yaml
+    path: /run/tmpfiles.d/argocd-values-ha.yaml
     encoding: base64
 %{ endif ~}
 runcmd:
-  - install /run/terraform/*.sh /usr/local/bin
+  - install /run/tmpfiles.d/*.sh /usr/local/bin
   - /usr/local/bin/install-packages.sh
   - /usr/local/bin/firewall-setup.sh
   - /usr/local/bin/ssh-setup.sh
diff --git a/terraform/modules/k8s-cluster/templates/cloud-init-k8s-worker.tftpl b/terraform/modules/k8s-cluster/templates/cloud-init-k8s-worker.tftpl
index e66f5e7..5369cbe 100644
--- a/terraform/modules/k8s-cluster/templates/cloud-init-k8s-worker.tftpl
+++ b/terraform/modules/k8s-cluster/templates/cloud-init-k8s-worker.tftpl
@@ -17,26 +17,26 @@ package_reboot_if_required: true
 write_files:
   - owner: root:root
     content: "${microk8s_config}"
-    path: /run/terraform/.microk8s.yaml
+    path: /run/tmpfiles.d/.microk8s.yaml
     encoding: base64
   - owner: root:root
     content: "${packages_setup}"
-    path: /run/terraform/install-packages.sh
+    path: /run/tmpfiles.d/install-packages.sh
     encoding: base64
   - owner: root:root
     content: "${firewall_setup}"
-    path: /run/terraform/firewall-setup.sh
+    path: /run/tmpfiles.d/firewall-setup.sh
     encoding: base64
   - owner: root:root
     content: "${ssh_setup}"
-    path: /run/terraform/ssh-setup.sh
+    path: /run/tmpfiles.d/ssh-setup.sh
     encoding: base64
   - owner: root:root
     content: "${microk8s_setup}"
-    path: /run/terraform/microk8s-setup.sh
+    path: /run/tmpfiles.d/microk8s-setup.sh
     encoding: base64
 runcmd:
-  - install /run/terraform/*.sh /usr/local/bin
+  - install /run/tmpfiles.d/*.sh /usr/local/bin
   - /usr/local/bin/install-packages.sh
   - /usr/local/bin/firewall-setup.sh
   - /usr/local/bin/ssh-setup.sh
diff --git a/terraform/modules/k8s-cluster/templates/cluster-setup.sh b/terraform/modules/k8s-cluster/templates/cluster-setup.sh
index 5d67c48..16d5395 100644
--- a/terraform/modules/k8s-cluster/templates/cluster-setup.sh
+++ b/terraform/modules/k8s-cluster/templates/cluster-setup.sh
@@ -3,7 +3,7 @@
 helm repo add 2martens https://repo.2martens.de/charts/
 helm install setup 2martens/cluster_setup --values /run/terraform/cluster-setup-values.yaml
 %{ if high_availability ~}
-helm install argocd 2martens/argocd --set environment=${argocd_environment} --values /run/terraform/argocd-values-ha.yaml
+helm install argocd 2martens/argocd --set environment=${argocd_environment} --values /run/tmpfiles.d/argocd-values-ha.yaml
 %{ else ~}
 helm install argocd 2martens/argocd --set environment=${argocd_environment}
 %{ endif ~}
\ No newline at end of file
diff --git a/terraform/modules/k8s-cluster/templates/install-packages.sh b/terraform/modules/k8s-cluster/templates/install-packages.sh
index 4267ff8..01355d8 100644
--- a/terraform/modules/k8s-cluster/templates/install-packages.sh
+++ b/terraform/modules/k8s-cluster/templates/install-packages.sh
@@ -4,6 +4,6 @@ apt-get -y install fail2ban
 apt-get -y install ufw
 apt-get -y install snapd
 
-curl https://packages.hetzner.com/hcloud/deb/hc-utils_0.0.4-1_all.deb -o /tmp/hc-utils_0.0.4-1_all.deb -s
-apt install /tmp/hc-utils_0.0.4-1_all.deb
+curl https://packages.hetzner.com/hcloud/deb/hc-utils_0.0.4-1_all.deb -o /run/tmpfiles.d/hc-utils_0.0.4-1_all.deb -s
+apt install /run/tmpfiles.d/hc-utils_0.0.4-1_all.deb
 snap install kubectl --classic
\ No newline at end of file