diff --git a/terraform/hetzner.tf b/terraform/hetzner.tf index 851e8fb..beeb7c7 100644 --- a/terraform/hetzner.tf +++ b/terraform/hetzner.tf @@ -215,6 +215,7 @@ resource "hcloud_server" "server_k8s_test" { argocd_environment : "test" argocd_version : "5.34.3" high_availability : false + admin_user : "2martensAdmin" })) }) shutdown_before_deletion = true diff --git a/terraform/modules/k8s-cluster/manager-node.tf b/terraform/modules/k8s-cluster/manager-node.tf index 104abe3..1a8c68f 100644 --- a/terraform/modules/k8s-cluster/manager-node.tf +++ b/terraform/modules/k8s-cluster/manager-node.tf @@ -117,6 +117,7 @@ resource "hcloud_server" "manager" { argocd_environment : var.argocd_environment argocd_version : var.argocd_chart_version high_availability : var.number_nodes > 2 + admin_user : var.admin_user })) }) diff --git a/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh b/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh index 9060c27..b6a8d9d 100644 --- a/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh +++ b/terraform/modules/k8s-cluster/templates/scripts/cluster-setup.sh @@ -4,6 +4,9 @@ until /snap/bin/microk8s.status --wait-ready; do sleep 3; echo "waiting for worker status.."; done +mkdir -p /home/${admin_user}/.kube +/snap/bin/microk8s.kubectl config view > /home/${admin_user}/.kube/config +chown -R ${admin_user}:${admin_user} /home/2martensAdmin/.kube /snap/bin/microk8s.helm3 repo add 2martens https://repo.2martens.de/charts/ /snap/bin/microk8s.helm3 install setup 2martens/cluster_setup --values /run/tmpfiles.d/cluster-setup-values.yaml %{ if high_availability ~} diff --git a/terraform/modules/k8s-cluster/templates/scripts/install-packages.sh b/terraform/modules/k8s-cluster/templates/scripts/install-packages.sh index 3e02ecf..f6b7087 100644 --- a/terraform/modules/k8s-cluster/templates/scripts/install-packages.sh +++ b/terraform/modules/k8s-cluster/templates/scripts/install-packages.sh @@ -7,4 +7,5 @@ apt-get -y install snapd 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-get -y install /run/tmpfiles.d/hc-utils_0.0.4-1_all.deb snap install kubectl --classic +snap install helm --classic snap set system refresh.timer=${refresh_day},${refresh_hour}:00 \ No newline at end of file diff --git a/terraform/modules/k8s-cluster/worker-node.tf b/terraform/modules/k8s-cluster/worker-node.tf index 0045dd7..9e15dc7 100644 --- a/terraform/modules/k8s-cluster/worker-node.tf +++ b/terraform/modules/k8s-cluster/worker-node.tf @@ -96,6 +96,7 @@ resource "hcloud_server" "worker" { argocd_environment : var.argocd_environment argocd_version : var.argocd_chart_version high_availability : var.number_nodes > 2 + admin_user : var.admin_user })) })