dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #269023 from wrmilling/k3s-1_28

Browse Source 
k3s_1_28: init at 1.28.3
This commit is contained in:
Emily Trau 2023-11-29 19:53:39 +11:00 committed by GitHub
commit 69efc941ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/cluster/k3s/1_28/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_28/versions.nix Normal file
View File

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

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

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

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

@ -33003,7 +33003,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 { };