pyrox.dev
Merge pull request #171999 from euank/k3s-1.23.6
k3s: 1.23.5+k3s1 -> 1.23.6+k3s1
+9
-12
pkgs/applications/networking/cluster/k3s/default.nix
+9
-12
pkgs/applications/networking/cluster/k3s/default.nix
···
46
46
# Those pieces of software we entirely ignore upstream's handling of, and just
47
47
# make sure they're in the path if desired.
48
48
let
49
-
k3sVersion = "1.23.5+k3s1"; # k3s git tag
50
-
k3sCommit = "313aaca547f030752788dce696fdf8c9568bc035"; # k3s git commit at the above version
51
-
k3sRepoSha256 = "0vk72609cyyh64irp14jp2zspnxw34jm710cbwgklx0ch6kiz88d";
52
-
k3sVendorSha256 = "sha256-d7kQsJi/eQbaTUDglp3gFpc5Im6CyD9coKeM3kMrbjI=";
53
-
54
-
k3sServerVendorSha256 = "sha256-E3USXNuXY0lzZH+t3O7BOQ8rKNNQ6avOMItgOEi1cEg=";
49
+
k3sVersion = "1.23.6+k3s1"; # k3s git tag
50
+
k3sCommit = "418c3fa858b69b12b9cefbcff0526f666a6236b9"; # k3s git commit at the above version
51
+
k3sRepoSha256 = "0fmw491dn5mpi058mr7sij51i5m4qg2grx30cnl3h2v4s0sdkx2i";
52
+
k3sVendorSha256 = "sha256-iHg5ySMaiSWXs98YGmxPwdZr4zdBIFma12dNEuf30Hs=";
55
53
56
54
# taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
57
55
# The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
58
-
traefikChartVersion = "10.14.1";
59
-
traefikChartSha256 = "09a6cialx7nrh7nwi1gkkh8zcsasxcgb52dyx0r8bjq9ng29simj";
56
+
traefikChartVersion = "10.19.3";
57
+
traefikChartSha256 = "04zg5li957svgscdmkzmzjkwljaljyav68rzxmhakkwgav6q9058";
60
58
61
59
# taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47
62
60
k3sRootVersion = "0.11.0";
···
68
66
69
67
# taken from go.mod, the 'github.com/containerd/containerd' line
70
68
# run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'`
71
-
containerdVersion = "1.5.10-k3s1";
72
-
containerdSha256 = "1ff2sfaqpjimq7w0lprci6ibyi6v65ap6b9sr6b0j12gqr2sqwa5";
69
+
containerdVersion = "1.5.11-k3s2";
70
+
containerdSha256 = "16132snvrg8r0vwm6c0lz0q6fx686s2ix53nm3aka9a83xs75vf2";
73
71
74
72
# run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
75
73
criCtlVersion = "1.22.0-k3s1";
···
175
173
version = k3sVersion;
176
174
177
175
src = k3sRepo;
178
-
vendorSha256 = k3sServerVendorSha256;
176
+
vendorSha256 = k3sVendorSha256;
179
177
180
178
nativeBuildInputs = [ pkg-config ];
181
179
buildInputs = [ libseccomp ];
···
223
221
version = k3sVersion;
224
222
225
223
src = k3sRepo;
226
-
proxyVendor = true;
227
224
vendorSha256 = k3sVendorSha256;
228
225
229
226
patches = [
-13
pkgs/applications/networking/cluster/k3s/update.sh
-13
pkgs/applications/networking/cluster/k3s/update.sh
···
81
81
82
82
setKV criCtlVersion ${CRI_CTL_VERSION}
83
83
84
-
setKV k3sServerVendorSha256 "0000000000000000000000000000000000000000000000000000"
85
-
86
-
set +e
87
-
K3S_SERVER_VENDOR_SHA256=$(nix-build ${NIXPKGS_ROOT} --no-out-link -A k3s 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
88
-
set -e
89
-
90
-
if [ -n "${K3S_SERVER_VENDOR_SHA256:-}" ]; then
91
-
setKV k3sServerVendorSha256 ${K3S_SERVER_VENDOR_SHA256}
92
-
else
93
-
echo "Update failed. K3S_SERVER_VENDOR_SHA256 is empty."
94
-
exit 1
95
-
fi
96
-
97
84
set +e
98
85
K3S_VENDOR_SHA256=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })")
99
86
set -e