diff --git a/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix deleted file mode 100644 index 7f65917312ed..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_28/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_28/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json deleted file mode 100644 index 449fa538cbd3..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "0p14llji8m1pfi289w29smx6sbad6qhgxk9drwlyrfdywrhd04ly" - }, - "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "054apgl2al8822f399ir81jbid9mfs27d4by7xkkpdbqr3fywbr6" - }, - "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "19hzamg68zc1k90a9m6p2jnpy2p7v437kvgqsw198bhy796f6asb" - }, - "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-images.txt", - "sha256": "05229bfg174pvy525dcy7rvmgv9i9v1nnz5ngq80n7zkxj9cp8m8" - } -} diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix deleted file mode 100644 index e03aa9f0eaf6..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - k3sVersion = "1.28.15+k3s1"; - k3sCommit = "869dd4d62626f5ba4afe3a923d77b2047c565a43"; - k3sRepoSha256 = "1nijdii01004v2cgpaw0xnzyrljd4iw00wca1lg6szhqmj28gcfv"; - k3sVendorHash = "sha256-zWBMZrpRJzzc4yAIWAnWnmVE7qr7bscJjHrHdDD0Ilg="; - chartVersions = import ./chart-versions.nix; - imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.14.0"; - k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; - k3sCNIVersion = "1.5.1-k3s1"; - k3sCNISha256 = "1bkz78p77aiw64hdvmlgc5zir9x8zha8qprfaab48jxbcsj3dfi7"; - containerdVersion = "1.7.22-k3s1.28"; - containerdSha256 = "0jpq03n5q8aydw4y14w9fl4fqixpdcw42gwvmsp3z3qplbvwkfkl"; - 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 59fd6b1be344..ac960f233907 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_28 can be built with the same builder as 1_30 - k3s_1_28 = common ( - (import ./1_28/versions.nix) - // { - updateScript = [ - ./update-script.sh - "28" - ]; - } - ) extraArgs; - # 1_29 can be built with the same builder as 1_30 k3s_1_29 = common ( (import ./1_29/versions.nix) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 115ad0035cb8..65b6a4bcec0c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -585,6 +585,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 # 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 e2ba978dc202..b49427424818 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14417,7 +14417,6 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; inherit (callPackage ../applications/networking/cluster/k3s { }) - k3s_1_28 k3s_1_29 k3s_1_30 k3s_1_31