From 85897256dcd264dd9174aa9040e3ff2ff9567199 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 8 Dec 2025 19:40:32 +0100 Subject: [PATCH] rke2_1_31: drop The 1.31 release is no longer supported --- .../cluster/rke2/1_31/images-versions.json | 138 ------------------ .../networking/cluster/rke2/1_31/versions.nix | 12 -- .../networking/cluster/rke2/default.nix | 10 -- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 5 files changed, 1 insertion(+), 161 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/rke2/1_31/images-versions.json delete mode 100644 pkgs/applications/networking/cluster/rke2/1_31/versions.nix diff --git a/pkgs/applications/networking/cluster/rke2/1_31/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_31/images-versions.json deleted file mode 100644 index 7179169e4639..000000000000 --- a/pkgs/applications/networking/cluster/rke2/1_31/images-versions.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "images-calico-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "bb3f3801eaf707df00572fd75138c40516abb1d8ebb2dc050861e0e86fcdb21a" - }, - "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "91c03b11730f9027e133ac3fd0e660a1c277f7874ec195c014ec70060bc8c940" - }, - "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "729c658fb71c9cb4137735ba34f864a0fe9e27a73e051549a00287574b6b5982" - }, - "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "672727e889c990afa97974f2a0fc508f7c0f22d6fb80c30f6568720b6f7991ce" - }, - "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "9de9e9b8cd86b1b568ce454c88c3f6ab809c40306521a78e6f06973e5e9c35e0" - }, - "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", - "sha256": "e040e9b1c5b7dfa83eb1feffa6bda5befd0bbcb530246b9205b07dd49bae3165" - }, - "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "3e2e8078d36c841e4316ab36b6933d2113783d0bcb546728a796f9571cd8e408" - }, - "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", - "sha256": "6bcfb2ca82625bf040ca32a2277f34ecb3d6a544acc9536e450d4fd0986fce3f" - }, - "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "6f7207120d47a24582cbe2b18d9ec4f825843d6a2bcdef123de4bd1f8a8a9a36" - }, - "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "6b75de7bb9ed96a6586d70754d146fd4d0d2e2ebd70d91ec84da43cfd69c47ee" - }, - "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "6096fcf06633938d5c5d27458977760306d3d186c7ba00ec19f2aafd5876488c" - }, - "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "b5095272ed499a3afdf243ccb36d982be702b7131f2241905cb60c73f4842a1d" - }, - "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "e82c0cf1f6f1cb8722b8c68ca3cbbf11f84ce3e3826621643fd40d1fd249d2ff" - }, - "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "aece7dc2fe3d1965ff593c6a718c037bf4b465145ae9df625391c1a7eb352f98" - }, - "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "f096d5e248d41a5e6ed9a06fb1d661ed82826c63cbed7d7402d77779d4431a90" - }, - "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "ad07b9f80f27564f4b26b62621a77bc5623588b1acf2e9eabec1bfaf0434400b" - }, - "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "a28a27426c234c0f2b45ff47b7d74a0b24923f53965c65fc17f703b99c4d58a8" - }, - "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", - "sha256": "b67b55c5d66f990c41478bff28ccfc1ea1aa67d750fcef778b383ce87361c9f4" - }, - "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "a0893b10b85bd5dbbd5693df6ffecc40bfaf88e247e47f5ffeb203a5ef3ef372" - }, - "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", - "sha256": "2091e9badbc1955b2c5b31976137a72c863730b8dbffb83a45a0d5f11f6773d9" - }, - "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "232fea1650044b968a3f60798795e8d13f6b6c783ea95f8fd4c29f4c708f1867" - }, - "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "f827e615c5411e1fef08e56c82055646c0375ab2d4432b9362fe90baf9e6bff1" - }, - "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "f3e478ace2af1207be5f05b0eda496534456b8d6e4cd2fcca1163d4ea0df5727" - }, - "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "22a6d20f0fd1ba4060b42899747b52527bdfcd410b9dd8d0d40e121caf4eb5e5" - }, - "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "2904bb319a2a9b50566a12a6f7c4c3c11aee4b319510f15da51965bdef3f0de8" - }, - "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", - "sha256": "b01d3898c8bf13b3357b2afcb6870e2b4d86aafc17c07160e27c5c5555d97cae" - }, - "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "c2167ff4eae80bef4073c8e5ae6a1c711bfe1dc423361bc18a6d79e40133965d" - }, - "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "f1d2675a78ddaf1b2460597eb073816b09d5f7793e58aec3b60e37e889a81237" - }, - "images-traefik-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", - "sha256": "1e171a926929c663098f9f2bce5979d5b509b6408a844a925b1357da6ff1f0c0" - }, - "images-traefik-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", - "sha256": "fcd70d9b9c0adefd23ec53e6fa805067ed401909967d11c4cc15d84090c55768" - }, - "images-traefik-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", - "sha256": "3de32e76b4291e7341db4d38f78afbacc1a94346a46462db309ea6b6b7f7b199" - }, - "images-traefik-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", - "sha256": "454e68db0a4cdac415fa42eb0ab51601b9877038733530493d9e77657ce590e4" - }, - "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "6538ef3e4dc067deccd6ad97cf8fe0a61ca43163611fef99be0359beeb6fca66" - }, - "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.31.14%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "74eab5ac15780caa1f3edebfa7781efc0245a2b4dacbc001c2d849b608b813f7" - } -} diff --git a/pkgs/applications/networking/cluster/rke2/1_31/versions.nix b/pkgs/applications/networking/cluster/rke2/1_31/versions.nix deleted file mode 100644 index 54a5f5dc157c..000000000000 --- a/pkgs/applications/networking/cluster/rke2/1_31/versions.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - rke2Version = "1.31.14+rke2r1"; - rke2Commit = "a594ea8cf80ad7b2b55f1b0286b34c8af7d53c30"; - rke2TarballHash = "sha256-1IQdJPF546DX7eHPoA0rIfUJs3uZSTDXfn5OnJbU7FQ="; - rke2VendorHash = "sha256-HmJyX7QsuB5g0bajgExMi2rg9jTTTUZiuYXlrfNA5xo="; - k8sImageTag = "v1.31.14-rke2r1-build20251112"; - etcdVersion = "v3.5.21-k3s1-build20251017"; - pauseVersion = "3.6"; - ccmVersion = "v1.31.14-0.20251010190929-c49b201b7cf5-build20251017"; - dockerizedVersion = "v1.31.14-rke2r1"; - imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); -} diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix index 91ec86ba707e..24e1550c065d 100644 --- a/pkgs/applications/networking/cluster/rke2/default.nix +++ b/pkgs/applications/networking/cluster/rke2/default.nix @@ -5,16 +5,6 @@ let extraArgs = removeAttrs args [ "callPackage" ]; in rec { - rke2_1_31 = common ( - (import ./1_31/versions.nix) - // { - updateScript = [ - ./update-script.sh - "31" - ]; - } - ) extraArgs; - rke2_1_32 = common ( (import ./1_32/versions.nix) // { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a388c14de2a5..369e2a634567 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1396,6 +1396,7 @@ mapAliases { river = throw "'river' has been renamed to/replaced by 'river-classic'"; # Added 2025-08-30 rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05 rke2_1_30 = throw "'rke2_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-11-04 + rke2_1_31 = throw "'rke2_1_31' has been removed from nixpkgs as it has reached end of life"; # Added 2025-12-08 rl_json = throw "'rl_json' has been renamed to/replaced by 'tclPackages.rl_json'"; # Converted to throw 2025-10-27 rockbox_utility = throw "'rockbox_utility' has been renamed to/replaced by 'rockbox-utility'"; # Converted to throw 2025-10-27 rockcraft = throw "rockcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # Added 2025-09-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5b6b5b8c757..3239ee2e84e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11959,7 +11959,6 @@ with pkgs; callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { }; inherit (callPackage ../applications/networking/cluster/rke2 { }) - rke2_1_31 rke2_1_32 rke2_1_33 rke2_1_34