From 5ab094894493d28e1c2ccccbeb684bdf0d969f09 Mon Sep 17 00:00:00 2001 From: workflows/k3s-boshrelease/create-release-branches <> Date: Mon, 13 May 2024 10:35:19 +0000 Subject: [PATCH 1/7] Initial branch creation for k8s version 1.30 --- vendir.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendir.yml b/vendir.yml index c480d641..280c181e 100644 --- a/vendir.yml +++ b/vendir.yml @@ -10,7 +10,7 @@ directories: - path: k3s-io/k3s githubRelease: slug: k3s-io/k3s - tag: v1.26.15+k3s1 + tag: v1.30.0+k3s1 disableAutoChecksumValidation: true assetNames: # only download specific assets (optional; v0.12.0+). We use assetNames inside githubRelease instead of # includePaths at path level. Using includePaths downloads all assets and filter after. From da9f9abc480d16227592143a6f8fbc950974ccf4 Mon Sep 17 00:00:00 2001 From: workflows/k3s-boshrelease/create-final-bosh-release <> Date: Mon, 13 May 2024 16:17:16 +0000 Subject: [PATCH 2/7] updating blobs --- config/blobs.yml | 12 ++++++------ vendir.lock | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/blobs.yml b/config/blobs.yml index 9a69654c..933b5789 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -1,8 +1,8 @@ k3s-images/k3s-airgap-images-amd64.tar.gz: - size: 187328962 - object_id: 91dc80e1-83f0-48cd-745f-5ef2e120c4be - sha: sha256:33143d8a015289540df4764b401a845d14021888bfae854232c5b6deba41d4c1 + size: 187424619 + object_id: f3b774be-8d13-41f1-403f-19c6cd0f895b + sha: sha256:b1e787abae199af3eaefcbaa1733834c91b2890d9d797d24fb0ae8affe0382eb k3s/k3s: - size: 63926272 - object_id: 3ee22ee6-37b4-4780-44e2-2acdf80bc6c8 - sha: sha256:61e6b90de00819f2f6fe0442fcff43add5424ef2553a1e1fafed6eaa88400658 + size: 66330776 + object_id: 3a63e080-c097-4434-4034-d68e05a0234e + sha: sha256:e4b85e74d7be314f39e033142973cc53619f4fbaff3639a420312f20dea12868 diff --git a/vendir.lock b/vendir.lock index 9bbabeba..6403f929 100644 --- a/vendir.lock +++ b/vendir.lock @@ -2,8 +2,8 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - githubRelease: - tag: v1.26.15+k3s1 - url: https://api.github.com/repos/k3s-io/k3s/releases/148367176 + tag: v1.30.0+k3s1 + url: https://api.github.com/repos/k3s-io/k3s/releases/155314870 path: k3s-io/k3s path: src/github.com kind: LockConfig From b1982e38eba1a0282af8dd7835e73b8aa36e07a3 Mon Sep 17 00:00:00 2001 From: "actions/create-bosh-release@v1" <> Date: Mon, 13 May 2024 16:17:37 +0000 Subject: [PATCH 3/7] cutting release 1.30.0+k3s1 --- .final_builds/packages/k3s-images/index.yml | 4 +++ .final_builds/packages/k3s/index.yml | 4 +++ releases/k3s-packages/index.yml | 2 ++ .../k3s-packages/k3s-packages-1.30.0+k3s1.yml | 27 +++++++++++++++++++ 4 files changed, 37 insertions(+) create mode 100644 releases/k3s-packages/k3s-packages-1.30.0+k3s1.yml diff --git a/.final_builds/packages/k3s-images/index.yml b/.final_builds/packages/k3s-images/index.yml index 1c217dbb..10674480 100644 --- a/.final_builds/packages/k3s-images/index.yml +++ b/.final_builds/packages/k3s-images/index.yml @@ -15,6 +15,10 @@ builds: version: 490ea1779f5c748fdd414f0413b1e00ce7f6619c3ad4298019ecf6172303b1d4 blobstore_id: 293808f0-75c4-4593-579d-a56e22bef5b7 sha1: sha256:12bc6bdbd2309e19539b972631bd17c4d21afe29ed211eb1c5fb20cb72a6bdc9 + 51823ce11b8ca36a9e8fb2e45ba474416bb225ae0c05472ddca3b1e7dfe22532: + version: 51823ce11b8ca36a9e8fb2e45ba474416bb225ae0c05472ddca3b1e7dfe22532 + blobstore_id: 89b24753-28ca-4b4b-4ad7-74685710ef30 + sha1: sha256:648b5881f88e7a3ece94766d4fef5de740dd811e553a71b65ed49c0c7a8de505 592722b5944efb493023cb16f25b64ca9b3e881791e6b7bef7c07f650e395a18: version: 592722b5944efb493023cb16f25b64ca9b3e881791e6b7bef7c07f650e395a18 blobstore_id: b1679d87-3da7-4072-698d-45fcc869d5a9 diff --git a/.final_builds/packages/k3s/index.yml b/.final_builds/packages/k3s/index.yml index d9bfda32..7a90bb29 100644 --- a/.final_builds/packages/k3s/index.yml +++ b/.final_builds/packages/k3s/index.yml @@ -39,6 +39,10 @@ builds: version: d3354f34b8c7b8b8ec1bf3b4197943752d7794f3db9f78b7d94460d6ef7d0af9 blobstore_id: 6bff9cda-2b99-4097-69c1-685c3eaa1606 sha1: sha256:174521ed827387d438ac2f4ccf15e85cb8018176adf3addf83e2ad4e4e4492a4 + dc71efde8c76a4d5710371c07c30704d9978b8d5c9e8486f73770aadf4e032bd: + version: dc71efde8c76a4d5710371c07c30704d9978b8d5c9e8486f73770aadf4e032bd + blobstore_id: 94e6eb71-6c99-4f39-40c9-ae67e9d5317a + sha1: sha256:443f8f86f773bd1edd8b94b4b6d57cb65b87745440a6e8aba953e6df8b6f971a f458b6d9d5d7453b8089cec8a77c9b26b649f71edead7ee90d79f0d6711f86bb: version: f458b6d9d5d7453b8089cec8a77c9b26b649f71edead7ee90d79f0d6711f86bb blobstore_id: b9edd898-690e-47a7-4bbb-2e7b01c41005 diff --git a/releases/k3s-packages/index.yml b/releases/k3s-packages/index.yml index ce17dac0..827e9571 100644 --- a/releases/k3s-packages/index.yml +++ b/releases/k3s-packages/index.yml @@ -5,6 +5,8 @@ builds: version: 1.26.13+k3s2 878cf9f3-d727-493e-6f37-2e5402d0118f: version: 1.27.10+k3s2 + 91d90bfd-9cd3-4c6f-4d6a-c1eb62b43d42: + version: 1.30.0+k3s1 a624b0da-ee7c-48d3-531f-91afcd52c827: version: 1.24.17+k3s1 bc4f2de8-d61d-4799-5448-44b5e2d51dd0: diff --git a/releases/k3s-packages/k3s-packages-1.30.0+k3s1.yml b/releases/k3s-packages/k3s-packages-1.30.0+k3s1.yml new file mode 100644 index 00000000..946fd342 --- /dev/null +++ b/releases/k3s-packages/k3s-packages-1.30.0+k3s1.yml @@ -0,0 +1,27 @@ +name: k3s-packages +version: 1.30.0+k3s1 +commit_hash: 843faf9 +uncommitted_changes: true +jobs: +- name: k3s-packages + version: 7f83fc5d18ece0c37ad93bd5e7748024dea8621370a746caeeb409c8a7849ef4 + fingerprint: 7f83fc5d18ece0c37ad93bd5e7748024dea8621370a746caeeb409c8a7849ef4 + sha1: sha256:d57714f4b385da24f2b5867bbcf64e578c8c49c913d6e5299465428b68305306 + packages: + - k3s + - k3s-images +packages: +- name: k3s + version: dc71efde8c76a4d5710371c07c30704d9978b8d5c9e8486f73770aadf4e032bd + fingerprint: dc71efde8c76a4d5710371c07c30704d9978b8d5c9e8486f73770aadf4e032bd + sha1: sha256:443f8f86f773bd1edd8b94b4b6d57cb65b87745440a6e8aba953e6df8b6f971a + dependencies: [] +- name: k3s-images + version: 51823ce11b8ca36a9e8fb2e45ba474416bb225ae0c05472ddca3b1e7dfe22532 + fingerprint: 51823ce11b8ca36a9e8fb2e45ba474416bb225ae0c05472ddca3b1e7dfe22532 + sha1: sha256:648b5881f88e7a3ece94766d4fef5de740dd811e553a71b65ed49c0c7a8de505 + dependencies: [] +license: + version: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9 + fingerprint: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9 + sha1: sha256:d548654c52c6aadc88a1cf194e1424f88a2595e1c13d764b918be201e258bf4f From 92c822182cdb1027a34c49a19785b17cc713612f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 21:11:49 +0000 Subject: [PATCH 4/7] chore(deps): update dependency k3s-io/k3s to v1.30.1+k3s1 --- vendir.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendir.yml b/vendir.yml index 280c181e..1208c0ca 100644 --- a/vendir.yml +++ b/vendir.yml @@ -10,7 +10,7 @@ directories: - path: k3s-io/k3s githubRelease: slug: k3s-io/k3s - tag: v1.30.0+k3s1 + tag: v1.30.1+k3s1 disableAutoChecksumValidation: true assetNames: # only download specific assets (optional; v0.12.0+). We use assetNames inside githubRelease instead of # includePaths at path level. Using includePaths downloads all assets and filter after. From 170aec62180c92cd4fc7b0cd8b8f5fed1a2d32b4 Mon Sep 17 00:00:00 2001 From: workflows/k3s-boshrelease/create-final-bosh-release <> Date: Tue, 28 May 2024 21:12:41 +0000 Subject: [PATCH 5/7] updating blobs --- config/blobs.yml | 12 ++++++------ vendir.lock | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/blobs.yml b/config/blobs.yml index 933b5789..c83551b2 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -1,8 +1,8 @@ k3s-images/k3s-airgap-images-amd64.tar.gz: - size: 187424619 - object_id: f3b774be-8d13-41f1-403f-19c6cd0f895b - sha: sha256:b1e787abae199af3eaefcbaa1733834c91b2890d9d797d24fb0ae8affe0382eb + size: 187424624 + object_id: a20f09d3-b45e-43ac-4571-ca601107988b + sha: sha256:546702e2b3cde42a746dc8ee5bec197f28e9b4c28d9eadd8eef2eba940fc8923 k3s/k3s: - size: 66330776 - object_id: 3a63e080-c097-4434-4034-d68e05a0234e - sha: sha256:e4b85e74d7be314f39e033142973cc53619f4fbaff3639a420312f20dea12868 + size: 66338968 + object_id: e4c35fd1-cdc0-49e3-44e7-c348bfa3fde7 + sha: sha256:39a5057fb49bf576a45c32ef3ef63bff448252d4d25c6c41b8dcc5e48e278bf5 diff --git a/vendir.lock b/vendir.lock index 6403f929..ce7b324b 100644 --- a/vendir.lock +++ b/vendir.lock @@ -2,8 +2,8 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - githubRelease: - tag: v1.30.0+k3s1 - url: https://api.github.com/repos/k3s-io/k3s/releases/155314870 + tag: v1.30.1+k3s1 + url: https://api.github.com/repos/k3s-io/k3s/releases/156931328 path: k3s-io/k3s path: src/github.com kind: LockConfig From 80416c4cc459c35ceb2eaaaac4b683082dcd68e7 Mon Sep 17 00:00:00 2001 From: "actions/create-bosh-release@v1" <> Date: Tue, 28 May 2024 21:13:07 +0000 Subject: [PATCH 6/7] cutting release 1.30.1+k3s1 --- .final_builds/packages/k3s-images/index.yml | 4 +++ .final_builds/packages/k3s/index.yml | 4 +++ releases/k3s-packages/index.yml | 2 ++ .../k3s-packages/k3s-packages-1.30.1+k3s1.yml | 27 +++++++++++++++++++ 4 files changed, 37 insertions(+) create mode 100644 releases/k3s-packages/k3s-packages-1.30.1+k3s1.yml diff --git a/.final_builds/packages/k3s-images/index.yml b/.final_builds/packages/k3s-images/index.yml index 10674480..5eb15185 100644 --- a/.final_builds/packages/k3s-images/index.yml +++ b/.final_builds/packages/k3s-images/index.yml @@ -23,6 +23,10 @@ builds: version: 592722b5944efb493023cb16f25b64ca9b3e881791e6b7bef7c07f650e395a18 blobstore_id: b1679d87-3da7-4072-698d-45fcc869d5a9 sha1: sha256:608bd23f065041d74d27806b2c094c9ade2ca4729548b3967018f10a489ffbc5 + 69a1cb8e07181eff93093acae0e09ee01118a95fd9266c035b10aedff4b1dca7: + version: 69a1cb8e07181eff93093acae0e09ee01118a95fd9266c035b10aedff4b1dca7 + blobstore_id: 5b6d48ae-853e-482b-5d86-4278641474f3 + sha1: sha256:09b6d4c11edbbd91a3e0439e47e965dcf0ddfe60840605c4f1e4ffe9265055bf 6a025d0d24cfa4a52768945aa35d332137d600d4a510a15c08cc7bc60f1b060b: version: 6a025d0d24cfa4a52768945aa35d332137d600d4a510a15c08cc7bc60f1b060b blobstore_id: 524cdbcd-50fe-45f2-4e47-cb749e5f6ef0 diff --git a/.final_builds/packages/k3s/index.yml b/.final_builds/packages/k3s/index.yml index 7a90bb29..015ef8d7 100644 --- a/.final_builds/packages/k3s/index.yml +++ b/.final_builds/packages/k3s/index.yml @@ -3,6 +3,10 @@ builds: version: 23d907eb422db1fdcef83c483a6e9039240ca2f2ab774317b9cb71c9d4df871e blobstore_id: 6547dafc-9ec8-4ce9-52b0-2a39156e6111 sha1: sha256:016950e3041e4bfe104a189d300d4ef2a84d08b4a87dcee6597fa01602dd49cb + 3657f6ef54feef719f304e946718a710fcb6f5217e95566f4e101844df0394e1: + version: 3657f6ef54feef719f304e946718a710fcb6f5217e95566f4e101844df0394e1 + blobstore_id: 8e06f0c7-d82d-41d5-6d38-1ac187ad77b0 + sha1: sha256:f1999f039f81e00262d7da7f1a35352c1ed2821f743ae8d77c885013651a9a4d 427133c599831e321a1f0f19f7acb9fabd1210eeebadfbfa2bad7917a8bcb460: version: 427133c599831e321a1f0f19f7acb9fabd1210eeebadfbfa2bad7917a8bcb460 blobstore_id: 796966fe-e281-49f9-674f-69ff13427807 diff --git a/releases/k3s-packages/index.yml b/releases/k3s-packages/index.yml index 827e9571..39fd7121 100644 --- a/releases/k3s-packages/index.yml +++ b/releases/k3s-packages/index.yml @@ -1,6 +1,8 @@ builds: 2b11a4f2-9531-45c1-49a1-8867662e95c0: version: 1.27.12+k3s1 + 3e250f68-ec6d-4716-6712-145a4b5e64b3: + version: 1.30.1+k3s1 509922c7-4f2c-425d-4c62-95fa156b4c7b: version: 1.26.13+k3s2 878cf9f3-d727-493e-6f37-2e5402d0118f: diff --git a/releases/k3s-packages/k3s-packages-1.30.1+k3s1.yml b/releases/k3s-packages/k3s-packages-1.30.1+k3s1.yml new file mode 100644 index 00000000..2a99c70d --- /dev/null +++ b/releases/k3s-packages/k3s-packages-1.30.1+k3s1.yml @@ -0,0 +1,27 @@ +name: k3s-packages +version: 1.30.1+k3s1 +commit_hash: 2b29554 +uncommitted_changes: true +jobs: +- name: k3s-packages + version: 7f83fc5d18ece0c37ad93bd5e7748024dea8621370a746caeeb409c8a7849ef4 + fingerprint: 7f83fc5d18ece0c37ad93bd5e7748024dea8621370a746caeeb409c8a7849ef4 + sha1: sha256:d57714f4b385da24f2b5867bbcf64e578c8c49c913d6e5299465428b68305306 + packages: + - k3s + - k3s-images +packages: +- name: k3s + version: 3657f6ef54feef719f304e946718a710fcb6f5217e95566f4e101844df0394e1 + fingerprint: 3657f6ef54feef719f304e946718a710fcb6f5217e95566f4e101844df0394e1 + sha1: sha256:f1999f039f81e00262d7da7f1a35352c1ed2821f743ae8d77c885013651a9a4d + dependencies: [] +- name: k3s-images + version: 69a1cb8e07181eff93093acae0e09ee01118a95fd9266c035b10aedff4b1dca7 + fingerprint: 69a1cb8e07181eff93093acae0e09ee01118a95fd9266c035b10aedff4b1dca7 + sha1: sha256:09b6d4c11edbbd91a3e0439e47e965dcf0ddfe60840605c4f1e4ffe9265055bf + dependencies: [] +license: + version: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9 + fingerprint: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9 + sha1: sha256:d548654c52c6aadc88a1cf194e1424f88a2595e1c13d764b918be201e258bf4f From daba6e7ec75f8e6ffa668a55fdfb3299abf98b01 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 01:46:21 +0000 Subject: [PATCH 7/7] chore(deps): update dependency mikefarah/yq to v4.44.2 --- .github/workflows/create-PRs.yml | 2 +- .github/workflows/create-final-bosh-release-on-commits.yml | 2 +- .github/workflows/create-release-branches.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-PRs.yml b/.github/workflows/create-PRs.yml index d8228f0d..9e6dbf67 100644 --- a/.github/workflows/create-PRs.yml +++ b/.github/workflows/create-PRs.yml @@ -30,7 +30,7 @@ jobs: uses: jaxxstorm/action-install-gh-release@25d5e2dd555cd74f1fab9ac1e6ea117acde2c0c4 # v1.12.0 with: repo: mikefarah/yq - tag: v4.44.1 + tag: v4.44.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # reduce potential rate limiting diff --git a/.github/workflows/create-final-bosh-release-on-commits.yml b/.github/workflows/create-final-bosh-release-on-commits.yml index 134d234a..4406078d 100644 --- a/.github/workflows/create-final-bosh-release-on-commits.yml +++ b/.github/workflows/create-final-bosh-release-on-commits.yml @@ -56,7 +56,7 @@ jobs: uses: jaxxstorm/action-install-gh-release@25d5e2dd555cd74f1fab9ac1e6ea117acde2c0c4 # v1.12.0 with: repo: mikefarah/yq - tag: v4.44.1 + tag: v4.44.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # reduce potential rate limiting diff --git a/.github/workflows/create-release-branches.yml b/.github/workflows/create-release-branches.yml index 465d676c..0affc6d9 100644 --- a/.github/workflows/create-release-branches.yml +++ b/.github/workflows/create-release-branches.yml @@ -36,7 +36,7 @@ jobs: uses: jaxxstorm/action-install-gh-release@25d5e2dd555cd74f1fab9ac1e6ea117acde2c0c4 # v1.12.0 with: repo: mikefarah/yq - tag: v4.44.1 + tag: v4.44.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # reduce potential rate limiting