diff options
| author | Pascal Bach <pascal.bach@nextrem.ch> | 2024-01-04 22:50:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-04 22:50:57 +0100 |
| commit | ec8afcc2600dc6bad985091e6d5e5258cb8e3350 (patch) | |
| tree | a298e5a0d9cb17d14c2d2034931b10a2a6779b0f /pkgs/applications/networking/cluster/k3s | |
| parent | 974e39287e2e7c739425b3b4da3d0ebcd1768ef9 (diff) | |
| parent | d31efc291a7d97c46dedc7aa3b6a348bcff67859 (diff) | |
| download | nixlib-ec8afcc2600dc6bad985091e6d5e5258cb8e3350.tar nixlib-ec8afcc2600dc6bad985091e6d5e5258cb8e3350.tar.gz nixlib-ec8afcc2600dc6bad985091e6d5e5258cb8e3350.tar.bz2 nixlib-ec8afcc2600dc6bad985091e6d5e5258cb8e3350.tar.lz nixlib-ec8afcc2600dc6bad985091e6d5e5258cb8e3350.tar.xz nixlib-ec8afcc2600dc6bad985091e6d5e5258cb8e3350.tar.zst nixlib-ec8afcc2600dc6bad985091e6d5e5258cb8e3350.zip | |
Merge pull request #276067 from wrmilling/k3s-1_29
k3s_1_29: init at 1.29.0
Diffstat (limited to 'pkgs/applications/networking/cluster/k3s')
3 files changed, 29 insertions, 0 deletions
diff --git a/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix new file mode 100644 index 000000000000..1acca4d0e101 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_29/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_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix new file mode 100644 index 000000000000..00bc1476306d --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -0,0 +1,14 @@ +{ + k3sVersion = "1.29.0+k3s1"; + k3sCommit = "3190a5faa28d7a0d428c756d67adcab7eb11e6a5"; + k3sRepoSha256 = "1g75a7kz9nnv0vagzhggkw0zqigykimdwsmibgssa8vyjpg7idda"; + k3sVendorHash = "sha256-iHmPVjYR/ZLH9UZ5yNEApyuGQsEwtxVbQw7Pu7WrpaQ="; + chartVersions = import ./chart-versions.nix; + k3sRootVersion = "0.12.2"; + k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; + k3sCNIVersion = "1.3.0-k3s1"; + k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av"; + containerdVersion = "1.7.11-k3s2"; + containerdSha256 = "0279sil02wz7310xhrgmdbc0r2qibj9lafy0i9k24jdrh74icmib"; + criCtlVersion = "1.29.0-k3s1"; +} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 9611f3770e09..934f5a3691cd 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -25,4 +25,9 @@ in 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_26 + k3s_1_29 = common ((import ./1_29/versions.nix) // { + updateScript = [ ./update-script.sh "29" ]; + }) extraArgs; } |