Merge pull request #129 from poblin-orange/develop

version 124.6

.final_builds/jobs/k3s-agent/index.yml

@@ -55,6 +55,10 @@ builds:
     version: 70212d297f06c6e9689878d0e94a1ac2d02fc891d04e1a24fcd97d6e1f27e816
     blobstore_id: 8444c141-64e5-46cb-7bdb-59cd7a6b2a58
     sha1: sha256:89370e98c20d1289c39f57681125bbe717da4040b017ccdb46d18e4dbc51dcf7
+  7047efd4e3b32a51634cb3fe3b3d37627a421f689eeb31a50237fa03d980d5eb:
+    version: 7047efd4e3b32a51634cb3fe3b3d37627a421f689eeb31a50237fa03d980d5eb
+    blobstore_id: 0b02cb35-cf00-49b2-465a-b0da7616309f
+    sha1: sha256:e06362f1a059d7ad5d119894d291cba75cefc71c878c8ac0f2212c0a913826af
   7079178f9125351d8c140ae67cbc739346fe428747416c548eaf204e08cb057a:
     version: 7079178f9125351d8c140ae67cbc739346fe428747416c548eaf204e08cb057a
     blobstore_id: 8c32507e-bf58-43b5-73bb-1744ef0af7ae

.final_builds/jobs/k3s-server/index.yml

@@ -119,6 +119,10 @@ builds:
     version: ca23ca546f68cf61fcd1ab4e90c591f0dfed8aed6d48ff61fa546a9516c92150
     blobstore_id: aa8b0336-14ec-40a7-460b-128f90104cca
     sha1: sha256:3377688e3e506127447f98ed45dd2282875e86227b4e195387848c10a7c35732
+  cd4185b92e4e8e04769248886b6a3c1268d91f7efdb92061e6efb1c6b3db1df9:
+    version: cd4185b92e4e8e04769248886b6a3c1268d91f7efdb92061e6efb1c6b3db1df9
+    blobstore_id: 1b2ec179-e9f4-4106-651c-34279d8d0c90
+    sha1: sha256:0dea70c1e6bdc9a3649956c3e4f55333ae80f4ace1951fe747cc943d64813d61
   d6094196316ce902d758a5b45387c238b504bdc5749fb6b6c75c85a126a91573:
     version: d6094196316ce902d758a5b45387c238b504bdc5749fb6b6c75c85a126a91573
     blobstore_id: cff351ea-be2f-4a45-4cb2-da06f25943ac

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

@@ -31,6 +31,10 @@ builds:
     version: 58422d6b2350bd73cf2437afc5c0cd75da232f7b7e45e2a513de251d3107fc7b
     blobstore_id: 1b6e6445-ef98-4d35-499b-85a761ad3a64
     sha1: sha256:fe8c033ba39c3baa0a66e497309a3f4cab796c32608d5032d73a734d926476db
+  592e0baa30c08c39736ce3a0ff21135ee889e421b3c8d20620a07f3cd38a464b:
+    version: 592e0baa30c08c39736ce3a0ff21135ee889e421b3c8d20620a07f3cd38a464b
+    blobstore_id: 74017650-686c-45ca-69dc-f1d6b8d0a545
+    sha1: sha256:4ccd902fb62299669a3585da81b8216d30a7b012001dd0ef67285f1361a5e5fa
   5c931aa45f328bcf860adaa2a3eaf32f58b53b38d375792be32c540084b0ce27:
     version: 5c931aa45f328bcf860adaa2a3eaf32f58b53b38d375792be32c540084b0ce27
     blobstore_id: d3faf4cb-ab64-4110-71f8-4f203af5b47c

.final_builds/packages/k3s/index.yml

@@ -1,4 +1,8 @@
 builds:
+  0dafd97bae9f8197ebc68a9997052669d58927ec3e99c6b12cd7ce6ceedea357:
+    version: 0dafd97bae9f8197ebc68a9997052669d58927ec3e99c6b12cd7ce6ceedea357
+    blobstore_id: 7ecb7b67-e799-40ac-46a9-c02d76344182
+    sha1: sha256:e185ccf482d115c21712ccecb82e31528b4a96dd7286e723a9d5cd78971ccaad
   21a5deb1aa8a91ea350875952194a8e971e90e0110eb1e4b39243d9a9b29b690:
     version: 21a5deb1aa8a91ea350875952194a8e971e90e0110eb1e4b39243d9a9b29b690
     blobstore_id: 00181855-1e85-432f-5e99-f463a63b8722

config/blobs.yml

@@ -1,20 +1,20 @@
 k3s-images/k3s-airgap-images-amd64.tar:
-  size: 570321408
-  object_id: 29d6b056-bd58-4ee5-412b-11e25d3f31f2
-  sha: sha256:06aff693f3c62f31bdd71062d2b94373eb3b4d5d0e382498785849065d6e6099
+  size: 575246336
+  object_id: fbf5a896-f7a6-4919-6bec-d948ada21517
+  sha: sha256:a9401e179bee5385153c3da8262fc4c3d03889f71c33141d7194cdfc93389ed5
 k3s/k3s:
-  size: 66818048
-  object_id: 2fe6b9a0-e7a5-45e0-5030-04b02db266f1
-  sha: sha256:9556a00fc3514a09934952550cb49b46559bcce703c0a7af31969559692f5160
+  size: 69537792
+  object_id: a8a14009-dcc6-4a39-5a14-c59a3331efb0
+  sha: sha256:1487b478204e4e1e8bf7f8bc83cbb66a527c654567286b10268d594ccf239c8b
 k9s/k9s:
   size: 60559360
