From 442eae5925c59eb535c26b56523d928869eb3fa5 Mon Sep 17 00:00:00 2001
From: Jim Martens <github@2martens.de>
Date: Sat, 4 Nov 2023 21:59:14 +0100
Subject: [PATCH] Use non-strict confinement snap version

---
 .../k8s-cluster/templates/scripts/install-packages.sh    | 1 -
 .../k8s-cluster/templates/scripts/microk8s-setup.sh      | 9 ++-------
 terraform/modules/k8s-cluster/variables.tf               | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/terraform/modules/k8s-cluster/templates/scripts/install-packages.sh b/terraform/modules/k8s-cluster/templates/scripts/install-packages.sh
index cc8ba49..3e02ecf 100644
--- a/terraform/modules/k8s-cluster/templates/scripts/install-packages.sh
+++ b/terraform/modules/k8s-cluster/templates/scripts/install-packages.sh
@@ -7,5 +7,4 @@ 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 snapcraft --classic
 snap set system refresh.timer=${refresh_day},${refresh_hour}:00
\ No newline at end of file
diff --git a/terraform/modules/k8s-cluster/templates/scripts/microk8s-setup.sh b/terraform/modules/k8s-cluster/templates/scripts/microk8s-setup.sh
index 79af0c6..bbcec17 100644
--- a/terraform/modules/k8s-cluster/templates/scripts/microk8s-setup.sh
+++ b/terraform/modules/k8s-cluster/templates/scripts/microk8s-setup.sh
@@ -1,13 +1,8 @@
 #!/bin/sh
 
-mkdir -p /run/tmpfiles.d/snap/launcher/configuration
-mv /run/tmpfiles.d/microk8s.yaml /run/tmpfiles.d/snap/launcher/configuration/content.yaml
-mv /run/tmpfiles.d/snapcraft.yaml /run/tmpfiles.d/snap/snapcraft.yaml
-cd /run/tmpfiles.d/snap && /snap/bin/snapcraft
-snap install /run/tmpfiles.d/snap/microk8s-cluster-config_*.snap --dangerous
+mv /run/tmpfiles.d/microk8s.yaml /etc/microk8s.yaml
 
 %{ if !main_node ~}
 sleep 120
 %{ endif ~}
-snap install microk8s --channel "${microk8s_channel}"
-snap connect microk8s:configuration microk8s-cluster-config
+snap install microk8s --classic --channel "${microk8s_channel}"
diff --git a/terraform/modules/k8s-cluster/variables.tf b/terraform/modules/k8s-cluster/variables.tf
index 7f6c1a7..03180cc 100644
--- a/terraform/modules/k8s-cluster/variables.tf
+++ b/terraform/modules/k8s-cluster/variables.tf
@@ -137,7 +137,7 @@ variable "cluster_token_ttl_seconds" {
 variable "microk8s_channel" {
   description = "The snap channel used for the microk8s installation"
   type        = string
-  default     = "1.28-strict/stable"
+  default     = "1.28/stable"
 }
 
 variable "vault_service_principal" {