diff --git a/k3s-host/setup.sh b/k3s-host/setup.sh index 51ec9cc..9bc14d5 100755 --- a/k3s-host/setup.sh +++ b/k3s-host/setup.sh @@ -181,7 +181,7 @@ EOF if test "$self_node" = $node_k8s_etcd; then args="$args --disable-apiserver --disable-controller-manager --disable-scheduler" fi - export INSTALL_K3S_VERSION=v1.30.5+k3s1 + export INSTALL_K3S_VERSION=$K3S_VERSION curl -fL https://get.k3s.io | sh -s - server $args --cluster-init --disable=servicelb --disable=traefik --write-kubeconfig-mode=644 --node-ip=$node_k8s_ipv4_prefix.$self_node,$node_k8s_ipv6_prefix::$self_node $node_k8s_cidr --flannel-ipv6-masq if test "$self_node" = $node_k8s_etcd; then retry --times 20 -- kubectl taint nodes $(hostname) key1=value1:NoSchedule @@ -198,8 +198,7 @@ function setup_k8s_apply() { function setup_k8s_traefik() { # https://github.com/traefik/traefik-helm-chart?tab=readme-ov-file#deploying-traefik - helm repo add traefik https://traefik.github.io/charts - $SELF_DIR/subst.sh traefik.yml | helm upgrade --install --namespace kube-system traefik -f - --set installCRDs=true --version 32.1.1 traefik/traefik + $SELF_DIR/subst.sh traefik.yml | helm upgrade --install --namespace kube-system traefik -f - --set installCRDs=true --version $TRAEFIK_VERSION oci://ghcr.io/traefik/helm/traefik } function setup_k8s_nfs() { diff --git a/k3s-host/variables.sh.example b/k3s-host/variables.sh.example index 81b64b3..ec7c578 100755 --- a/k3s-host/variables.sh.example +++ b/k3s-host/variables.sh.example @@ -1,5 +1,8 @@ #!/bin/bash +K3S_VERSION=v1.30.5+k3s1 +TRAEFIK_VERSION=32.1.1 + nodes="5 6" node_interface=(