Merge pull request #111 from poblin-orange/develop

bump k3s 1.24

.final_builds/packages/k3s-images/index.yml

@@ -19,6 +19,10 @@ builds:
     version: 216634c7f9c8c684053d50520c87d01d37670f9fb0df006d7b880277c5521cbe
     blobstore_id: 3cc58eb4-27cb-48d7-6a49-9794733bad2f
     sha1: sha256:ba0c3aa34e08840258f110cf87f624dc2e6efed49b811c1e404f6d1f0a61377a
+  2ba6eec8ba2430519e122e77bd5f62e54c09c5bc00fa857a52ac6ad53c61b6d2:
+    version: 2ba6eec8ba2430519e122e77bd5f62e54c09c5bc00fa857a52ac6ad53c61b6d2
+    blobstore_id: 1f3e7333-0201-48d6-61a9-204e25e64acf
+    sha1: sha256:4d74400210dd3b4c72320904b83721c23f47bbaddd8de689193df6e9cbb05466
   58422d6b2350bd73cf2437afc5c0cd75da232f7b7e45e2a513de251d3107fc7b:
     version: 58422d6b2350bd73cf2437afc5c0cd75da232f7b7e45e2a513de251d3107fc7b
     blobstore_id: 1b6e6445-ef98-4d35-499b-85a761ad3a64

.final_builds/packages/k3s/index.yml

@@ -7,6 +7,10 @@ builds:
     version: 40aa439634b35ba7dd9b6e706ca437d8e191d1cad1463aae7078e0fcca1c2ad8
     blobstore_id: f66c41c1-6304-40a5-6920-edd8a5e7dcdf
     sha1: sha256:b6ec3a2decfa0e16b84887e3c2fae96bdce20520a305f8613c5d16d45f984e53
+  51c8a8a4a4c0181841f667be6ce0b874be8a53a779e1d7f8e2bee013ce3b720d:
+    version: 51c8a8a4a4c0181841f667be6ce0b874be8a53a779e1d7f8e2bee013ce3b720d
+    blobstore_id: 0bce5e4f-2742-46d9-67bd-e36a3919a9c7
+    sha1: sha256:eb4da7de5c15ec156d22ac9a6434a2642d77e7fefd65190175d64bb2e386077e
   51e59e09b03182cec02264570585cf5314ba53e22947c725cb2350109bc8524c:
     version: 51e59e09b03182cec02264570585cf5314ba53e22947c725cb2350109bc8524c
     blobstore_id: 623ce5bd-a27c-4634-769d-a28300ea2332

.final_builds/packages/kubectl-k3s/index.yml

@@ -7,6 +7,10 @@ builds:
     version: 41fe074fc5fe879b1909bdc82b3050c42b94e2d4aa945de2ce4e5f5737feb8dc
     blobstore_id: 7c6d7770-354c-44b0-6150-82614409dfb2
     sha1: sha256:79ec01ab7c166b7121052ee44ce0109bb0318bb8e14e5e23c7b1d9dc5f619910
+  7ad3a6f1733dd6068d1f380ffff2daeaec2d7bbefdc297873854c55eec287f86:
+    version: 7ad3a6f1733dd6068d1f380ffff2daeaec2d7bbefdc297873854c55eec287f86
+    blobstore_id: b243929f-3640-487d-4a38-e8621bfb6fa5
+    sha1: sha256:0325c1d22e341d13c91abf7df05c31c3df8effa6da3c3d0bca3920e26edca721
   879683d1f72b98af4d9cfa29f5855db733d76aed08a5b868ef0c4322262e6fc0:
     version: 879683d1f72b98af4d9cfa29f5855db733d76aed08a5b868ef0c4322262e6fc0
     blobstore_id: f4ffde28-4bdc-4d49-7fcf-a4a67b66a25a

.final_builds/packages/nerdctl/index.yml

@@ -7,4 +7,8 @@ builds:
     version: 873348035e9ed6470217b992315ab126423aa4af7ce47997ca940fc753d35d61
     blobstore_id: a17c8b40-97ef-4a32-5e93-b472b8815a2d
     sha1: sha256:90396174af92ef2013bb4a4106b03760143b32ae3fd75564c0d16c784d37dea2
+  8b1108f5c0d7a550561765c0b0ac875dce9e040e23569ee391a220962b01df9a:
+    version: 8b1108f5c0d7a550561765c0b0ac875dce9e040e23569ee391a220962b01df9a
+    blobstore_id: 35dfeaa7-61b2-4cea-5cd8-f94068aa4ab5
+    sha1: sha256:5a11581db39116ddda0398956d5993867dfb5f655ca35c66fdf7588b9aa56ba0
 format-version: "2"

addblob.sh

@@ -12,13 +12,13 @@ popd
 bosh add-blob src/github.com/derailed/k9s/k9s k9s/k9s
 
 pushd src/github.com/containerd/nerdctl/
-tar xfv ./nerdctl-1.0.0-linux-amd64.tar.gz
+tar xfv ./nerdctl-1.1.0-linux-amd64.tar.gz
 popd
 
 bosh add-blob src/github.com/containerd/nerdctl/nerdctl nerdctl/nerdctl
 
 pushd src
-curl -LO https://dl.k8s.io/release/v1.23.9/bin/linux/amd64/kubectl --output ./src/kubectl
+curl -LO https://dl.k8s.io/release/v1.24.9/bin/linux/amd64/kubectl --output ./src/kubectl
 chmod ugo+x kubectl
 popd
 bosh add-blob src/kubectl kubectl/kubectl

config/blobs.yml

@@ -1,20 +1,20 @@
 k3s-images/k3s-airgap-images-amd64.tar:
-  size: 513610240
-  object_id: 0cd39b47-624c-43f7-61e0-5e15d55ce7d9
-  sha: sha256:b736756d3829b39a54cb4260e7037d115caeb27a83910027131c2219dab956e4
+  size: 554935808
+  object_id: 6cf125f1-8ac1-4e82-6122-73cba8e54929
+  sha: sha256:7d9008faf4b192e1ab0cce1d177cb615c6e30a777ac6e7ad66b7b15be4d1be5f
 k3s/k3s:
-  size: 63295488
-  object_id: af2cdf78-884e-4b18-47cd-6c1d2ed42493
-  sha: sha256:334b42a96a65d7e54555827ca31f80896bf18978952f5aa5b8bb83bfdff3db0b
+  size: 64569344
+  object_id: 6e551751-5779-4d0b-4fb2-de79653447b5
+  sha: sha256:30e781060532ab5b16b8f8481a70e98f4858c343fd4c73319e2d6a96970689e7
 k9s/k9s:
   size: 56823808
-  object_id: b2210de0-fd58-49c0-7e36-e2fcd755f489
+  object_id: dad5e912-cba2-466d-4033-cb84fe7cd07b
   sha: sha256:9a4dbb8e339423b3c7cd587f4abdd20351c01af15c8f1546b99f4557199e2c74
 kubectl/kubectl:
-  size: 46596096
-  object_id: 8253430f-5c5b-4bf0-4752-1c6b47c45ef5
-  sha: sha256:053561f7c68c5a037a69c52234e3cf1f91798854527692acd67091d594b616ce
+  size: 45752320
+  object_id: c9443d65-04bf-4fd5-4ccc-b159e8cb8ea1
+  sha: sha256:7e13f33b7379b6c25c3ae055e4389eb3eef168e563f37b5c5f1be672e46b686e
 nerdctl/nerdctl:
-  size: 27639808
-  object_id: 35182aa8-3862-443e-7436-0c38b3b70b1b
-  sha: sha256:49a369bdee22b80e99d2e100a7140b8a7c2f982cdf45a5bace3136444b882fd6
+  size: 28536832
+  object_id: e33375dc-caaf-4907-67d6-9ac0e535c0e4
+  sha: sha256:fcba9e27cf5b170415cdcdf60db8a928ce0bf382b1dc888804647a23acdee906

releases/k3s/index.yml

@@ -13,6 +13,8 @@ builds:
     version: "27"
   38972de0-573b-4ccf-42f3-7b9a0632a64e:
     version: "18"
+  456fe599-168d-4fc0-4fbb-8b62c7e2c4d5:
+    version: "124.1"
   4add4f9b-18e6-4f8f-51c9-905934c9aff1:
     version: "29"
   4bd13971-4d5f-45ef-71cd-8b9f587f8fa1:

releases/k3s/k3s-124.1.yml

