From c062bccbeb525fb79adb2e1875a2ba801776069a Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 1 Sep 2025 20:29:44 +0200 Subject: [PATCH 1/6] k3s_1_30: remove EOL on 2025-06-28: https://www.suse.com/lifecycle/#k3s --- .../cluster/k3s/1_30/chart-versions.nix | 10 ------- .../cluster/k3s/1_30/images-versions.json | 26 ------------------- .../networking/cluster/k3s/1_30/versions.nix | 15 ----------- .../networking/cluster/k3s/default.nix | 10 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 6 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix delete mode 100644 pkgs/applications/networking/cluster/k3s/1_30/images-versions.json delete mode 100644 pkgs/applications/networking/cluster/k3s/1_30/versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix deleted file mode 100644 index 7f65917312ed..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz"; - sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz"; - sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1"; - }; -} diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json deleted file mode 100644 index 9ec9d1b5d8a2..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-amd64.tar.gz", - "sha256": "f98a57f7b25a4537096fbe9755f96cfd05bfe6fc6315f111c0f44e1abf4aad6d" - }, - "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-amd64.tar.zst", - "sha256": "9bda99cde833c4e13fb4d35fa46fd57d4b1a2eefc33e00fa352ce686c871c842" - }, - "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm.tar.gz", - "sha256": "33df3a2b155118198c48e66426a04292a348aa53fef126a3cb8e4fe7aea83ccc" - }, - "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm.tar.zst", - "sha256": "d40a78ff14b40547bca6d05db3d7e767b272bb9257628ebd3905d1659bc49bd5" - }, - "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm64.tar.gz", - "sha256": "bba9c2e417ece797a5ae8bf9346bb35dc8ab163828c801a2cb512d6097610b52" - }, - "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.14%2Bk3s2/k3s-airgap-images-arm64.tar.zst", - "sha256": "6561f91f14c8419c9d1c20fb9af7948757d87bd91855b376058d9f2e16010452" - } -} diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix deleted file mode 100644 index 566c9c352d40..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - k3sVersion = "1.30.14+k3s2"; - k3sCommit = "071b1ead43641c6803e0b9fce6473baeb12357cf"; - k3sRepoSha256 = "0lldw9kgzpr1073zsr5y4jxmh1c8ah4giyxzb10rfcwx06mglmir"; - k3sVendorHash = "sha256-qEvdBT3noOtKdIdHDJZChowXzQMpVpY/l1ioTJCGVJ4="; - chartVersions = import ./chart-versions.nix; - imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.14.1"; - k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; - k3sCNIVersion = "1.7.1-k3s1"; - k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz"; - containerdVersion = "1.7.27-k3s1"; - containerdSha256 = "1w6ia9a7qs06l9wh44fpf1v2ckf2lfp9sjzk0bg4fjw5ds9sxws0"; - criCtlVersion = "1.29.0-k3s1"; -} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index e174741f2e1a..a758355d32df 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -12,16 +12,6 @@ let extraArgs = builtins.removeAttrs args [ "callPackage" ]; in { - k3s_1_30 = common ( - (import ./1_30/versions.nix) - // { - updateScript = [ - ./update-script.sh - "30" - ]; - } - ) extraArgs; - k3s_1_31 = common ( (import ./1_31/versions.nix) // { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f2f62d816022..000564e9319e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1225,6 +1225,7 @@ mapAliases { k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01 k3s_1_28 = throw "'k3s_1_28' has been removed from nixpkgs as it has reached end of life"; # Added 2024-12-15 k3s_1_29 = throw "'k3s_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05 + k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01 # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04 # now kube3d/k3d will take its place kube3d = k3d; # Added 2022-0705 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f89c99011e65..e52d8f7a08ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12112,7 +12112,6 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; inherit (callPackage ../applications/networking/cluster/k3s { }) - k3s_1_30 k3s_1_31 k3s_1_32 k3s_1_33 From e0904d59ff254c294b7b917e007391c45b6e4a7a Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 1 Sep 2025 20:34:39 +0200 Subject: [PATCH 2/6] k3s_1_31: 1.31.11+k3s1 -> 1.31.12+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.31.12%2Bk3s1 --- .../cluster/k3s/1_31/images-versions.json | 24 +++++++++---------- .../networking/cluster/k3s/1_31/versions.nix | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json index 8ea08a211171..6f9adbdf9ea3 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "fa4f87e7e82c0e613f854eedf8f64d2cdabbd127f3ae84707ed1ca59e2137855" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "a6899f064a179d0681b5e18f5b82fa10120badf8e74c79a4eedebe000a9eaa56" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "c98ad7590af33ef7e148920eb809dfd0f8145a623fdd8d32c6efeecab6088412" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "d253cfce051c549a3ed0826d60e5c7bec7bbd9f8a64f98a9d5ec8238e9914cc3" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "0b6009407069fdd684d9627c5fa4bdb31ea4644172f1f429a2cce15d2c18631d" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "74e897222e53a2750b3ee8249964e0e47fa5c5caae9d611a18499be6b51cdee3" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "c1bd7557836538592dbd59f798e7a4b91d7aef74c8f9f71631060c96a5288dd6" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "162a158c191591ec4ca3b7f446fdf9e23eb8366407091b992087abdc6349325f" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "6fa41db4ee001c1db8a404dd38f17f2426f27f688f9f7a2a76f4ef336f51c886" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "313e268ab348dd8d4708928e7bc0fb45b7f518aeb7dfaa9631d3d7d61ba1f8be" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "97f0db38f57a2dc63167795620ba34a89348d874ecc91fbf3d8d962dc1392e47" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "60f19d4935f5b4b2b776c634eb9701268b94ccd100fc9c2968c096ba1fb5154f" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix index 17fabb8925ad..165a8aac3278 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.31.11+k3s1"; - k3sCommit = "17cfde1c82427535f0d3b6fe15caef1a0e62e82f"; - k3sRepoSha256 = "17dmk8r1rjv2wv4kfyrsdyb9xp696ckq79lzjkvh89x8g31b6p1h"; - k3sVendorHash = "sha256-ogyFEWnTBYjpz9clO3v5DyO23mHPhUS+JC587kLJ5Ck="; + k3sVersion = "1.31.12+k3s1"; + k3sCommit = "2b53c7e4c81742fbb2b0e7e90e3bb907d1fe0e24"; + k3sRepoSha256 = "07pi1vjpm01q2riq0dic6p27nqj4wzwwzllxgmr7gfim1xx643gd"; + k3sVendorHash = "sha256-osqhQJq+Qst3LpYdhXkAY6Pxay381PmoxD5Ji/ZV86Q="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; From 7e3606d3cdc8b224b0ae57b5a918a6d358ac1384 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 1 Sep 2025 20:38:19 +0200 Subject: [PATCH 3/6] k3s_1_32: 1.32.7+k3s1 -> 1.32.8+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.32.8%2Bk3s1 --- .../cluster/k3s/1_32/images-versions.json | 24 +++++++++---------- .../networking/cluster/k3s/1_32/versions.nix | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json index 5755fbf56aff..7056eec19db2 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "f6a8720aa9bb03d0c8a97a93e994557292f1efba1fa6648cd8a07830622ce748" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "b2b652c75ad0e2138ed3925e43c12bd9b79be8a42a577dde9dcb518933e5501b" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "965f5767c08cffc96bf0967813e7c3fec4c41309e9952a480f0a50865bebd039" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "3f690edd5e28c28ea3a52beb3ec009726f6e72f4a67096f2ce2b1a4fa3b01e3d" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "9aa6f9f33e58e04fb9d8f9cd5c51dd01c6092d7b5434f84341b2f74bc8de783e" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "343fa41d0c67b1b1bb4cd962b0f8d5f9cf175ef1b3bca4348cdbf91670a1d782" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "57ab9c306cc96f8dd925bc788c80e49c2d13ee7a222a12235fb525529ad25ac0" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "efc96a222a2fd0b13104e6fd87dd6bbda9a96abeb20a1a1cc203044ce0a38749" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "9633b71655ed0f4af556c148f9bf7753221b3c9b42a8d902391187789302adca" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "04ac1b2f03bceb238ad600ef70ca7a78672d741e8ce430749b8eedbb1dd0ac47" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "1aa05a55492ba0872fa8a0ff518d6e947869bea32dc2b8e5223bdcf53450c7f9" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "d76ec4a39d66da2a98e7c55dc6811350b4333a2eeae9c0bd4fc401203d92d9e8" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix index 1b9cf156e4bf..d024b3754349 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.32.7+k3s1"; - k3sCommit = "ab99e9da82c7072e4d9efbfa9464e343846fae72"; - k3sRepoSha256 = "0srs8nrmnqsxlyhbbd7i18vbk5c55c16xg278958wi3lbwang0b2"; - k3sVendorHash = "sha256-vKTujaFATguUtIorfa7bY8lSQsx6RhFx0sdWencR2nc="; + k3sVersion = "1.32.8+k3s1"; + k3sCommit = "fe896f7e7cf8be1cfffe7151c6860deb08e2a005"; + k3sRepoSha256 = "1knj7jzxb70zvqjn7pbjz78cm06w0402id5frib94y0i4rsmqd6g"; + k3sVendorHash = "sha256-MbXTUvdnoLFVGYKEGBYWNkuL2Es0Io4q2E5qaUptwRQ="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; From ebb711751c1465154ca6b8e2e7727eb08618c733 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 1 Sep 2025 20:40:03 +0200 Subject: [PATCH 4/6] k3s_1_33: 1.33.3+k3s1 -> 1.33.4+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.33.4%2Bk3s1 --- .../cluster/k3s/1_33/images-versions.json | 24 +++++++++---------- .../networking/cluster/k3s/1_33/versions.nix | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json index bd07f3e8f7a2..fed1f0404194 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "64690dc963f6cbff8adb175a1bc41e6bf207734a9a214362544a36361a2d8350" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "13832518d409f950121a9c681b878f868120c73d42d3823f55cea49f61b69497" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "51b6ddeafa465e542f0707272736100916886dd49abcb1420ee52878dd3638a9" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1a3738a77c4a3fef4a85c16d7f2eadcd337605f9279fcddbc3eb4f982fbd2238" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "878d17722dd98e7d88de93a83606e0c9b0d7587c7e4a043559b5236a353fb224" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "94b084b7f9756e986855301658af957042e3ebb7c71848860f823b35844e98fa" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "339dd2b33b40f03bf95ee2e5dcb8e543ab6852e156cb8aaebe3885717a2966b5" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "1be4d940daea065ad97bc254882b12fb30af2f13ed2b26a7cd16aeacec29f048" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "e4ab063deb50241e60218a3a30ce090a5817daa0f38dacd10651e27b2be28b9e" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "a89d7916b65ed066e761fe07831aa157b91b30bc1369ea9be3d1e5f0fe1dc74c" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "c12ec7b122f34eb1f89310b05e66b500a2f49522d7cd4ceb3475a675cab6ebc6" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "6d898c35a9dc96d427f4258605ce61daf7587f26ea2822b711896224b746b38f" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix index 185a61040575..6a79967ddd7b 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.33.3+k3s1"; - k3sCommit = "236cbf257332b293f444abe6f24d699ff628173e"; - k3sRepoSha256 = "163brwnz4af1rjv5pcghlzjnwr27b087y73bv6pri0fyqd3mwiim"; - k3sVendorHash = "sha256-rU+rpExb9LVIROPj3MN924r7Hk8sK/5P8JSssOoIWTU="; + k3sVersion = "1.33.4+k3s1"; + k3sCommit = "148243c49519922720fe1b340008dbce8fb02516"; + k3sRepoSha256 = "1870l3mq5nsh8i82wvwsz7nqiv1xzyqypm66rfmp999s2qlssyaa"; + k3sVendorHash = "sha256-JbnoV8huyOS7Q91QjqTKvPEtkYQxjR10o0d5z25Ycsg="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; From 75c1cae6e159b81cf0d0468b84c100aef33d162f Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 3 Sep 2025 15:25:16 +0200 Subject: [PATCH 5/6] k3s: adapt to native embed package for bundled content Updates the builder to follow the upstream replacement go-bindata with the native embed package. As this affects also the bundled Traefik chart, the Traefik deployment is now also covered in tests. --- .../networking/cluster/k3s/builder.nix | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index d7f98cd7ba93..abfdec8bd290 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -127,8 +127,14 @@ let ]; # bundled into the k3s binary - traefikChart = fetchurl chartVersions.traefik; - traefik-crdChart = fetchurl chartVersions.traefik-crd; + traefik = { + chart = fetchurl chartVersions.traefik; + name = builtins.baseNameOf chartVersions.traefik.url; + }; + traefik-crd = { + chart = fetchurl chartVersions.traefik-crd; + name = builtins.baseNameOf chartVersions.traefik-crd.url; + }; # a shortcut that provides the images archive for the host platform. Currently only supports # aarch64 (arm64) and x86_64 (amd64), throws on other architectures. @@ -267,6 +273,18 @@ let "linux" ]; + # Set flags for sqlite dbstat + CGO_CFLAGS = "-DSQLITE_ENABLE_DBSTAT_VTAB=1 -DSQLITE_USE_ALLOCA=1"; + + # Copy manifests and static charts pre build so they get embedded during build + preBuild = '' + cp -av manifests/* ./pkg/deploy/embed/ + + mkdir -p ./pkg/static/embed/charts/ + cp -v ${traefik.chart} ./pkg/static/embed/charts/${traefik.name} + cp -v ${traefik-crd.chart} ./pkg/static/embed/charts/${traefik-crd.name} + ''; + # create the multicall symlinks for k3s postInstall = '' mv $out/bin/server $out/bin/k3s @@ -402,10 +420,6 @@ buildGoModule rec { ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni ln -vsf ${k3sContainerd}/bin/containerd-shim-runc-v2 ./bin rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ - mkdir -p ./build/static/charts - - cp ${traefikChart} ./build/static/charts - cp ${traefik-crdChart} ./build/static/charts export ARCH=$GOARCH export DRONE_TAG="v${k3sVersion}" From 5b918c8e92724d43fefaa57d4c9db70e461b1a72 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Wed, 3 Sep 2025 22:14:15 +0200 Subject: [PATCH 6/6] nixos/k3s: cover bundled traefik deployment in auto deploy charts test --- nixos/tests/k3s/auto-deploy-charts.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/k3s/auto-deploy-charts.nix b/nixos/tests/k3s/auto-deploy-charts.nix index e06dbf05051f..fe4c8ca4690d 100644 --- a/nixos/tests/k3s/auto-deploy-charts.nix +++ b/nixos/tests/k3s/auto-deploy-charts.nix @@ -1,4 +1,5 @@ -# Tests whether container images are imported and auto deploying Helm charts work +# Tests whether container images are imported and auto deploying Helm charts, +# including the bundled traefik, work import ../make-test-python.nix ( { k3s, @@ -64,7 +65,6 @@ import ../make-test-python.nix ( "--disable local-storage" "--disable metrics-server" "--disable servicelb" - "--disable traefik" ]; images = [ # Provides the k3s Helm controller @@ -148,6 +148,8 @@ import ../make-test-python.nix ( assert hello_output.rstrip() == "Hello, world!", f"unexpected output of hello job: {hello_output}" assert values_file_output.rstrip() == "Hello, file!", f"unexpected output of values file job: {values_file_output}" assert advanced_output.rstrip() == "advanced hello", f"unexpected output of advanced job: {advanced_output}" + # wait for bundled traefik deployment + machine.wait_until_succeeds("kubectl -n kube-system rollout status deployment traefik", timeout=180) ''; } )