Merge pull request #120 from poblin-orange/develop

version 124.3

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

@@ -7,6 +7,10 @@ builds:
     version: 12fa7f8a92464c3b5407109f87d962c8cf5f6023dfbc21fd466ea57de011bfb1
     blobstore_id: 41c89ae7-8b26-46bc-43e5-e272541ceb3f
     sha1: sha256:044bcfc366acb02f7c888a5549c9bb06c0bf23666835f7ebb826c9cef14f65c0
+  14c3a45a7556c3adee7dd7c8910ffc0d6527761af6e0dfd777091977d2f87a0c:
+    version: 14c3a45a7556c3adee7dd7c8910ffc0d6527761af6e0dfd777091977d2f87a0c
+    blobstore_id: c36cb043-9b8f-4c0f-4242-90c68404a8fb
+    sha1: sha256:0ea2ca7399f49df47a7a6cbbcf438c2ead48c3455d61cd450427bcbc3af9151f
   277c74e3c6ef78ceea4ef75e53e3119186abd5bdfe45a9a2abc5f51b22993b42:
     version: 277c74e3c6ef78ceea4ef75e53e3119186abd5bdfe45a9a2abc5f51b22993b42
     blobstore_id: feeafba0-4960-4b57-50e8-54fb13f74224

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

@@ -55,6 +55,10 @@ builds:
     version: 5c689f4cbed991990f018e37f6bdec6e6bae4d40903a2ca174ea97bc83fcc211
     blobstore_id: a1520f02-60bf-4a66-5280-532613958e18
     sha1: sha256:f7bd953c018b897b358ffeb8e328210f3e1a2ab4d61aa8bc85013eaebdd28e0c
+  5f71005ddc0e614e57088d55e44f9ba895a9fbc54c3ccf7656d0cbb5e32c0cb2:
+    version: 5f71005ddc0e614e57088d55e44f9ba895a9fbc54c3ccf7656d0cbb5e32c0cb2
+    blobstore_id: e0e0b59d-db9b-48f3-7fb2-86d140a01180
+    sha1: sha256:1f3c2aad11c98d03a7799625ad6a1cdf206940418c91e4881e8217badbcf5e95
   654052ec63c1dea497b962f85a56e91c59932c33794c0c2bc6a0c4e2ee864b2d:
     version: 654052ec63c1dea497b962f85a56e91c59932c33794c0c2bc6a0c4e2ee864b2d
     blobstore_id: 544eee63-94d3-4cae-7109-6467e58474c4

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

@@ -51,6 +51,10 @@ builds:
     version: 9b62788662a8bcdbba54b87f296239ff6e030f6f4810733301a877e627d080d3
     blobstore_id: 4119b972-97b3-4f4f-5249-6c1b8f61fec7
     sha1: sha256:ca55c357e28ce2a354374ce4a6b48c7c48b7be0655eeafabc1025b6c3a8a7765
+  a16ce2041f67cebc88abecf01a53170ec42c573dcf85a5bdaf24fec785b7e21e:
+    version: a16ce2041f67cebc88abecf01a53170ec42c573dcf85a5bdaf24fec785b7e21e
+    blobstore_id: 32199b34-8e66-4dc2-52b7-fdee32564a70
+    sha1: sha256:269ed13519fd43c1229e3e27ba74177c1a56a235a630370db3baa142dfb6caf6
   a93c0f96c237ca3786c5257f9bc00e4cc5b67c9854731d782dd4f4ca5967d43a:
     version: a93c0f96c237ca3786c5257f9bc00e4cc5b67c9854731d782dd4f4ca5967d43a
     blobstore_id: b9a60276-4959-45bf-6179-5353331556f8

.final_builds/packages/k3s/index.yml

@@ -75,6 +75,10 @@ builds:
     version: be8e322774147b362f8e38416fbd6441f048c2f3d80e1af7fd3ef50b5af44f7b
     blobstore_id: 0c425b9c-6cbe-48c4-5143-73b559de2cb9
     sha1: sha256:4ffe7859778fe56ab0e40aeb787ffdf001a5a6f543e9e93e228f475189879341
+  c669f9ecbc24fdd1c43ad76efe48c06462847af2b846304109217add21eaa875:
+    version: c669f9ecbc24fdd1c43ad76efe48c06462847af2b846304109217add21eaa875
+    blobstore_id: 7245ad47-7be9-4c11-6dc6-7a8aa9e9ceb4
+    sha1: sha256:f58b052f562cf24da1c7bd2cbb90b0e84ba954b3bdcced2c709ce194ce72af8c
   ca2f1c2bf944fca181373694cfbd9d71351e41d5c067423fc7d2aadbceddfaf9:
     version: ca2f1c2bf944fca181373694cfbd9d71351e41d5c067423fc7d2aadbceddfaf9
     blobstore_id: 37a2c272-13a0-482d-66d5-463556ccfb7f

config/blobs.yml

@@ -1,20 +1,20 @@
 k3s-images/k3s-airgap-images-amd64.tar:
