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 2147d11..01065b3 100644 --- a/terraform/modules/k8s-cluster/templates/cloud-init-k8s-manager.tftpl +++ b/terraform/modules/k8s-cluster/templates/cloud-init-k8s-manager.tftpl @@ -15,48 +15,43 @@ package_update: true package_upgrade: true package_reboot_if_required: true write_files: - - owner: 2martensAdmin:2martensAdmin + - owner: root:root content: "${microk8s_config}" - path: /home/2martensAdmin/.microk8s.yaml + path: /run/terraform/.microk8s.yaml encoding: base64 - owner: root:root content: "${packages_setup}" - path: /usr/local/bin/install-packages.sh + path: /run/terraform/install-packages.sh encoding: base64 - permissions: "0755" - owner: root:root content: "${firewall_setup}" - path: /usr/local/bin/firewall-setup.sh + path: /run/terraform/firewall-setup.sh encoding: base64 - permissions: "0755" - owner: root:root content: "${ssh_setup}" - path: /usr/local/bin/ssh-setup.sh + path: /run/terraform/ssh-setup.sh encoding: base64 - permissions: "0755" - owner: root:root content: "${microk8s_setup}" - path: /usr/local/bin/microk8s-setup.sh + path: /run/terraform/microk8s-setup.sh encoding: base64 - permissions: "0755" %{ if main_node ~} - owner: root:root content: "${cluster_setup}" - path: /usr/local/bin/cluster-setup.sh + path: /run/terraform/cluster-setup.sh encoding: base64 permissions: "0755" - owner: root:root content: "${cluster_setup_values}" - path: /home/terraform/cluster-setup-values.yaml + path: /run/terraform/cluster-setup-values.yaml encoding: base64 - permissions: "0755" - owner: root:root content: "${argocd_ha_values}" - path: /home/terraform/argocd-values-ha.yaml + path: /run/terraform/argocd-values-ha.yaml encoding: base64 - permissions: "0755" %{ endif ~} runcmd: + - install /run/terraform/*.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 9d3a987..e66f5e7 100644 --- a/terraform/modules/k8s-cluster/templates/cloud-init-k8s-worker.tftpl +++ b/terraform/modules/k8s-cluster/templates/cloud-init-k8s-worker.tftpl @@ -15,31 +15,28 @@ package_update: true package_upgrade: true package_reboot_if_required: true write_files: - - owner: 2martensAdmin:2martensAdmin + - owner: root:root content: "${microk8s_config}" - path: /home/2martensAdmin/.microk8s.yaml + path: /run/terraform/.microk8s.yaml encoding: base64 - owner: root:root content: "${packages_setup}" - path: /usr/local/bin/install-packages.sh + path: /run/terraform/install-packages.sh encoding: base64 - permissions: "0755" - owner: root:root content: "${firewall_setup}" - path: /usr/local/bin/firewall-setup.sh + path: /run/terraform/firewall-setup.sh encoding: base64 - permissions: "0755" - owner: root:root content: "${ssh_setup}" - path: /usr/local/bin/ssh-setup.sh + path: /run/terraform/ssh-setup.sh encoding: base64 - permissions: "0755" - owner: root:root content: "${microk8s_setup}" - path: /usr/local/bin/microk8s-setup.sh + path: /run/terraform/microk8s-setup.sh encoding: base64 - permissions: "0755" runcmd: + - install /run/terraform/*.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 0413b3c..5d67c48 100644 --- a/terraform/modules/k8s-cluster/templates/cluster-setup.sh +++ b/terraform/modules/k8s-cluster/templates/cluster-setup.sh @@ -1,9 +1,9 @@ #!/bin/sh helm repo add 2martens https://repo.2martens.de/charts/ -helm install setup 2martens/cluster_setup --values /home/terraform/cluster-setup-values.yaml +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 /home/terraform/argocd-values-ha.yaml +helm install argocd 2martens/argocd --set environment=${argocd_environment} --values /run/terraform/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/microk8s-setup.sh b/terraform/modules/k8s-cluster/templates/microk8s-setup.sh index 3831e13..9d02e73 100644 --- a/terraform/modules/k8s-cluster/templates/microk8s-setup.sh +++ b/terraform/modules/k8s-cluster/templates/microk8s-setup.sh @@ -1,8 +1,7 @@ #!/bin/sh mkdir -p /var/snap/microk8s/common/etc/launcher -cp /home/terraform/.microk8s.yaml /var/snap/microk8s/common/etc/launcher/.microk8s.yaml -chown root:root /var/snap/microk8s/common/etc/launcher/.microk8s.yaml +cp /run/terraform/.microk8s.yaml /var/snap/microk8s/common/etc/launcher/.microk8s.yaml %{ if !main_node ~} sleep 120 %{ endif ~}