-  object_id: c8ac305d-cf15-48d7-4464-22e681f9a8ab
+  object_id: 9491c051-6b00-4048-4206-f856ab4112dc
   sha: sha256:da2a3716809fd22e8ce814719bab7044f1fac54e13f726fc327f6accd5f839a6
 kubectl/kubectl:
   size: 45752320
-  object_id: 1b0c277a-e7fe-4c64-617c-bfebaa284946
+  object_id: 9beaaeac-a25a-4e39-64f1-94150ce52c16
   sha: sha256:7e13f33b7379b6c25c3ae055e4389eb3eef168e563f37b5c5f1be672e46b686e
 nerdctl/nerdctl:
   size: 24952832
-  object_id: 2f3453a0-4cc1-400b-42a1-390f7cd24f3f
+  object_id: 1769b0be-0922-46e4-5172-719673a12576
   sha: sha256:07ce98d7c0975bd6e86fdf36e6826dd99fa183c84f65aab9d4f709659cbf04cc

jobs/k3s-agent/spec

@@ -119,7 +119,7 @@ properties:
     default: 30
   k3s.do-not-killall-on-post-stop:
     description: if set, the bosh post-stop script wont leverage k3s-killall.sh script
-    default: true 
+    default: false 
 
 
 #token-file

jobs/k3s-agent/templates/bin/post-stop.erb

@@ -4,8 +4,11 @@
 <% if_p('k3s.do-not-killall-on-post-stop') do |value| %>
 <% if p('k3s.do-not-killall-on-post-stop') %>
 echo "post-stop: SKIP k3s-killall.sh"
+exit 0
+
 <% else %>
 echo "post-stop: k3s-killall.sh to clean the host"
 /var/vcap/jobs/k3s-agent/bin/k3s-killall.sh
+exit 0
 <% end %>
 <% end %>

jobs/k3s-server/spec

@@ -150,7 +150,7 @@ properties:
 
   k3s.do-not-killall-on-post-stop:
     description: if set, the bosh post-stop script wont leverage k3s-killall.sh script
-    default: true 
+    default: false 
 
 
 

jobs/k3s-server/templates/bin/ctl.erb

@@ -202,7 +202,6 @@ export FLAGS="$FLAGS --kubelet-arg=config=/var/vcap/jobs/k3s-server/config/kubel
     --write-kubeconfig-mode=755 \
     --tls-san=<%= spec.ip %> \
     --tls-san=<%= spec.networks.send(spec.networks.methods(false).first).dns_record_name %> \
-    --node-external-ip=<%= spec.ip %> \
     --node-label bosh.io/az=<%= spec.az %> \
     --node-label bosh.io/name=<%= spec.name %> \
     --node-label bosh.io/bootstrap=<%= spec.bootstrap %>  \

jobs/k3s-server/templates/bin/post-stop.erb

@@ -4,8 +4,10 @@
 <% if_p('k3s.do-not-killall-on-post-stop') do |value| %>
 <% if p('k3s.do-not-killall-on-post-stop') %>
 echo "post-stop: SKIP k3s-killall.sh"
+exit 0
 <% else %>
 echo "post-stop: k3s-killall.sh to clean the host"
 /var/vcap/jobs/k3s-agent/bin/k3s-killall.sh
+exit 0
 <% end %>
 <% end %>

releases/k3s/index.yml

@@ -67,6 +67,8 @@ builds:
     version: "11"
   bef88478-9dda-48d7-47bb-d21aafc13f57:
     version: "123.1"
+  c08ed11f-2dbe-4855-4af4-71c890042b42:
+    version: "124.6"
   c83221a4-9990-46f7-5fb0-e90adcaec54e:
     version: "3"
   c9a1c25b-7712-43a1-6ecc-9c9374b62897:

releases/k3s/k3s-124.6.yml

@@ -0,0 +1,65 @@
+name: k3s
+version: "124.6"
+commit_hash: "1615924"
+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: cd4185b92e4e8e04769248886b6a3c1268d91f7efdb92061e6efb1c6b3db1df9
+  fingerprint: cd4185b92e4e8e04769248886b6a3c1268d91f7efdb92061e6efb1c6b3db1df9
+  sha1: sha256:0dea70c1e6bdc9a3649956c3e4f55333ae80f4ace1951fe747cc943d64813d61
+  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: 0dafd97bae9f8197ebc68a9997052669d58927ec3e99c6b12cd7ce6ceedea357
+  fingerprint: 0dafd97bae9f8197ebc68a9997052669d58927ec3e99c6b12cd7ce6ceedea357
+  sha1: sha256:e185ccf482d115c21712ccecb82e31528b4a96dd7286e723a9d5cd78971ccaad
+  dependencies: []
+- name: k3s-images
+  version: 592e0baa30c08c39736ce3a0ff21135ee889e421b3c8d20620a07f3cd38a464b
+  fingerprint: 592e0baa30c08c39736ce3a0ff21135ee889e421b3c8d20620a07f3cd38a464b
+  sha1: sha256:4ccd902fb62299669a3585da81b8216d30a7b012001dd0ef67285f1361a5e5fa
+  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

vendir.lock

@@ -2,8 +2,8 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - githubRelease:
-      tag: v1.24.13+k3s1
-      url: https://api.github.com/repos/k3s-io/k3s/releases/100133123
+      tag: v1.24.14+k3s1
+      url: https://api.github.com/repos/k3s-io/k3s/releases/104461788
     path: github.com/k3s-io/k3s
   - githubRelease:
       tag: v0.27.4

vendir.yml

@@ -11,7 +11,7 @@ directories:
   - path: github.com/k3s-io/k3s
     githubRelease:
       slug: k3s-io/k3s
-      tag: v1.24.13+k3s1 
+      tag: v1.24.14+k3s1 
       disableAutoChecksumValidation: true 
     includePaths:
     - "k3s"