Unverified Commit 473a5307 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

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

k3s: 1.26.0+k3s2 -> 1.26.1+k3s1
parents 04bb937e e28154dc

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

+6 −6
Original line number Diff line number Diff line
@@ -45,10 +45,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.0+k3s2";     # k3s git tag

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

  k3sRepoSha256 = "0yc2k45s321hjir3c2wabqihk96wbjxp274dpbh9kv3471j89lkm";

  k3sVendorSha256 = "sha256-ptC39SgzCA4CULA+VmcMGlPG8KsLRbWlVI/jQrrF/RU=";

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

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

  k3sRepoSha256 = "13h20yb9gyrclhv2r0vv7fnsr73i06686rm6r0pcvy72hw26i848";

  k3sVendorSha256 = "sha256-WvkuXHG6NM9eScuu7qG3HDZbBPAJ6xVPz3RRuAxP994=";



  # nix generated by update.sh

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



  # taken from ./scripts/version.sh VERSION_CONTAINERD

  containerdVersion = "1.6.14-k3s1";

  containerdSha256 = "01zs2xbpmww6hdh248px4dlh1n7xy9gzj2b8afyfmv3c2m2alf5p";

  containerdVersion = "1.6.15-k3s1";

  containerdSha256 = "1bzmryqqdpmxl4471wda5q9hqjlgzcmsbwxcwd2ap34qx27my1qd";



  # 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";