-  size: 554935808
-  object_id: 7e020fdb-e9fb-4208-7c70-38b6bc0c5615
-  sha: sha256:356552df2dbe514a54f0558021cb2c98349ee8de5161c91370f46790853e85c6
+  size: 570321408
+  object_id: 29d6b056-bd58-4ee5-412b-11e25d3f31f2
+  sha: sha256:06aff693f3c62f31bdd71062d2b94373eb3b4d5d0e382498785849065d6e6099
 k3s/k3s:
-  size: 66809856
-  object_id: e752bcf9-c117-4d08-66b5-6268f8e3c0db
-  sha: sha256:c57c55a50e470aab4fa915f8da73400de8a6a75a98d91514778ec1a9931c678a
+  size: 66818048
+  object_id: 2fe6b9a0-e7a5-45e0-5030-04b02db266f1
+  sha: sha256:9556a00fc3514a09934952550cb49b46559bcce703c0a7af31969559692f5160
 k9s/k9s:
   size: 58847232
-  object_id: 2947d2a8-89c3-4021-4f25-a1f63bb964ee
+  object_id: f5018765-6d8d-4836-54d2-c1a6ad0ec78d
   sha: sha256:09a7bb21255f794501946467a333b99d8fe77f1e4c8a91409f75d80723b80fee
 kubectl/kubectl:
   size: 45752320
-  object_id: ec5cd13e-68cc-4672-7146-fba9e8a63d8c
+  object_id: 1b0c277a-e7fe-4c64-617c-bfebaa284946
   sha: sha256:7e13f33b7379b6c25c3ae055e4389eb3eef168e563f37b5c5f1be672e46b686e
 nerdctl/nerdctl:
   size: 24952832
-  object_id: 032b8adb-93bf-44db-424e-1abf54eaeb89
+  object_id: 2f3453a0-4cc1-400b-42a1-390f7cd24f3f
   sha: sha256:07ce98d7c0975bd6e86fdf36e6826dd99fa183c84f65aab9d4f709659cbf04cc

jobs/k3s-agent/spec

@@ -63,9 +63,7 @@ properties:
   k3s.bind-address value:
     description: "(listener) k3s bind address (default: 0.0.0.0)"
     default: 0.0.0.0
-  k3s.flannel-backend:
-    description: (networking) One of 'none', 'vxlan', 'ipsec', or 'wireguard'
-    default: vxlan
+
   k3s.token:
     description: (cluster) Shared secret used to join a server or agent to a cluster [$K3S_TOKEN]
 
@@ -116,6 +114,10 @@ properties:
   k3s.drain.selector:  #Not implemented
     description: Selector (label query) to filter on
 
+  k3s.bosh-post-start-delay-seconds:
+    description: bosh post start tempo, to let the kubelet start the pods before bosh triggers another node update
+    default: 30
+
 #token-file
   k3s.token-file-content:
     description: token-file content. see https://kubernetes.io/docs/reference/access-authn-authz/authentication/#static-token-file

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

@@ -47,6 +47,7 @@ case $1 in
 <% end %>
 
 
+
 <% if_p('k3s.node-labels') do |value| %>
 <% p('k3s.node-labels').each do |label| %>
     export FLAGS="$FLAGS --node-label <%= label %>"
@@ -99,6 +100,7 @@ export FLAGS="$FLAGS --kubelet-arg=config=/var/vcap/jobs/k3s-agent/config/kubele
 
     ulimit -n 1048576    # open files
     ulimit -u unlimited  # num processes
+    mount --make-rshared /
 
     exec  /var/vcap/packages/k3s/k3s agent \
     -v <%= p('k3s.v') %> \

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

@@ -15,7 +15,7 @@ EOF
 
 <% end %>
 
+#tempo to wait for kubelet to schedule pods before finishing instance group update
+sleep <%= p('k3s.bosh-post-start-delay-seconds') %>
 
 echo 0; exit 0
-
-exit 0

jobs/k3s-agent/templates/bin/pre-start.erb

@@ -11,6 +11,4 @@ mkdir -p /etc
 mkdir -p /var/vcap/store/k3s-node/etc/rancher
 ln -sf  /var/vcap/store/k3s-node/etc/rancher /etc/rancher
 
-mount --make-rshared /
-
 exit 0

jobs/k3s-server/spec

@@ -63,9 +63,13 @@ properties:
   k3s.bind-address value:
     description: "(listener) k3s bind address (default: 0.0.0.0)"
     default: 0.0.0.0
-  k3s.flannel-backend:                    
+  k3s.flannel-backend:
     description: (networking) One of 'none', 'vxlan', 'ipsec', or 'wireguard'
     default: vxlan
+
+  k3s.disable-network-policy:
+    description: "(components) Disable k3s default network policy controller"
+
   k3s.token:
     description: (cluster) Shared secret used to join a server or agent to a cluster [$K3S_TOKEN]
 
@@ -137,6 +141,12 @@ properties:
   k3s.drain.selector:  #Not implemented
     description: Selector (label query) to filter on
 
+  k3s.bosh-post-start-delay-seconds:
+    description: bosh post start tempo, to let the kubelet start the pods before bosh triggers another node update
+    default: 30
+
+
+
 ## db options
   k3s.datastore-endpoint:
     description: Specify etcd, Mysql, Postgres, or Sqlite (default) data source name

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

