diff options
4 files changed, 30 insertions, 1 deletions
diff --git a/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix new file mode 100644 index 000000000000..1acca4d0e101 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.2+up25.0.0.tgz"; + sha256 = "0jygzsn5pxzf7423x5iqfffgx5xvm7c7hfck46y7vpv1fdkiipcq"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.2+up25.0.0.tgz"; + sha256 = "1g9n19lnqdkmbbr3rnbwc854awha0kqqfwyxanyx1lg5ww8ldp89"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix new file mode 100644 index 000000000000..960a5b2ad846 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix @@ -0,0 +1,14 @@ +{ + k3sVersion = "1.28.3+k3s2"; + k3sCommit = "bbafb86e91ae3682a1811119d136203957df9061"; + k3sRepoSha256 = "0vbkz8p6bf32lg4n3p5prbghi0wm30nsj6wfmyqacxzzmllqynyk"; + k3sVendorHash = "sha256-DHj2rFc/ZX22uvr3HuZr0EvM2gbZSndPtNa5FYqv08o="; + chartVersions = import ./chart-versions.nix; + k3sRootVersion = "0.12.2"; + k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; + k3sCNIVersion = "1.3.0-k3s1"; + k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av"; + containerdVersion = "1.7.7-k3s1"; + containerdSha256 = "08dxafbac31s0gx3yaj1d53l0lznpj0hw05kiqx23k8ck303q4xj"; + 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 e2ba162b7581..9611f3770e09 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -20,4 +20,9 @@ in 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_26 + k3s_1_28 = common ((import ./1_28/versions.nix) // { + updateScript = [ ./update-script.sh "28" ]; + }) extraArgs; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56c6c19f31c5..2b2bd10b16a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32997,7 +32997,7 @@ with pkgs; }; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo120Module; - }) k3s_1_26 k3s_1_27; + }) k3s_1_26 k3s_1_27 k3s_1_28; k3s = k3s_1_27; k3sup = callPackage ../applications/networking/cluster/k3sup { }; |