From 6584171c6cea8069748cea92ff029493983dda69 Mon Sep 17 00:00:00 2001 From: Tobias Stenzel Date: Fri, 5 Jul 2024 15:22:41 +0200 Subject: [PATCH 1/2] k3s: use 1.30 for new systems (state version 24.05) Current systems have a state version older than 24.05. They get the same k3s as for NixOS 23.11. New systems (or systems with an manually updated state version) get the current default version, that is 1.30 PL-132671 --- nixos/roles/k3s/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/roles/k3s/default.nix b/nixos/roles/k3s/default.nix index aaca63ade..9b230fff6 100644 --- a/nixos/roles/k3s/default.nix +++ b/nixos/roles/k3s/default.nix @@ -63,9 +63,12 @@ } ]; - services.k3s.package = pkgs.k3s_1_27; } + (lib.mkIf (lib.versionOlder config.system.stateVersion "24.05") { + services.k3s.package = pkgs.k3s_1_27; + }) + (lib.mkIf (server || agent) { flyingcircus.passwordlessSudoPackages = [ { From b76f15e4451f774b47c4b20fdff4c6543b26b691 Mon Sep 17 00:00:00 2001 From: Tobias Stenzel Date: Fri, 5 Jul 2024 16:20:47 +0200 Subject: [PATCH 2/2] k3s docs: version info, not really beta anymore --- doc/src/kubernetes.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/src/kubernetes.md b/doc/src/kubernetes.md index 2faf9ba33..84d2746ef 100644 --- a/doc/src/kubernetes.md +++ b/doc/src/kubernetes.md @@ -3,7 +3,7 @@ # Kubernetes Cluster (k3s) :::{note} -Kubernetes support is in beta. Feel free to use it but we suggest contacting +Kubernetes/k3s is complex. Feel free to use it but we suggest contacting our support before putting anything into production. ::: @@ -30,7 +30,8 @@ run in a process called the `k3s agent`. We will prefer to use the words `server` and `agent` through the remainder of this document. ::: -We provide version 1.27.x of k3s. +Machines created on NixOS 24.05 use k3s version 1.30.x. Machines upgraded +from earlier platform versions use 1.27.x of k3s by default which was also the default for NixOS 23.11. Contact support if you want to use newer versions of k3s on these machines. ## Reference architecture and minimal resource requirements