Unverified Commit 0559aa4e authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #223740 from r-ryantm/auto-update/k3s 

k3s: 1.26.2+k3s1 -> 1.26.3+k3s1
parents 463643af 72d8ae6e

pkgs/applications/networking/cluster/k3s/1_26/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -47,10 +47,10 @@ 
# Those pieces of software we entirely ignore upstream's handling of, and just

# make sure they're in the path if desired.

let

  k3sVersion = "1.26.2+k3s1";     # k3s git tag

  k3sCommit = "ea094d1d497b26538b61b5cbc27c1a4a1f2f3f24"; # k3s git commit at the above version

  k3sRepoSha256 = "13jrxr0imgkwl7bay4rrq9iv7ipak9hlmn82x9shr63hihlw7z9l";

  k3sVendorSha256 = "sha256-4uIOjHStU/DZk6YBdfC0F4L9z+csekMTjENJKpMmgx0=";

  k3sVersion = "1.26.3+k3s1";     # k3s git tag

  k3sCommit = "01ea3ff27be0b04f945179171cec5a8e11a14f7b"; # k3s git commit at the above version

  k3sRepoSha256 = "1wpciikmr4l2nw92i3wlz301vxjiyz8rlzkn8jhzcaiifykc565s";

  k3sVendorSha256 = "sha256-1HFLj3zSHV7RvA0fsQ/dPzwnkSRqE9TXXDA4m8OhwZE=";



  # nix generated by update.sh

  # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32
@@ -67,8 +67,8 @@ let 
  k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl";



  # taken from ./scripts/version.sh VERSION_CONTAINERD

  containerdVersion = "1.6.15-k3s1";

  containerdSha256 = "1bzmryqqdpmxl4471wda5q9hqjlgzcmsbwxcwd2ap34qx27my1qd";

  containerdVersion = "1.6.19-k3s1";

  containerdSha256 = "12dwqh77wplg30kdi73d90qni23agw2cwxjd2p5lchq86mpmmwwr";



  # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag

  criCtlVersion = "1.26.0-rc.0-k3s1";