cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #276067 from wrmilling/k3s-1_29

Browse source 
k3s_1_29: init at 1.29.0
This commit is contained in:
Pascal Bach 2024-01-04 22:50:57 +01:00 committed by GitHub
commit ec8afcc260
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix Normal file
View file

@ -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";
};
}

14
pkgs/applications/networking/cluster/k3s/1_29/versions.nix Normal file
View file

@ -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";
}

5
pkgs/applications/networking/cluster/k3s/default.nix
View file

@ -25,4 +25,9 @@ in
k3s_1_28 = common ((import ./1_28/versions.nix) // { k3s_1_28 = common ((import ./1_28/versions.nix) // {
updateScript = [ ./update-script.sh "28" ]; updateScript = [ ./update-script.sh "28" ];
}) extraArgs; }) 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;
} }

2
pkgs/top-level/all-packages.nix
View file

@ -32961,6 +32961,8 @@ with pkgs;
inherit (callPackage ../applications/networking/cluster/k3s { inherit (callPackage ../applications/networking/cluster/k3s {
buildGoModule = buildGo120Module; buildGoModule = buildGo120Module;
}) k3s_1_26 k3s_1_27 k3s_1_28; }) k3s_1_26 k3s_1_27 k3s_1_28;
inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_29;
k3s = k3s_1_27; k3s = k3s_1_27;
k3sup = callPackage ../applications/networking/cluster/k3sup { }; k3sup = callPackage ../applications/networking/cluster/k3sup { };