From 49708884762a26552fe4e8558e5421bf1e8715df Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 5 May 2025 12:38:49 +0200 Subject: [PATCH 1/5] k3s_1_29: remove EOL at 2025-02-28 --- .../cluster/k3s/1_29/chart-versions.nix | 10 ---------- .../cluster/k3s/1_29/images-versions.json | 18 ------------------ .../networking/cluster/k3s/1_29/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(+), 54 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix delete mode 100644 pkgs/applications/networking/cluster/k3s/1_29/images-versions.json delete mode 100644 pkgs/applications/networking/cluster/k3s/1_29/versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix deleted file mode 100644 index 7f65917312ed..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_29/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_29/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json deleted file mode 100644 index b045a685e530..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.15%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "b3b340da3d88c6723f18cf6219edf50745d5a749cb552bd2d3eee0b1281dd5a2" - }, - "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.15%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "571f0addf5253ed0e98864157c885fbd14fc67f8efcfd638cc36ade48f903b8c" - }, - "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.15%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "f2fc003d8ec5c1ac66d0eeb9e410a443a0af3f5b23367d3578c55c6e9e0c618a" - }, - "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.15%2Bk3s1/k3s-images.txt", - "sha256": "81328fb53d1dfd0de1fb9663b00fa1dc34a2da242a33e562595fec7b448bdce1" - } -} diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix deleted file mode 100644 index 43fa8d0ff1e0..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - k3sVersion = "1.29.15+k3s1"; - k3sCommit = "35a47239188444222067c25cc096346adb20401f"; - k3sRepoSha256 = "0vynlcnmhhf82hr2rv01km5jyp2c2zb7872nnd8kzdxdw3jcqp7x"; - k3sVendorHash = "sha256-+es8ua7JuDnUXej6hqE1ooFS81NhuoYYuA2+4CgUOmU="; - chartVersions = import ./chart-versions.nix; - imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.14.1"; - k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; - k3sCNIVersion = "1.6.0-k3s1"; - k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7"; - containerdVersion = "1.7.26-k3s1"; - containerdSha256 = "0snz0i7xmnvs8bj7140q0lsxqdv835hksvk36baw71w5mbm1w1xz"; - criCtlVersion = "1.29.0-k3s1"; -} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 46d911e4efe9..0ca8f3c39bb6 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_29 = common ( - (import ./1_29/versions.nix) - // { - updateScript = [ - ./update-script.sh - "29" - ]; - } - ) extraArgs; - k3s_1_30 = common ( (import ./1_30/versions.nix) // { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bbc45db63605..31a319bf97cc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -895,6 +895,7 @@ mapAliases { k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20 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 # 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 it's place kube3d = k3d; # Added 2022-0705 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d35d3f0b7e8..5d001b7c6ede 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13670,7 +13670,6 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; inherit (callPackage ../applications/networking/cluster/k3s { }) - k3s_1_29 k3s_1_30 k3s_1_31 k3s_1_32 From 21d011dc4f074c88466669f7a349a7fea2f12d17 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 5 May 2025 12:44:15 +0200 Subject: [PATCH 2/5] k3s_1_30: 1.30.11+k3s1 -> 1.30.12+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.30.12%2Bk3s1 --- .../cluster/k3s/1_30/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_30/versions.nix | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json index 651e9a4ccdc1..1f7ace104885 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "aba20bf6082fdccafc36c1ba79ba2705b2ef6f159a3455585c98cf128e767986" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1c5efab645244d13cda7111a456aff796dfb4645c845df82266c4da56d3db2a7" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "658aa3c0672f2eb3305b262a7187d0fa7fa2759dccdca196612472a9fcc4fd48" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "df41354c497c8c2514b247c237415d721fb1381bb821c00af59526ba2ef1e8e8" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "f92a63c9f570afd4a9f33b69a441ce057ee4d31359026e9b699f519ae7b8a81a" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "041a626ab65e9f61bdc67e664649bc8dc434cc9f89da15611660967a1d156fa3" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-images.txt", - "sha256": "81328fb53d1dfd0de1fb9663b00fa1dc34a2da242a33e562595fec7b448bdce1" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.12%2Bk3s1/k3s-images.txt", + "sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix index 23ce5c92fc2e..0b1653cd6653 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.30.11+k3s1"; - k3sCommit = "c2662fbee6d24b3917cf078cbf2ff69cae501340"; - k3sRepoSha256 = "0zsl5p2dmj3mkcjxbrhsa40r8bhgcrql8r8cxach4nv6y7fcyan5"; - k3sVendorHash = "sha256-G7RUyFzg3B4X0tdKmD1ep9a4cnVkUmFqBP5t1s8uFLc="; + k3sVersion = "1.30.12+k3s1"; + k3sCommit = "f9dbf16e17a6db90b64583316d9c321180e9c062"; + k3sRepoSha256 = "0d0kbbf6c6gv2s0w8m7br6vxcid48g8hirmszksd3g4brix3yxz2"; + k3sVendorHash = "sha256-FQu2Chk463c+/VYcOhfU8xIxm/ZNe1GumkEH/u2DIt0="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; From b66fbad552de53172876de17c9684259b4cfbdad Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 5 May 2025 12:51:43 +0200 Subject: [PATCH 3/5] k3s_1_31: 1.31.7+k3s1 -> 1.31.8+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.31.8%2Bk3s1 --- .../cluster/k3s/1_31/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_31/versions.nix | 8 ++++---- 2 files changed, 12 insertions(+), 12 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 2784691c211d..9c0007b99bda 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "2666c3880447979079b94babccf12296706167a5747a0f94962b257bda442449" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "b165c30ccff774f95019f70e200e59d3eea8a3b7fc63c64c07d839c1feb48357" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "6698d8bcfb029f1d16e0f2aa1d53be09d026995d26a0e4bfd92292f49c68538b" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "9adfe524ab0bb53d0753dc92759e7f2847e5ce75b88966544da16b5c37605da8" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "0c96ae243b40bb624f9cb34e2851c9cffc77e1ed0127b3e81a2e4a0ff56511a5" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "26ab12d269a619df5d21464e6b1fa539b7c7b2f039737f656683d59eb71f83ac" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-images.txt", - "sha256": "81328fb53d1dfd0de1fb9663b00fa1dc34a2da242a33e562595fec7b448bdce1" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.8%2Bk3s1/k3s-images.txt", + "sha256": "7a53b3def0199b17de6ec690d13ae2001fb83809258d28d985eafa69869c3aa9" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix index a689a6065a33..495e9258de05 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.7+k3s1"; - k3sCommit = "e050ca66d129762a00599628e6f55cfdfab3a7ba"; - k3sRepoSha256 = "1q531x745ypc08wp43yf0mh0r90gpi6r8bqbmgpvx0nvv9gwn8sb"; - k3sVendorHash = "sha256-WQPXRwW50/6e1MPnuQCAICROVlrMfARUdHJAgJ7UwQQ="; + k3sVersion = "1.31.8+k3s1"; + k3sCommit = "33429f764d560f617c049e4ebb323c00963419c0"; + k3sRepoSha256 = "0dpp3gi2g4qqi0szz53j9z06bcgkdzh3c64651d8zjjj151rmhwv"; + k3sVendorHash = "sha256-vQQGJOFNO2rCJ/UWxWYgH617DctCmTF6eqH7Yq5T+2Q="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; From 02b963f5eeefdf93c692be81b52d25ffa7c24b14 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 5 May 2025 12:55:57 +0200 Subject: [PATCH 4/5] k3s_1_32: 1.32.3+k3s1 -> 1.32.4+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.32.4%2Bk3s1 --- .../cluster/k3s/1_32/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_32/versions.nix | 8 ++++---- 2 files changed, 12 insertions(+), 12 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 0e30a88e86ec..fe7dd8574860 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "2c81a3f3527c590180cd71717ea23d83d023669b38439720fdce62fe23543536" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "2c27bf09b90459947dff497ca5028adefa8f8f3d2ae96a3164c11b8a5ed3bb86" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.3%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "97ae9c9825844a0fc034b8a4cb35e739cf10991e633ad2a586899d2a5aa6492d" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "5a3b7228988bfe725b6bfca0a8cf357dc4fe474ea910663a29d2fe58ab8065c9" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "80423c5023a7d2e3ad65e59293e46a01f5d5679c371a444d76a86b1cd2f474d1" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "3b9131e8f51b9e8b9c1a1ceb5e51ebc245959aa50446def1a4323cf9340dfe0c" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.3%2Bk3s1/k3s-images.txt", - "sha256": "11373c7d60ed0db9b761b07b80b66240b426bef0ecc34d6f1ac91cd9d1ff085e" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.4%2Bk3s1/k3s-images.txt", + "sha256": "aa8e10337aef453cb17e6408dbaec9eb2da409ca6ba1f8bc7332fcef97fdaf3a" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix index f5aa4ee5a829..976a65943bc3 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.3+k3s1"; - k3sCommit = "079ffa8d99fb859cb8c001455e47efa65535d832"; - k3sRepoSha256 = "1cvd0668ca06ahhmkhrxwymfpssw75rjfv5n9yajzg1dmkv0cmrv"; - k3sVendorHash = "sha256-1Kd6gt1envXmzFAtwhjPe9LLsllt2bQ7sryamGcaLRs="; + k3sVersion = "1.32.4+k3s1"; + k3sCommit = "6b330558e47a257134434508c851193bb4e9bf9d"; + k3sRepoSha256 = "1ss7w5b5k7hjd9szx7p7cqvdqddb71iddqsf6dxkk9r1g5z7sbs5"; + k3sVendorHash = "sha256-e7uLDjCR/q04HwOHTb1E5gGiwKDN2Hbxmym7qJxfpWU="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; From b97665a7cbc7236ea408eac897885e5d6056c749 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Tue, 6 May 2025 08:16:25 +0200 Subject: [PATCH 5/5] k3s: remove timeout for importing container images in test The timeout caused the `airgap-images` test to fail on slower hardware. --- nixos/tests/k3s/airgap-images.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/k3s/airgap-images.nix b/nixos/tests/k3s/airgap-images.nix index ade04c99840a..84a535feb7fc 100644 --- a/nixos/tests/k3s/airgap-images.nix +++ b/nixos/tests/k3s/airgap-images.nix @@ -31,7 +31,7 @@ import ../make-test-python.nix ( start_all() machine.wait_for_unit("k3s") - machine.wait_until_succeeds("journalctl -r --no-pager -u k3s | grep \"Imported images from /var/lib/rancher/k3s/agent/images/\"", timeout=120) + machine.wait_until_succeeds("journalctl -r --no-pager -u k3s | grep \"Imported images from /var/lib/rancher/k3s/agent/images/\"") images = json.loads(machine.succeed("crictl img -o json")) image_names = [i["repoTags"][0] for i in images["images"]] with open("${k3s.imagesList}") as expected_images: