From 94768ea7b1cf4b5bb4d9b6f6b3c73a43d7102b2c Mon Sep 17 00:00:00 2001 From: Pierre Oblin Date: Wed, 30 Aug 2023 17:41:18 +0000 Subject: [PATCH 1/2] bump k3s 1.24.16-k3s1 --- config/blobs.yml | 18 +++++++++--------- vendir.lock | 4 ++-- vendir.yml | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/blobs.yml b/config/blobs.yml index ec42e631..749d15ea 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -1,20 +1,20 @@ k3s-images/k3s-airgap-images-amd64.tar: - size: 575246336 - object_id: fbf5a896-f7a6-4919-6bec-d948ada21517 - sha: sha256:a9401e179bee5385153c3da8262fc4c3d03889f71c33141d7194cdfc93389ed5 + size: 577078272 + object_id: b4f1fd65-eba3-4543-58d0-c69c6f8c2094 + sha: sha256:3fb8a7439df846bf5c5d465c1735f660b280cc136e21b1bcbbc057925903087c k3s/k3s: - size: 69537792 - object_id: a8a14009-dcc6-4a39-5a14-c59a3331efb0 - sha: sha256:1487b478204e4e1e8bf7f8bc83cbb66a527c654567286b10268d594ccf239c8b + size: 70012928 + object_id: 01ce8f9f-939e-4d5e-6cbb-f7b79febcb04 + sha: sha256:ce756bf1aaf664c0ed7163d2802572293315c5b6018fb451a0bf36926a884c2d k9s/k9s: size: 60559360 - object_id: 9491c051-6b00-4048-4206-f856ab4112dc + object_id: 9884345f-8da7-4d5d-5e90-ae60c0bf6814 sha: sha256:da2a3716809fd22e8ce814719bab7044f1fac54e13f726fc327f6accd5f839a6 kubectl/kubectl: size: 45752320 - object_id: 9beaaeac-a25a-4e39-64f1-94150ce52c16 + object_id: 34d557ba-4d78-4d0d-647e-04d7d9012ed7 sha: sha256:7e13f33b7379b6c25c3ae055e4389eb3eef168e563f37b5c5f1be672e46b686e nerdctl/nerdctl: size: 24952832 - object_id: 1769b0be-0922-46e4-5172-719673a12576 + object_id: 3639d163-1353-436f-49bd-2bf0125b9f40 sha: sha256:07ce98d7c0975bd6e86fdf36e6826dd99fa183c84f65aab9d4f709659cbf04cc diff --git a/vendir.lock b/vendir.lock index 9150933a..259f3f0c 100755 --- a/vendir.lock +++ b/vendir.lock @@ -2,8 +2,8 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - githubRelease: - tag: v1.24.14+k3s1 - url: https://api.github.com/repos/k3s-io/k3s/releases/104461788 + tag: v1.24.16+k3s1 + url: https://api.github.com/repos/k3s-io/k3s/releases/113904084 path: github.com/k3s-io/k3s - githubRelease: tag: v0.27.4 diff --git a/vendir.yml b/vendir.yml index 1ae4b8a3..ac06823e 100644 --- a/vendir.yml +++ b/vendir.yml @@ -11,7 +11,7 @@ directories: - path: github.com/k3s-io/k3s githubRelease: slug: k3s-io/k3s - tag: v1.24.14+k3s1 + tag: v1.24.16+k3s1 disableAutoChecksumValidation: true includePaths: - "k3s" From 12678cdc55e6d5cfc7edf4ea705bd928acc293d4 Mon Sep 17 00:00:00 2001 From: Pierre Oblin Date: Wed, 30 Aug 2023 18:11:49 +0000 Subject: [PATCH 2/2] version 124.8 --- .final_builds/packages/k3s-images/index.yml | 4 ++ .final_builds/packages/k3s/index.yml | 4 ++ releases/k3s/index.yml | 2 + releases/k3s/k3s-124.8.yml | 65 +++++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 100644 releases/k3s/k3s-124.8.yml diff --git a/.final_builds/packages/k3s-images/index.yml b/.final_builds/packages/k3s-images/index.yml index 324648d8..a6751c5a 100644 --- a/.final_builds/packages/k3s-images/index.yml +++ b/.final_builds/packages/k3s-images/index.yml @@ -83,6 +83,10 @@ builds: version: cc947fc1aca491e1fc696aa661a401c15ce5750423a88726bc46dec91818531b blobstore_id: 06097888-9941-4cc8-6b69-78ac49762be5 sha1: sha256:780d77f69efdf213f71900a942c4174cd9b167f38accc7e871a57ee882dd421a + e758dece4a82c66f1f1c0b9f9b3991ff2fe639510be32869b12cdf52baad484c: + version: e758dece4a82c66f1f1c0b9f9b3991ff2fe639510be32869b12cdf52baad484c + blobstore_id: b5b74474-218d-4e41-5a57-12d44f4d9ef6 + sha1: sha256:69475239e32a6ee4bcd036fa2b066548111dac6e2031c3b2e03e1f858a73534b f478de74d2582634ab54f245138e002e4f399dfedd5308661669647ce908b035: version: f478de74d2582634ab54f245138e002e4f399dfedd5308661669647ce908b035 blobstore_id: 29726908-787c-4d5b-6452-7563626f3e89 diff --git a/.final_builds/packages/k3s/index.yml b/.final_builds/packages/k3s/index.yml index 8bcc9cb8..c09d876b 100644 --- a/.final_builds/packages/k3s/index.yml +++ b/.final_builds/packages/k3s/index.yml @@ -7,6 +7,10 @@ builds: version: 21a5deb1aa8a91ea350875952194a8e971e90e0110eb1e4b39243d9a9b29b690 blobstore_id: 00181855-1e85-432f-5e99-f463a63b8722 sha1: sha256:877c8f714d326d10cc24652b6cf3fd1d2985f9f4e1986f6e035f50f0c49353c3 + 2a86c5528d71de652d868e69fc9f017d25f67515faef5280ed69dfb37db64498: + version: 2a86c5528d71de652d868e69fc9f017d25f67515faef5280ed69dfb37db64498 + blobstore_id: 634d05c3-612b-42f6-56f7-8ff2c86d50a6 + sha1: sha256:7b4efc0354fd92befc3ad7cff1a4d15ed78e9801e0e149b6d95bfe3ac35251cb 40aa439634b35ba7dd9b6e706ca437d8e191d1cad1463aae7078e0fcca1c2ad8: version: 40aa439634b35ba7dd9b6e706ca437d8e191d1cad1463aae7078e0fcca1c2ad8 blobstore_id: f66c41c1-6304-40a5-6920-edd8a5e7dcdf diff --git a/releases/k3s/index.yml b/releases/k3s/index.yml index 52e463eb..80375837 100644 --- a/releases/k3s/index.yml +++ b/releases/k3s/index.yml @@ -69,6 +69,8 @@ builds: version: "123.1" c08ed11f-2dbe-4855-4af4-71c890042b42: version: "124.6" + c5191aac-13e9-4d7d-4ef8-4ece0b4bf96e: + version: "124.8" c83221a4-9990-46f7-5fb0-e90adcaec54e: version: "3" c9a1c25b-7712-43a1-6ecc-9c9374b62897: diff --git a/releases/k3s/k3s-124.8.yml b/releases/k3s/k3s-124.8.yml new file mode 100644 index 00000000..aead68d2 --- /dev/null +++ b/releases/k3s/k3s-124.8.yml @@ -0,0 +1,65 @@ +name: k3s +version: "124.8" +commit_hash: 94768ea +uncommitted_changes: false +jobs: +- name: k3s-agent + version: 7047efd4e3b32a51634cb3fe3b3d37627a421f689eeb31a50237fa03d980d5eb + fingerprint: 7047efd4e3b32a51634cb3fe3b3d37627a421f689eeb31a50237fa03d980d5eb + sha1: sha256:e06362f1a059d7ad5d119894d291cba75cefc71c878c8ac0f2212c0a913826af + packages: + - k3s + - kubectl-k3s + - k3s-images + - nerdctl +- name: k3s-agent-airgaped-images + version: dac8160deeef67d642c67065cdb584c53ca84807717f4b7abb3e748badb97313 + fingerprint: dac8160deeef67d642c67065cdb584c53ca84807717f4b7abb3e748badb97313 + sha1: sha256:56989c04162b348ce691ad78d9ceaefc4b46338df95ebe87fda1e5ce0a30d429 + packages: + - k3s-images +- name: k3s-server + version: c9072b3cee0a8f9e91d89f48f04caf9a33bf03932792d79921cec494e9a7f7d8 + fingerprint: c9072b3cee0a8f9e91d89f48f04caf9a33bf03932792d79921cec494e9a7f7d8 + sha1: sha256:a5788503bf2966365afbe2e1f35adfbeee7af9aa9dfa88ee2edf9573ca03b6c2 + packages: + - k3s + - k9s + - kubectl-k3s + - nerdctl +- name: k3s-server-airgaped-images + version: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef + fingerprint: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef + sha1: sha256:fbae88a6d6e06d8ac29288b73a971832e77d2483978c56481844e1c7f8e77c78 + packages: + - k3s-images +packages: +- name: k3s + version: 2a86c5528d71de652d868e69fc9f017d25f67515faef5280ed69dfb37db64498 + fingerprint: 2a86c5528d71de652d868e69fc9f017d25f67515faef5280ed69dfb37db64498 + sha1: sha256:7b4efc0354fd92befc3ad7cff1a4d15ed78e9801e0e149b6d95bfe3ac35251cb + dependencies: [] +- name: k3s-images + version: e758dece4a82c66f1f1c0b9f9b3991ff2fe639510be32869b12cdf52baad484c + fingerprint: e758dece4a82c66f1f1c0b9f9b3991ff2fe639510be32869b12cdf52baad484c + sha1: sha256:69475239e32a6ee4bcd036fa2b066548111dac6e2031c3b2e03e1f858a73534b + dependencies: [] +- name: k9s + version: 5950fdb3fe5cf31d54de992dd8dfdb17bc43eca03901b375c7e54ed89203966b + fingerprint: 5950fdb3fe5cf31d54de992dd8dfdb17bc43eca03901b375c7e54ed89203966b + sha1: sha256:d0ad55e5c5f85d986c15346247d9dec6f5b2712a5a81ebb8af80c9b5676c23a4 + dependencies: [] +- name: kubectl-k3s + version: 7ad3a6f1733dd6068d1f380ffff2daeaec2d7bbefdc297873854c55eec287f86 + fingerprint: 7ad3a6f1733dd6068d1f380ffff2daeaec2d7bbefdc297873854c55eec287f86 + sha1: sha256:0325c1d22e341d13c91abf7df05c31c3df8effa6da3c3d0bca3920e26edca721 + dependencies: [] +- name: nerdctl + version: 3ef7aaf0a97b5ea75f13913f2c73609b90e9fb46695d743c2acedd5d0d9e4eb4 + fingerprint: 3ef7aaf0a97b5ea75f13913f2c73609b90e9fb46695d743c2acedd5d0d9e4eb4 + sha1: sha256:beb08f27a3f548472c8c0edee96e813fba538d7e4b2229325e5262cc30aa7d30 + dependencies: [] +license: + version: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9 + fingerprint: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9 + sha1: sha256:cbe3175489dfaec91e9f392399fbfb68e008885feb91a3b8d493a35d2fc5a8fa