2martens/terraform
1
0
Fork 0
mirror of https://github.com/2martens/terraform.git synced 2026-10-17 19:26:51 +02:00
Code Issues Activity

Use non-strict confinement snap version

Browse Source
This commit is contained in:
2martens
2023-11-04 21:59:14 +01:00
parent 0711ab8f68
commit 442eae5925
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
terraform/modules/k8s-cluster/templates/scripts/install-packages.sh
-1
View File
@@ -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 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 apt-get -y install /run/tmpfiles.d/hc-utils_0.0.4-1_all.deb
snap install kubectl --classic snap install kubectl --classic
snap install snapcraft --classic
snap set system refresh.timer=${refresh_day},${refresh_hour}:00 snap set system refresh.timer=${refresh_day},${refresh_hour}:00
terraform/modules/k8s-cluster/templates/scripts/microk8s-setup.sh
+2 -7
View File
@@ -1,13 +1,8 @@
#!/bin/sh #!/bin/sh
mkdir -p /run/tmpfiles.d/snap/launcher/configuration mv /run/tmpfiles.d/microk8s.yaml /etc/microk8s.yaml
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
%{ if !main_node ~} %{ if !main_node ~}
sleep 120 sleep 120
%{ endif ~} %{ endif ~}
snap install microk8s --channel "${microk8s_channel}" snap install microk8s --classic --channel "${microk8s_channel}"
snap connect microk8s:configuration microk8s-cluster-config
terraform/modules/k8s-cluster/variables.tf
+1 -1
View File
@@ -137,7 +137,7 @@ variable "cluster_token_ttl_seconds" {
variable "microk8s_channel" { variable "microk8s_channel" {
description = "The snap channel used for the microk8s installation" description = "The snap channel used for the microk8s installation"
type = string type = string
default = "1.28-strict/stable" default = "1.28/stable"
} }
variable "vault_service_principal" { variable "vault_service_principal" {