Skip to content

Commit

Permalink
Bring k3s_1_27 back
Browse files Browse the repository at this point in the history
This is basically a revert of commit 7e891c6
with modifications in all-packages.nix. It isn't strictly revertable
because multiple changes happened for other or all k3s versions after that
commit. We keep the current upstream nixpkgs code for newer versions but
bring back the original import for k3s 1.27 from before that commit
because I'm not sure if k3s 1.27 would work properly with the newer Go
version and we want to keep it running as it is now.

The clusters using the outdated version should be upgraded asap as 1.27
is EOL for some months now.

PL-133043
  • Loading branch information
dpausp authored and nixpkgs-channel-update-tracker[bot] committed Nov 12, 2024
1 parent 65e87f8 commit 0149a57
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 1 deletion.
10 changes: 10 additions & 0 deletions pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
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";
};
}
14 changes: 14 additions & 0 deletions pkgs/applications/networking/cluster/k3s/1_27/versions.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
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";
}
11 changes: 11 additions & 0 deletions pkgs/applications/networking/cluster/k3s/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@ 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)
Expand Down
1 change: 0 additions & 1 deletion pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,6 @@ 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-09-06
# 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
Expand Down
5 changes: 5 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32033,6 +32033,11 @@ with pkgs;

jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };

inherit (callPackage ../applications/networking/cluster/k3s {
buildGoModule = buildGo121Module;
go = go_1_21;
}) k3s_1_27;

inherit (callPackage ../applications/networking/cluster/k3s { })
k3s_1_28
k3s_1_29
Expand Down

0 comments on commit 0149a57

Please sign in to comment.