From a94afacd53923e094417a69baaad0c66e81a7cd3 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 1 Jun 2024 13:01:10 -0300 Subject: [PATCH] k3s_1_27: remove EOL at 2024-06-28 --- .../networking/cluster/k3s/1_27/chart-versions.nix | 10 ---------- .../networking/cluster/k3s/1_27/versions.nix | 14 -------------- .../networking/cluster/k3s/default.nix | 11 ----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix delete mode 100644 pkgs/applications/networking/cluster/k3s/1_27/versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix deleted file mode 100644 index aaaa3d4c2970..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz"; - sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz"; - sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if"; - }; -} diff --git a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix deleted file mode 100644 index c7d03c0087b3..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - k3sVersion = "1.27.14+k3s1"; - k3sCommit = "b0b34e4d927369147a37f95ee8ba6441e4b4102b"; - k3sRepoSha256 = "0vvglvh8hl83jrpn9i2fgbck6cp7fbbwn292w76nmckmpclm47ap"; - k3sVendorHash = "sha256-eDzBpvaK1rHp28A5zvSsxnk0CNhy4oBSifBT98M7JWc="; - chartVersions = import ./chart-versions.nix; - k3sRootVersion = "0.12.2"; - k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; - k3sCNIVersion = "1.4.0-k3s2"; - k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.15-k3s1.27"; - containerdSha256 = "0bjxw174prhq8izmgrmpyljfxzrj0lh5d0w04g3lyn0rp3kwxqsl"; - criCtlVersion = "1.26.0-rc.0-k3s1"; -} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 6e7cfb0d1325..c8e3fbc92696 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -12,17 +12,6 @@ let extraArgs = builtins.removeAttrs args [ "callPackage" ]; in { - # 1_27 can be built with the same builder as 1_30 - k3s_1_27 = common ( - (import ./1_27/versions.nix) - // { - updateScript = [ - ./update-script.sh - "27" - ]; - } - ) extraArgs; - # 1_28 can be built with the same builder as 1_30 k3s_1_28 = common ( (import ./1_28/versions.nix) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9cccfbaa7caf..37536676bdf2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -600,6 +600,7 @@ mapAliases ({ k3s_1_24 = throw "'k3s_1_24' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 k3s_1_25 = throw "'k3s_1_25' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 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 # 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 3b86cd56e33a..350a1d9927c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32050,7 +32050,7 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo121Module; go = go_1_21; - }) k3s_1_27 k3s_1_28 k3s_1_29; + }) k3s_1_28 k3s_1_29; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo122Module; go = go_1_22;