From c6c9550ed5b29022817fde616b9c2d398d8c18e2 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Mon, 5 May 2025 13:55:30 +0200 Subject: [PATCH] rke2_1_29: remove EOL at 2025-02-28 --- .../cluster/rke2/1_29/images-versions.json | 122 ------------------ .../networking/cluster/rke2/1_29/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(+), 145 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/rke2/1_29/images-versions.json delete mode 100644 pkgs/applications/networking/cluster/rke2/1_29/versions.nix diff --git a/pkgs/applications/networking/cluster/rke2/1_29/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_29/images-versions.json deleted file mode 100644 index f336be5f8284..000000000000 --- a/pkgs/applications/networking/cluster/rke2/1_29/images-versions.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "images-calico-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "020d5dfa9f00591444e57223bd0cd236bb4ad8f0fae6e5cc19a60fa71b0096cd" - }, - "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "004cb2dbd99b15a311a68697a89f3747de9dbf643654bf52db19b5ad12f809a7" - }, - "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "df9502035dfdca214a4c4ef7353ff6a9b003e14baf81d6c34a4d72ac85837062" - }, - "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "acbc610d1def7f24c47832b5e93780e7cd0f8fd7ce74f8fd3ff29fab713feb32" - }, - "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "ba47ab111cda68836b36f1480d63b088d0de6a97d3ac511d1be57ed714ad0860" - }, - "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", - "sha256": "e0e8d9757a0f5445a33ce83c4c96d5c5023d70288fa4ee34103d3375e912b2b2" - }, - "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "e1411b8a65525573f36df2587829dd6ba2565ed5961f818bcef532fd8ad64296" - }, - "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", - "sha256": "7dd696507da2fbc4e6e4d7b730fc8df0cb2c216614020217d77f58d10703f11a" - }, - "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "9107d48dcc8b1839d2f910005737327d0f3c653472caf0588f0824f77603300f" - }, - "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "0ce5b126150c0d5f11529bb9cfb945cf2da342c06aa432e3df79cb896eceef9f" - }, - "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "1d8870e6369bbb56cfbfa3bdcc5b81c329d021a4b2183654c301f82f4a6fe65e" - }, - "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "eb1d54688eacadc97cf77a6e6cbb039182596d0b895cebfb40e71786944f0358" - }, - "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "98c366348a67572702c1332c71d81b98b14c3bf4ca4f1e0a5caedab462bf61b3" - }, - "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "41616e68c3e456dea8d5e40158857c27bc786eade7a1c7dbb4621b372971f17e" - }, - "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "ef4a9b0acaaac2341c54741107c653efb2610d3d443c03cb2947a7d9076415dc" - }, - "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "d7f5ee3b12399082c4b52b4513f581c257123989dff1dbba822e9343ceb92139" - }, - "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "8c0e75adf064bd1cc37df4b6a0c01edebbd1381fcc49799b589d072f8919bb14" - }, - "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", - "sha256": "a3b13a559f4ea866774e93d0c9883bea7ff2eb9fb4832529e8c7e7fee924ca2b" - }, - "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "035142ddea7ce5ad3e30a485cda3091c86bda22c1f106614327a9ab4504a9ec3" - }, - "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", - "sha256": "28b1d7fc4544296724031007ae29415d7ee128354b8bcdc90bd13b328f3122d1" - }, - "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "b571e832903c6f9abe94bea4c4128eb4784d11c6b4a53030e29bccdb6205338d" - }, - "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "b464b22d3fcd708f09b659f730773f6ca9340dc0b5c5e703ea9b69af4c9919b3" - }, - "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "99d014012b54a64bd9c0387fc81615bcc6a9095dca87ddf256a4d14cdf93c511" - }, - "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "1e46a193719b2e1394f133b071a8bfe60081160c929d38973d34b600380a2080" - }, - "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "ac1e5082d27473d81d7fa8f7765e4023878ca92c27878ed0cd99accfb8d8b38e" - }, - "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", - "sha256": "087148184e0e06ef58111ac336b58ad62c061189d0d0dd7c316a842732449c05" - }, - "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "49d1914afe109bd6b1e5c56435cb3cd4ed79ae4688f11ade33b37f4e9a592f77" - }, - "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "f14ab45b4d315ea27787f4741a0eb4bc0bff7a9ecb498da5694ce991097becd8" - }, - "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "3ce2832234efde4dfc61d74debb380ac245ec9828aa7613e8ff9204207038069" - }, - "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.29.15%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "b182062f8eff3e71d6e8afea8b5e2cbadfa3d02d092744cd05673803cb464746" - } -} diff --git a/pkgs/applications/networking/cluster/rke2/1_29/versions.nix b/pkgs/applications/networking/cluster/rke2/1_29/versions.nix deleted file mode 100644 index 862a51b7aabd..000000000000 --- a/pkgs/applications/networking/cluster/rke2/1_29/versions.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - rke2Version = "1.29.15+rke2r1"; - rke2Commit = "c228232895f83b6c3e17a9741e0c8d8e4439894d"; - rke2TarballHash = "sha256-ZvujSxuTsM6oBNEehQSMmCkbSTsp8sBZd00vwJGx5Lk="; - rke2VendorHash = "sha256-PhJgHvVCZAxWK78cn0pURC/Oy63/V41k0ZFn4sveCPY="; - k8sImageTag = "v1.29.15-rke2r1-build20250312"; - etcdVersion = "v3.5.19-k3s1-build20250306"; - pauseVersion = "3.6"; - ccmVersion = "v1.29.10-0.20241016053521-9510ac25fefb-build20241016"; - dockerizedVersion = "v1.29.15-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 264770a242af..31fadb41ac29 100644 --- a/pkgs/applications/networking/cluster/rke2/default.nix +++ b/pkgs/applications/networking/cluster/rke2/default.nix @@ -5,16 +5,6 @@ let extraArgs = builtins.removeAttrs args [ "callPackage" ]; in rec { - rke2_1_29 = common ( - (import ./1_29/versions.nix) - // { - updateScript = [ - ./update-script.sh - "29" - ]; - } - ) extraArgs; - rke2_1_30 = common ( (import ./1_30/versions.nix) // { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 162b19d07af5..59a69b489a2a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1679,6 +1679,7 @@ mapAliases { riko4 = throw "'riko4' has been removed as it was unmaintained, failed to build and dependend on outdated libraries"; # Added 2025-05-18 rippled = throw "rippled has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25 rippled-validator-keys-tool = throw "rippled-validator-keys-tool has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25 + rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05 rke2_testing = throw "'rke2_testing' has been removed from nixpkgs as the RKE2 testing channel no longer serves releases"; # Added 2025-06-02 rl_json = tclPackages.rl_json; # Added 2025-05-03 rockbox_utility = rockbox-utility; # Added 2022-03-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91e9769d22e0..d57bd8fdcae7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13869,7 +13869,6 @@ with pkgs; callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { }; inherit (callPackage ../applications/networking/cluster/rke2 { }) - rke2_1_29 rke2_1_30 rke2_1_31 rke2_1_32