From 389290becc535ae4f3b88f7c457cefec2a5febfe Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 29 Oct 2024 16:34:06 -0300 Subject: [PATCH 1/3] k3s_1_31: 1.31.1+k3s1 -> 1.31.2+k3s1 Release: https://github.com/k3s-io/k3s/releases/tag/v1.31.2%2Bk3s1 - Should fix data corruption on ordinary system shutdown #255783 --- .../cluster/k3s/1_31/chart-versions.nix | 8 ++++---- .../cluster/k3s/1_31/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_31/versions.nix | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix index aaaa3d4c2970..7f65917312ed 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz"; - sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz"; + sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz"; - sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz"; + sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json index afe4bedff9e4..dadd61aa1af9 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "1hq8bj2hlzbq9rhpx9ifidfkrzy1pknizksq641kazl7kv44wldy" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.2%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "0dfixvnra0havzmrnabjhpzvkxfqb3jdd12cbfyd76ann6ijrxn1" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.1%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "1mp8k98mzzn7fpyqjyvia13v2jri37nn3fdqdq3gmxrbcqvkh15g" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.2%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "06r6vifzd2dhx3md0i45cx2ynmzjgrd49iz09x1zissz223ic325" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "1gg30iln9grrw3qdwlqwcb0k1zafiwr2lj7vd64mmsm1fj057skw" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.2%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "11phgk5snb5ga1krm8nfssniarsd1pd3d4n59jzmjzwhznvq4v7n" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.1%2Bk3s1/k3s-images.txt", - "sha256": "1l71xhcj2z9fz3mn89iyyxznrgk59qgng549iq3zc8w3l0hl0qry" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.2%2Bk3s1/k3s-images.txt", + "sha256": "05229bfg174pvy525dcy7rvmgv9i9v1nnz5ngq80n7zkxj9cp8m8" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix index 98203d71ab2d..c74ca14810f5 100644 --- a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.31.1+k3s1"; - k3sCommit = "452dbbc14c747a0070fdf007ef2239a6e5d8d934"; - k3sRepoSha256 = "012j78bxhmjq7d0z0yzxzbvlhgzx9qi254cpk6s6mi3k60ay6bx2"; - k3sVendorHash = "sha256-CnfnyqrBQ9W1G6NORGSA5jB75Dvd1Hgu+KVITYrb6Mc="; + k3sVersion = "1.31.2+k3s1"; + k3sCommit = "6da204241bfd40220cb1af4cde35609e0c58df72"; + k3sRepoSha256 = "0n0sfvxnkz8d9prswmqd6paqisis05l0494znjy2y30418ql580x"; + k3sVendorHash = "sha256-SYIg/lYwIY/e0FQt59Ki4ROzhZ5HfJ03Hd0XE2LIIyc="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.0"; k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.5.1-k3s1"; k3sCNISha256 = "1bkz78p77aiw64hdvmlgc5zir9x8zha8qprfaab48jxbcsj3dfi7"; - containerdVersion = "1.7.21-k3s2"; - containerdSha256 = "0kp93fhmw2kiy46hw3ag05z8xwhw7kqp4wcbhsxshsdf0929g539"; + containerdVersion = "1.7.22-k3s1"; + containerdSha256 = "031rapiynpm7zlzn42l8z4m125lww2vyspw02irs4q3qb6mpx3px"; criCtlVersion = "1.31.0-k3s2"; } From 6fbdb9bcf61e71204b4ed3e038dcc95ce3c5cc78 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 29 Oct 2024 16:38:15 -0300 Subject: [PATCH 2/3] k3s_1_30: 1.30.5+k3s1 -> 1.30.6+k3s1 Release: https://github.com/k3s-io/k3s/releases/tag/v1.30.6%2Bk3s1 * Fixes data corruption on ordinary system shutdown (#255783) --- .../cluster/k3s/1_30/chart-versions.nix | 8 ++++---- .../cluster/k3s/1_30/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_30/versions.nix | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix index aaaa3d4c2970..7f65917312ed 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz"; - sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz"; + sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz"; - sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz"; + sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json index 224938362c20..a5606a6ca4e3 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.5%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "1fcdhhixxcbqxd8varz3vwz1qrkjpmxmwq74g14z7qafr7nqm757" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.6%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "02dpjxncil47ark7pim4gl32646y24a0lmsla153s6v3a89xp0iv" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.5%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "04d79m0lp8l53lgrpvhl6drn5jzdgjvaj32mcjq9y175f4knhiaw" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.6%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "1v8vwgm6xd5iav02j7qk68nhmd6irb0q96c8mxjjxv1s97hcr7il" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.5%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "1grhh38x3mpj86fn487dfmhgdvbjf61mz8fg8sc9dcqhvpi8rr3w" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.6%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "0h4cqg023p184y8glbiddang4kmg4znxl4kgzam6jajdvklvjxsh" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.5%2Bk3s1/k3s-images.txt", - "sha256": "1l71xhcj2z9fz3mn89iyyxznrgk59qgng549iq3zc8w3l0hl0qry" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.6%2Bk3s1/k3s-images.txt", + "sha256": "05229bfg174pvy525dcy7rvmgv9i9v1nnz5ngq80n7zkxj9cp8m8" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix index 30c6ffe97db0..2002c69e181d 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.30.5+k3s1"; - k3sCommit = "9b586704a211264ca86b22f2a0b4617b00412235"; - k3sRepoSha256 = "1fzpkfbk2x9xw9js9ns15g84c7q93knwx7fdmdj4af3830kplnnr"; - k3sVendorHash = "sha256-fs9p6ywS5XCeJSF5ovDG40o+H4p4QmEJ0cvU5T9hwuA="; + k3sVersion = "1.30.6+k3s1"; + k3sCommit = "1829eaae5250b78e24816a9088b0244c0332b369"; + k3sRepoSha256 = "1p792g2sf6sfwkz9zj7s9zzb27z11s2g3lp0ww2k0srj4yg5llpk"; + k3sVendorHash = "sha256-YYe1jzmYKCPVEZUKXOVufbOU2nSMrplkVXztZTKlZDI="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.0"; k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.5.1-k3s1"; k3sCNISha256 = "1bkz78p77aiw64hdvmlgc5zir9x8zha8qprfaab48jxbcsj3dfi7"; - containerdVersion = "1.7.21-k3s2"; - containerdSha256 = "0kp93fhmw2kiy46hw3ag05z8xwhw7kqp4wcbhsxshsdf0929g539"; + containerdVersion = "1.7.22-k3s1"; + containerdSha256 = "031rapiynpm7zlzn42l8z4m125lww2vyspw02irs4q3qb6mpx3px"; criCtlVersion = "1.29.0-k3s1"; } From 7011a66b4d498f1e68788ba74948c8b5f36126bc Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 31 Oct 2024 10:54:17 -0300 Subject: [PATCH 3/3] nixos/tests/k3s/etcd: add etcd health check --- nixos/tests/k3s/etcd.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/k3s/etcd.nix b/nixos/tests/k3s/etcd.nix index 2616ab02a609..7d9a7ba2b7d8 100644 --- a/nixos/tests/k3s/etcd.nix +++ b/nixos/tests/k3s/etcd.nix @@ -90,6 +90,9 @@ import ../make-test-python.nix ( with subtest("should wait for etcdctl endpoint status to succeed"): etcd.wait_until_succeeds("etcdctl endpoint status") + with subtest("should wait for etcdctl endpoint health to succeed"): + etcd.wait_until_succeeds("etcdctl endpoint health") + with subtest("should start k3s"): k3s.start() k3s.wait_for_unit("k3s")