@@ -0,0 +1,65 @@
+name: k3s
+version: "124.1"
+commit_hash: ab78c0d
+uncommitted_changes: false
+jobs:
+- name: k3s-agent
+  version: cea72360b5c14c0686925f0df2b2ba5baf0aa5533c44447944c25ba4b2792eb1
+  fingerprint: cea72360b5c14c0686925f0df2b2ba5baf0aa5533c44447944c25ba4b2792eb1
+  sha1: sha256:2f055820ed416b3bd7225412954c1502f61fbb58cb5ec7eed84d22a35ccfe7af
+  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: 79b692c882652e365bbfa888161dddeec62452fe9ec3cea6b53071e25ef0fd9a
+  fingerprint: 79b692c882652e365bbfa888161dddeec62452fe9ec3cea6b53071e25ef0fd9a
+  sha1: sha256:abb485c90bca12979f1d75ad8902e2692aa6aae68dd49c8817757f7300255462
+  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: 51c8a8a4a4c0181841f667be6ce0b874be8a53a779e1d7f8e2bee013ce3b720d
+  fingerprint: 51c8a8a4a4c0181841f667be6ce0b874be8a53a779e1d7f8e2bee013ce3b720d
+  sha1: sha256:eb4da7de5c15ec156d22ac9a6434a2642d77e7fefd65190175d64bb2e386077e
+  dependencies: []
+- name: k3s-images
+  version: 2ba6eec8ba2430519e122e77bd5f62e54c09c5bc00fa857a52ac6ad53c61b6d2
+  fingerprint: 2ba6eec8ba2430519e122e77bd5f62e54c09c5bc00fa857a52ac6ad53c61b6d2
+  sha1: sha256:4d74400210dd3b4c72320904b83721c23f47bbaddd8de689193df6e9cbb05466
+  dependencies: []
+- name: k9s
+  version: fc860dd549d216cd09e66a25b4ff22c29557dd7e79c03f44db247f16e6d73e5c
+  fingerprint: fc860dd549d216cd09e66a25b4ff22c29557dd7e79c03f44db247f16e6d73e5c
+  sha1: sha256:5fc0895690049fa8c0445f79a2ec871d01d4b0dcd2df040d76a0e875f48dff55
+  dependencies: []
+- name: kubectl-k3s
+  version: 7ad3a6f1733dd6068d1f380ffff2daeaec2d7bbefdc297873854c55eec287f86
+  fingerprint: 7ad3a6f1733dd6068d1f380ffff2daeaec2d7bbefdc297873854c55eec287f86
+  sha1: sha256:0325c1d22e341d13c91abf7df05c31c3df8effa6da3c3d0bca3920e26edca721
+  dependencies: []
+- name: nerdctl
+  version: 8b1108f5c0d7a550561765c0b0ac875dce9e040e23569ee391a220962b01df9a
+  fingerprint: 8b1108f5c0d7a550561765c0b0ac875dce9e040e23569ee391a220962b01df9a
+  sha1: sha256:5a11581db39116ddda0398956d5993867dfb5f655ca35c66fdf7588b9aa56ba0
+  dependencies: []
+license:
+  version: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  fingerprint: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  sha1: sha256:cbe3175489dfaec91e9f392399fbfb68e008885feb91a3b8d493a35d2fc5a8fa

vendir.lock

@@ -2,16 +2,16 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - githubRelease:
-      tag: v1.23.13+k3s1
-      url: https://api.github.com/repos/k3s-io/k3s/releases/80963685
+      tag: v1.24.9+k3s2
+      url: https://api.github.com/repos/k3s-io/k3s/releases/88647044
     path: github.com/k3s-io/k3s
   - githubRelease:
       tag: v0.26.7
       url: https://api.github.com/repos/derailed/k9s/releases/80222550
     path: github.com/derailed/k9s
   - githubRelease:
-      tag: v1.0.0
-      url: https://api.github.com/repos/containerd/nerdctl/releases/80611624
+      tag: v1.1.0
+      url: https://api.github.com/repos/containerd/nerdctl/releases/85678650
     path: github.com/containerd/nerdctl
   path: src
 kind: LockConfig

vendir.yml

@@ -11,7 +11,7 @@ directories:
   - path: github.com/k3s-io/k3s
     githubRelease:
       slug: k3s-io/k3s
-      tag: v1.23.13+k3s1 
+      tag: v1.24.9+k3s2 
       disableAutoChecksumValidation: true 
     includePaths:
     - "k3s"
@@ -30,8 +30,8 @@ directories:
   - path: github.com/containerd/nerdctl
     githubRelease:
       slug: containerd/nerdctl
-      tag: v1.0.0
+      tag: v1.1.0
       disableAutoChecksumValidation: true
     includePaths:
-    - "nerdctl-1.0.0-linux-amd64.tar.gz"
+    - "nerdctl-1.1.0-linux-amd64.tar.gz"