@@ -59,6 +59,17 @@ case $1 in
     export FLAGS="$FLAGS --disable-cloud-controller"
 <% end %>
 
+
+<% if_p('k3s.flannel-backend') do |value| %>
+    export FLAGS="$FLAGS --flannel-backend=<%= value %>"
+<% end %>
+
+
+<% if_p('k3s.disable-network-policy') do |value| %>
+    export FLAGS="$FLAGS --disable-network-policy"
+<% end %>
+
+
 <% if_p('k3s.node-labels') do |value| %>
 <% p('k3s.node-labels').each do |label| %>
     export FLAGS="$FLAGS --node-label <%= label %>"
@@ -170,6 +181,7 @@ export FLAGS="$FLAGS --kubelet-arg=config=/var/vcap/jobs/k3s-server/config/kubel
 
     ulimit -n 1048576    # open files
     ulimit -u unlimited  # num processes
+    mount --make-rshared /
 
 
     exec  /var/vcap/packages/k3s/k3s server \

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

@@ -15,3 +15,7 @@ timeout 300 sh -c 'until nc -z <%= vip %> 6443; do sleep 1; done' /var/vcap/pack
 #uncordon
 /var/vcap/packages/kubectl-k3s/kubectl --kubeconfig=/var/vcap/store/k3s-server/kubeconfig.yml uncordon <%= spec.name %>-<%= spec.index %>
 
+
+#tempo to wait for kubelet to schedule pods before finishing instance group update
+
+sleep <%= p('k3s.bosh-post-start-delay-seconds') %>

jobs/k3s-server/templates/bin/pre-start.erb

@@ -19,6 +19,4 @@ chmod go-r /var/vcap/jobs/k3s-server/config/datastore-*
 mkdir -p /var/vcap/store/k3s-server/
 cp -f $JOB_DIR/config/additional-manifest.yaml /var/vcap/store/k3s-server/server/manifests/additional-manifest.yaml
 
-mount --make-rshared /
-
 exit 0

releases/k3s/index.yml

@@ -15,6 +15,8 @@ builds:
     version: "18"
   456fe599-168d-4fc0-4fbb-8b62c7e2c4d5:
     version: "124.1"
+  47c9900d-8418-412d-48f6-0528b636160e:
+    version: "124.3"
   4add4f9b-18e6-4f8f-51c9-905934c9aff1:
     version: "29"
   4bd13971-4d5f-45ef-71cd-8b9f587f8fa1:

releases/k3s/k3s-124.3.yml

@@ -0,0 +1,65 @@
+name: k3s
+version: "124.3"
+commit_hash: bd1432b
+uncommitted_changes: false
+jobs:
+- name: k3s-agent
+  version: 14c3a45a7556c3adee7dd7c8910ffc0d6527761af6e0dfd777091977d2f87a0c
+  fingerprint: 14c3a45a7556c3adee7dd7c8910ffc0d6527761af6e0dfd777091977d2f87a0c
+  sha1: sha256:0ea2ca7399f49df47a7a6cbbcf438c2ead48c3455d61cd450427bcbc3af9151f
+  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: 5f71005ddc0e614e57088d55e44f9ba895a9fbc54c3ccf7656d0cbb5e32c0cb2
+  fingerprint: 5f71005ddc0e614e57088d55e44f9ba895a9fbc54c3ccf7656d0cbb5e32c0cb2
+  sha1: sha256:1f3c2aad11c98d03a7799625ad6a1cdf206940418c91e4881e8217badbcf5e95
+  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: c669f9ecbc24fdd1c43ad76efe48c06462847af2b846304109217add21eaa875
+  fingerprint: c669f9ecbc24fdd1c43ad76efe48c06462847af2b846304109217add21eaa875
+  sha1: sha256:f58b052f562cf24da1c7bd2cbb90b0e84ba954b3bdcced2c709ce194ce72af8c
+  dependencies: []
+- name: k3s-images
+  version: a16ce2041f67cebc88abecf01a53170ec42c573dcf85a5bdaf24fec785b7e21e
+  fingerprint: a16ce2041f67cebc88abecf01a53170ec42c573dcf85a5bdaf24fec785b7e21e
+  sha1: sha256:269ed13519fd43c1229e3e27ba74177c1a56a235a630370db3baa142dfb6caf6
+  dependencies: []
+- name: k9s
+  version: 3361dc5a05232dae5ca0add2dd21bf17a91d5bad5dbb1e0ebb5e1354864118c1
+  fingerprint: 3361dc5a05232dae5ca0add2dd21bf17a91d5bad5dbb1e0ebb5e1354864118c1
+  sha1: sha256:4438a7e72c58d1550be8a296a9f89d3b0340954ed0f21ba7c8643d2b6fd09fa2
+  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.12+k3s1
-      url: https://api.github.com/repos/k3s-io/k3s/releases/97087851
+      tag: v1.24.13+k3s1
+      url: https://api.github.com/repos/k3s-io/k3s/releases/100133123
     path: github.com/k3s-io/k3s
   - githubRelease:
       tag: v0.27.3

vendir.yml

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