feat: Do not rely on k0s file uploads - instead use curl (#1229)

* feat: Do not rely on k0s file uploads - instead use curl Signed-off-by: Devin Buhl <devin@buhl.casa> * fix: add bootstrap_advanced_flags to validation Signed-off-by: Devin Buhl <devin@buhl.casa> * fix: only skip tests for non-static config Signed-off-by: Devin Buhl <devin@buhl.casa> * fix: only skip tests for non-static config Signed-off-by: Devin Buhl <devin@buhl.casa> * fix: issues in k0s scripts Signed-off-by: Devin Buhl <devin@buhl.casa> * update: readme Signed-off-by: Devin Buhl <devin@buhl.casa> * update: taskfile Signed-off-by: Devin Buhl <devin@buhl.casa> * update: taskfile Signed-off-by: Devin Buhl <devin@buhl.casa> * update: k0s config and remove ansible hook Signed-off-by: Devin Buhl <devin@buhl.casa> --------- Signed-off-by: Devin Buhl <devin@buhl.casa>
2024-01-22 10:14:49 -05:00
1 parent 5ef0438529
commit d9c7fd44ba
@@ -1,11 +1,25 @@
 #% if bootstrap_distribution == 'k0s' %#
 #!/usr/bin/env bash
+set -e
+set -o noglob

 [ $(id -u) -eq 0 ] || exec sudo $0 $@

 # Prepare
 sudo apt-get update -y

+# Hostname
+if [ -n "${INSTALL_K0S_HOSTNAME}" ] && [ "$(hostnamectl hostname)" != "${INSTALL_K0S_HOSTNAME}" ]; then
+    hostnamectl set-hostname "${INSTALL_K0S_HOSTNAME}"
+tee /etc/hosts > /dev/null <<EOF
+127.0.0.1 localhost
+127.0.1.1 $INSTALL_K0S_HOSTNAME
+::1       localhost ip6-localhost ip6-loopback
+ff02::1   ip6-allnodes
+ff02::2   ip6-allrouters
+EOF
+fi
+
 # Timezone
 timedatectl set-timezone "#{ bootstrap_timezone }#"

@@ -16,7 +30,7 @@ apt-get install -y --no-install-recommends \
    nvme-cli open-iscsi parted psmisc python3 python3-apt python3-kubernetes python3-yaml \
    smartmontools socat software-properties-common unzip util-linux

-#% if bootstrap_advanced_flags.update_resolv_conf %#
+#% if bootstrap_advanced_flags.update_resolv_conf|default(true) %#
 # Update DNS
 chattr -i /etc/resolv.conf
 rm -f /etc/resolv.conf
@@ -37,9 +51,9 @@ systemctl restart systemd-modules-load.service

 # Sysctls
 cat <<EOF > /etc/sysctl.d/99-kubernetes.conf
-fs.inotify.max_queued_events: 65536
-fs.inotify.max_user_watches: 524288
-fs.inotify.max_user_instances: 8192
+fs.inotify.max_queued_events = 65536
+fs.inotify.max_user_watches = 524288
+fs.inotify.max_user_instances = 8192
 EOF
 sysctl -p /etc/sysctl.d/99-kubernetes.conf

@@ -57,6 +71,17 @@ neofetch --config none
 EOF
 chmod 755 /etc/profile.d/neofetch.sh

-# Ensure k0s containerd directory exists
+# Create containerd config
 mkdir -p /etc/k0s/containerd.d
+cat <<EOF > /etc/k0s/containerd.d/default.toml
+[plugins."io.containerd.grpc.v1.cri"]
+  enable_unprivileged_ports = true
+  enable_unprivileged_icmp = true
+[plugins."io.containerd.grpc.v1.cri".registry]
+  config_path = "/var/lib/k0s/containerd/certs.d"
+[plugins."io.containerd.grpc.v1.cri".containerd]
+  discard_unpacked_layers = false
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+  discard_unpacked_layers = false
+EOF
 #% endif %#
@@ -1,11 +0,0 @@
-#% if bootstrap_distribution == 'k0s' %#
-[plugins."io.containerd.grpc.v1.cri"]
-  enable_unprivileged_ports = true
-  enable_unprivileged_icmp = true
-[plugins."io.containerd.grpc.v1.cri".registry]
-  config_path = "/var/lib/k0s/containerd/certs.d"
-[plugins."io.containerd.grpc.v1.cri".containerd]
-  discard_unpacked_layers = false
-[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
-  discard_unpacked_layers = false
-#% endif %#
@@ -1,5 +1,7 @@
 #% if bootstrap_distribution == 'k0s' %#
 #!/usr/bin/env bash
+set -e
+set -o noglob

 [ $(id -u) -eq 0 ] || exec sudo $0 $@

@@ -1,8 +1,13 @@
 #% if bootstrap_distribution == 'k0s' %#
 #!/usr/bin/env bash
+set -e
+set -o noglob

 [ $(id -u) -eq 0 ] || exec sudo $0 $@

+# Remove containerd config
+rm -rf /etc/k0s/containerd.d
+
 # Remove local storage data
 rm -rf "#{ bootstrap_advanced_flags.local_storage_path|default('/var/openebs/local', true) }#"