From a874a55667d2c24bff0d9774fa79fdd336ce508e Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Fri, 28 Mar 2025 09:19:15 +0100 Subject: [PATCH 1/4] k3s: 1.29.14+k3s1 -> 1.29.15+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.29.15%2Bk3s1 --- .../cluster/k3s/1_29/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_29/versions.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json index 0c204891b043..b045a685e530 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.14%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "1b03a9b0f21f86e607a6d259805c6359c640ae10c08af487894cefe4f5f8182c" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.15%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "b3b340da3d88c6723f18cf6219edf50745d5a749cb552bd2d3eee0b1281dd5a2" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.14%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "caf185c0fb0bec69e9d4f74d4d08f0ab0086cf8d0c3909c39c17d175bf6ad612" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.15%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "571f0addf5253ed0e98864157c885fbd14fc67f8efcfd638cc36ade48f903b8c" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.14%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "69160276fb841a166c502beb32ab43fc38ecc3ed9c3064b569c4db0bdd0be692" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.15%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "f2fc003d8ec5c1ac66d0eeb9e410a443a0af3f5b23367d3578c55c6e9e0c618a" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.14%2Bk3s1/k3s-images.txt", - "sha256": "ca328934c0bb1d2ffb6b416020c689237a65190ad3eb564a300f12bb24d69110" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.15%2Bk3s1/k3s-images.txt", + "sha256": "81328fb53d1dfd0de1fb9663b00fa1dc34a2da242a33e562595fec7b448bdce1" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index 8c219b67f758..43fa8d0ff1e0 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.29.14+k3s1"; - k3sCommit = "6873bccf9cb3221bd422f0f88c2cde6f9855ef70"; - k3sRepoSha256 = "03f9k1psrdkhz8371q37xncdhshz961sqskw2w7w23pgngxfdqsl"; - k3sVendorHash = "sha256-RvDtV4n4qqi2KajmhjEELi6CFeJ1H+Fr4fgdrdoPVeA="; + k3sVersion = "1.29.15+k3s1"; + k3sCommit = "35a47239188444222067c25cc096346adb20401f"; + k3sRepoSha256 = "0vynlcnmhhf82hr2rv01km5jyp2c2zb7872nnd8kzdxdw3jcqp7x"; + k3sVendorHash = "sha256-+es8ua7JuDnUXej6hqE1ooFS81NhuoYYuA2+4CgUOmU="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; k3sCNIVersion = "1.6.0-k3s1"; k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7"; - containerdVersion = "1.7.23-k3s2"; - containerdSha256 = "0lp9vxq7xj74wa7hbivvl5hwg2wzqgsxav22wa0p1l7lc1dqw8dm"; + containerdVersion = "1.7.26-k3s1"; + containerdSha256 = "0snz0i7xmnvs8bj7140q0lsxqdv835hksvk36baw71w5mbm1w1xz"; criCtlVersion = "1.29.0-k3s1"; } From 88772e4590d9fae94eb0bfcfb6360c41b876bc21 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Fri, 28 Mar 2025 09:20:18 +0100 Subject: [PATCH 2/4] k3s: 1.30.10+k3s1 -> 1.30.11+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.30.11%2Bk3s1 --- .../cluster/k3s/1_30/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_30/versions.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) 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 846df8289f7e..651e9a4ccdc1 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.10%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "a467622184402c9a59cfcee596237120fb138bb65d781741592164c09ae64618" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "aba20bf6082fdccafc36c1ba79ba2705b2ef6f159a3455585c98cf128e767986" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.10%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "8d830cca9fc2afe38580ddb8f7a3051c4b8b3d18e9c5f8ba67edd777097b1312" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "658aa3c0672f2eb3305b262a7187d0fa7fa2759dccdca196612472a9fcc4fd48" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.10%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "c974d269a8f4220ec7cd86a4878bf8b7a66e7f30ff23cd3fbbd6c0662dc26094" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "f92a63c9f570afd4a9f33b69a441ce057ee4d31359026e9b699f519ae7b8a81a" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.10%2Bk3s1/k3s-images.txt", - "sha256": "ca328934c0bb1d2ffb6b416020c689237a65190ad3eb564a300f12bb24d69110" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.11%2Bk3s1/k3s-images.txt", + "sha256": "81328fb53d1dfd0de1fb9663b00fa1dc34a2da242a33e562595fec7b448bdce1" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix index b7cebb24dfef..23ce5c92fc2e 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.10+k3s1"; - k3sCommit = "b86a69470cd71af521a4b71499db74a600049f70"; - k3sRepoSha256 = "1k6msdfx9c4hwwq766yq99km48ck2p1ga2srrc13g17marn81vsr"; - k3sVendorHash = "sha256-HTUFv8WBIDiBQ860p3RiROF+kDzBekvgBAr2TJh036E="; + k3sVersion = "1.30.11+k3s1"; + k3sCommit = "c2662fbee6d24b3917cf078cbf2ff69cae501340"; + k3sRepoSha256 = "0zsl5p2dmj3mkcjxbrhsa40r8bhgcrql8r8cxach4nv6y7fcyan5"; + k3sVendorHash = "sha256-G7RUyFzg3B4X0tdKmD1ep9a4cnVkUmFqBP5t1s8uFLc="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; k3sCNIVersion = "1.6.0-k3s1"; k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7"; - containerdVersion = "1.7.23-k3s2"; - containerdSha256 = "0lp9vxq7xj74wa7hbivvl5hwg2wzqgsxav22wa0p1l7lc1dqw8dm"; + containerdVersion = "1.7.26-k3s1"; + containerdSha256 = "0snz0i7xmnvs8bj7140q0lsxqdv835hksvk36baw71w5mbm1w1xz"; criCtlVersion = "1.29.0-k3s1"; } From 9cb770073d5bd799406764553e1f040cbabac3b2 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Fri, 28 Mar 2025 09:21:12 +0100 Subject: [PATCH 3/4] k3s: 1.31.6+k3s1 -> 1.31.7+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.31.7%2Bk3s1 --- .../cluster/k3s/1_31/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_31/versions.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) 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 5fb153fd6b0c..2784691c211d 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.6%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "d064e908e382a2e2ff4c04121fd3a9c76e64be4c5c1ae00915a3708a1b6ef088" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "2666c3880447979079b94babccf12296706167a5747a0f94962b257bda442449" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.6%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "c4340a37939008d6fe36d65c0995bb1791d3a2408579afe5d5f4765b7da4f241" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "6698d8bcfb029f1d16e0f2aa1d53be09d026995d26a0e4bfd92292f49c68538b" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.6%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "bee0546d24eb6cbb9360e3281f68238c4539e9fa7ba3ad9a2b34fa7684b77edb" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "0c96ae243b40bb624f9cb34e2851c9cffc77e1ed0127b3e81a2e4a0ff56511a5" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.6%2Bk3s1/k3s-images.txt", - "sha256": "ca328934c0bb1d2ffb6b416020c689237a65190ad3eb564a300f12bb24d69110" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.7%2Bk3s1/k3s-images.txt", + "sha256": "81328fb53d1dfd0de1fb9663b00fa1dc34a2da242a33e562595fec7b448bdce1" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix index 07f5c127e09f..a689a6065a33 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.6+k3s1"; - k3sCommit = "6ab750f93f790b02553e4e22f7937e1c58e2b7ea"; - k3sRepoSha256 = "1zblm921w6lfl5mb04z8zn4hqhfn1sjq7q5n4kdfsdvllgdiprfs"; - k3sVendorHash = "sha256-1ExrTDHRJEfndmMDO4xDzwFNZQCJbHYUOHWcXJIwBGo="; + k3sVersion = "1.31.7+k3s1"; + k3sCommit = "e050ca66d129762a00599628e6f55cfdfab3a7ba"; + k3sRepoSha256 = "1q531x745ypc08wp43yf0mh0r90gpi6r8bqbmgpvx0nvv9gwn8sb"; + k3sVendorHash = "sha256-WQPXRwW50/6e1MPnuQCAICROVlrMfARUdHJAgJ7UwQQ="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; k3sCNIVersion = "1.6.0-k3s1"; k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7"; - containerdVersion = "2.0.2-k3s2"; - containerdSha256 = "1883srp3rlap0a6rx5dnbnxl67aijbymjrqdg7zg3a162j21xz3s"; + containerdVersion = "2.0.4-k3s2"; + containerdSha256 = "0v34nh6q0plb50s95gzdkrdfbbch7dps15fmddh5h241yfms8sq6"; criCtlVersion = "1.31.0-k3s2"; } From 15cf69dd7d464c4747619980e5ce38f56b1551cc Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Fri, 28 Mar 2025 09:21:49 +0100 Subject: [PATCH 4/4] k3s: 1.32.2+k3s1 -> 1.32.3+k3s1 https://github.com/k3s-io/k3s/releases/tag/v1.32.3%2Bk3s1 --- .../cluster/k3s/1_32/images-versions.json | 16 ++++++++-------- .../networking/cluster/k3s/1_32/versions.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json index 6b59788606d3..0e30a88e86ec 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_32/images-versions.json @@ -1,18 +1,18 @@ { "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.2%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "8195d384955fec1779b9504b4aa3010487c2962e4b6bcc44679e3ccfeaa8c30a" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "2c81a3f3527c590180cd71717ea23d83d023669b38439720fdce62fe23543536" }, "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.2%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "9ef05658c4cc581622ae681197d2d8c8da460f0fa33579355d4554d760305b64" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.3%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "97ae9c9825844a0fc034b8a4cb35e739cf10991e633ad2a586899d2a5aa6492d" }, "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.2%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "7b3eee2ff1c98081eb16cbdbae1f562da0f9a969467d8a1030a39934637acf07" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "80423c5023a7d2e3ad65e59293e46a01f5d5679c371a444d76a86b1cd2f474d1" }, "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.2%2Bk3s1/k3s-images.txt", - "sha256": "f3d1f91460cd90e3957413afb7e5dd8a3356fe324acf656deb4049d84c0d0dec" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.3%2Bk3s1/k3s-images.txt", + "sha256": "11373c7d60ed0db9b761b07b80b66240b426bef0ecc34d6f1ac91cd9d1ff085e" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix index 9f9e762344ba..f5aa4ee5a829 100644 --- a/pkgs/applications/networking/cluster/k3s/1_32/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_32/versions.nix @@ -1,15 +1,15 @@ { - k3sVersion = "1.32.2+k3s1"; - k3sCommit = "381620efbd1933b96f9cfaf37f46dfb5c58403a8"; - k3sRepoSha256 = "0xaw2b6lawg9jdsli333wwgq7irpig7a7p3kb7khqyhgb8y292qr"; - k3sVendorHash = "sha256-PB3KWvCqi7KxeiKrP9VHYpE4xdXhVSDQoCuwYQe4RoQ="; + k3sVersion = "1.32.3+k3s1"; + k3sCommit = "079ffa8d99fb859cb8c001455e47efa65535d832"; + k3sRepoSha256 = "1cvd0668ca06ahhmkhrxwymfpssw75rjfv5n9yajzg1dmkv0cmrv"; + k3sVendorHash = "sha256-1Kd6gt1envXmzFAtwhjPe9LLsllt2bQ7sryamGcaLRs="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.14.1"; k3sRootSha256 = "0svbi42agqxqh5q2ri7xmaw2a2c70s7q5y587ls0qkflw5vx4sl7"; k3sCNIVersion = "1.6.0-k3s1"; k3sCNISha256 = "0g7zczvwba5xqawk37b0v96xysdwanyf1grxn3l3lhxsgjjsmkd7"; - containerdVersion = "2.0.2-k3s2"; - containerdSha256 = "1883srp3rlap0a6rx5dnbnxl67aijbymjrqdg7zg3a162j21xz3s"; + containerdVersion = "2.0.4-k3s2"; + containerdSha256 = "0v34nh6q0plb50s95gzdkrdfbbch7dps15fmddh5h241yfms8sq6"; criCtlVersion = "1.31.0-k3s2"; }