Merge pull request #81 from poblin-orange/develop

k3s 1.21.12

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

@@ -7,6 +7,10 @@ builds:
     version: 12fa7f8a92464c3b5407109f87d962c8cf5f6023dfbc21fd466ea57de011bfb1
     blobstore_id: 41c89ae7-8b26-46bc-43e5-e272541ceb3f
     sha1: sha256:044bcfc366acb02f7c888a5549c9bb06c0bf23666835f7ebb826c9cef14f65c0
+  277c74e3c6ef78ceea4ef75e53e3119186abd5bdfe45a9a2abc5f51b22993b42:
+    version: 277c74e3c6ef78ceea4ef75e53e3119186abd5bdfe45a9a2abc5f51b22993b42
+    blobstore_id: feeafba0-4960-4b57-50e8-54fb13f74224
+    sha1: sha256:463086b0baf9e35cfd4684ecb6ffab2f09e05f28ddc5e39e9702a1aac37ba5d3
   31331644ddf17d3128cc2c5be631f950c381d85f31b0da879bb3e7ec87c7425d:
     version: 31331644ddf17d3128cc2c5be631f950c381d85f31b0da879bb3e7ec87c7425d
     blobstore_id: 6a9f3709-73d3-4141-5fd5-8039866d0591

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

@@ -7,6 +7,10 @@ builds:
     version: 0e2deda2433a51cf68a0e19d14f5f0521d0e2805f29e978cec59538b194a2365
     blobstore_id: f69713b9-a328-46b0-533d-d93036e7ff74
     sha1: sha256:2a881762069f869bdb1e8a530b64bac6554a248e3326bf6b3cc2c5f25202a089
+  11f8ae5e7bda510b976e13d912761b110e3a412548c9acada92801d1fdcf8a8c:
+    version: 11f8ae5e7bda510b976e13d912761b110e3a412548c9acada92801d1fdcf8a8c
+    blobstore_id: cd2b0064-bd00-4da8-4061-68681b81c918
+    sha1: sha256:a3c3c4c6df250955a293c420fe5302d0777500c62727c15522d1785a04d96fff
   12c493dca43ef98384446c9cd58a2e27ccc5a4ec9460e26e79e26650fc28b117:
     version: 12c493dca43ef98384446c9cd58a2e27ccc5a4ec9460e26e79e26650fc28b117
     blobstore_id: ace293df-dfcc-47bd-62f7-d57aa73903fd

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

@@ -55,4 +55,8 @@ builds:
     version: f97a05198b209a472594e898e88b0e9e0bb0acf2fa930df5e8ea5338964f9e7d
     blobstore_id: 3622c3f7-34e0-4225-5e6a-a974dbdf6550
     sha1: sha256:a4be77f3d03d4156ccadc080fb450eebf301d99bed3c6dc2c44c0f14a0cb038e
+  fd637b7381cbf7bd3723659eb35968898e6f26f6e8bdae4fcd893b19ae4dd8a1:
+    version: fd637b7381cbf7bd3723659eb35968898e6f26f6e8bdae4fcd893b19ae4dd8a1
+    blobstore_id: d7029915-2048-4816-7158-f6906b2c0711
+    sha1: sha256:786cc18d6d51625ff7c3ebfaeb8a0a4484f5f00a49327c6d78dcf5c84c7312b1
 format-version: "2"

.final_builds/packages/k3s/index.yml

@@ -35,6 +35,10 @@ builds:
     version: 98291cbdc65f113ab4613899c1d5df44f2bb2a74b0eb8f91f3e97ab25261f13b
     blobstore_id: 2264bc6e-9fd2-4142-585c-a27cdb49f25b
     sha1: sha256:f0b1f4b39751f06fed8b0e7dd757c5076113df97acd60c4c2daa5765ae05c2d3
+  a471656965e4c6f4510df6f810eb3329e99051056c23814b04e7fc0f6ae8330f:
+    version: a471656965e4c6f4510df6f810eb3329e99051056c23814b04e7fc0f6ae8330f
+    blobstore_id: ca3d5637-e849-4960-6eb7-91553faf319a
+    sha1: sha256:9cf23c77b70f16916322d3a704b95293fabf7c931c34667224c9922533fe5698
   aa0b9b2a5448049da2018239119f8b9aec0b6cb8ed34b443d896728325f8258e:
     version: aa0b9b2a5448049da2018239119f8b9aec0b6cb8ed34b443d896728325f8258e
     blobstore_id: ee56e5ef-3faa-43fc-4b14-f1f2ba8b49bb

config/blobs.yml

@@ -1,11 +1,11 @@
 k3s-images/k3s-airgap-images-amd64.tar:
   size: 500852736
-  object_id: fe6c595a-14b1-441d-643d-caa140b83ad0
-  sha: sha256:74e5a861e0c977d736ebb21b1a1a9f30f7236c00ebc590ac90a476972e93c9a0
+  object_id: d0ac1937-28e7-45dd-53ea-6da3bff08239
+  sha: sha256:62675de088b3d690be769c55fc264b55d4cf6901d15c45f6ef7ac30a67e10235
 k3s/k3s:
-  size: 49090560
-  object_id: 42a5dfd9-5a02-4bed-473d-07e6e9885393
-  sha: sha256:6450ece4cf5d7ada78c0ef9e27b45bdf5aa1049fccc8e5fc55720ae1087bf0a8
+  size: 49225728
+  object_id: 8853d095-c99f-4278-5753-f856f1d6cccc
+  sha: sha256:93576e03aa4ef1c05f192517e7a4900339e5f773479ad98be524324a23315b9a
 k9s/k9s:
   size: 55410688
   object_id: 0b3b0840-1db4-4ac5-53b1-0f62a80862cb

jobs/k3s-agent/spec

@@ -74,6 +74,9 @@ properties:
     description: (agent/node) Registering kubelet with set of taints.format is key=value:Effect)
     default: []
 
+  k3s.set-provider-id-prefix:
+    description: If set, the default provider id (k3s://<instance>-<index> will be set as kubelet arg as <prefix>://<instance>-<index>
+
 
 ## drain options
   k3s.drain.kubeconfig:

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

@@ -33,6 +33,10 @@ case $1 in
     #adapt kubelet root dir to match bosh fs
     export FLAGS="$FLAGS --kubelet-arg=root-dir=/var/vcap/data/k3s-agent/kubelet"
 
+<% if_p('k3s.set-provider-id-prefix') do |prefix| %>
+    export FLAGS="$FLAGS --kubelet-arg=provider-id=<%= prefix %>://<%= spec.name %>-<%= spec.index %>"
+<% end %>
+
 
 <% if_p('k3s.node-labels') do |value| %>
 <% p('k3s.node-labels').each do |label| %>
@@ -46,11 +50,6 @@ case $1 in
 <% end %>
 <% end %>
 
-<% if_p('k3s.kubelet-arg') do |value| %>
-<% p('k3s.kubelet-arg').each do |flag| %>
-    export FLAGS="$FLAGS --kubelet-arg=<%= flag %>"
-<% end %>
-<% end %>
 
 <% if_p('k3s.kube-proxy-arg') do |value| %>
 <% p('k3s.kube-proxy-arg').each do |flag| %>
@@ -96,6 +95,8 @@ export FLAGS="$FLAGS --kubelet-arg=config=/var/vcap/jobs/k3s-agent/config/kubele
     --node-label bosh.io/bootstrap=<%= spec.bootstrap %>  \
     --node-label bosh.io/index=<%= spec.index %>  \
     --node-label bosh.io/address=<%= spec.ip %>  \
+    --node-label bosh.io/id=<%= spec.id %>  \
+    --node-label bosh.io/agent=true \
     --node-label topology.kubernetes.io/zone=<%= spec.az %> \
       $FLAGS \
       $servers \

jobs/k3s-server/spec

@@ -69,7 +69,7 @@ properties:
     description: (cluster) Shared secret used to join a server or agent to a cluster [$K3S_TOKEN]
 
 
-  k3s.kubelet-args: 
+  k3s.kubelet-args:
     description: (agent/flags) Customized flag for kubelet process
     default: []
 
@@ -79,6 +79,14 @@ properties:
     description: (components) Do not deploy packaged components and delete any deployed components (valid itemms are coredns, servicelb, traefik, local-storage, metrics-server)
     default: []
 
+  k3s.disable-cloud-controller:
+    description: (components) If set,  Disable k3s default cloud controller manager
+
+
+  k3s.set-provider-id-prefix:
+    description: If set, the default provider id (k3s://<instance>-<index> will be set as kubelet arg as <prefix>://<instance>-<index>
+
+
 
 ## additional label and taints (added to k3s and bosh default labels) 
   k3s.node-labels:

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

@@ -39,12 +39,21 @@ case $1 in
     #adapt kubelet root dir to match bosh fs
     export FLAGS="$FLAGS --kubelet-arg=root-dir=/var/vcap/data/k3s-server/kubelet"
 
+<% if_p('k3s.set-provider-id-prefix') do |prefix| %>
+    export FLAGS="$FLAGS --kubelet-arg=provider-id=<%= prefix %>://<%= spec.name %>-<%= spec.index %>"
+<% end %>
+
+
 <% if_p('k3s.disable') do |value| %>
 <% p('k3s.disable').each do |components| %>
     export FLAGS="$FLAGS --disable <%= components %>"
 <% end %>
 <% end %>
 
+<% if_p('k3s.disable-cloud-controller') do |value| %>
+    export FLAGS="$FLAGS --disable-cloud-controller"
+<% end %>
+
 <% if_p('k3s.node-labels') do |value| %>
 <% p('k3s.node-labels').each do |label| %>
     export FLAGS="$FLAGS --node-label <%= label %>"
@@ -149,6 +158,8 @@ export FLAGS="$FLAGS --kubelet-arg=config=/var/vcap/jobs/k3s-server/config/kubel
     --node-label bosh.io/bootstrap=<%= spec.bootstrap %>  \
     --node-label bosh.io/index=<%= spec.index %>  \
     --node-label bosh.io/address=<%= spec.ip %>  \
+    --node-label bosh.io/id=<%= spec.id %>  \
+    --node-label bosh.io/server=true \
     --node-label topology.kubernetes.io/zone=<%= spec.az %> \
       $FLAGS \
       >>  $LOG_DIR/k3s-server.stdout.log \

releases/k3s/index.yml

@@ -11,6 +11,8 @@ builds:
     version: "27"
   38972de0-573b-4ccf-42f3-7b9a0632a64e:
     version: "18"
+  4add4f9b-18e6-4f8f-51c9-905934c9aff1:
+    version: "29"
   4bd13971-4d5f-45ef-71cd-8b9f587f8fa1:
     version: "10"
   4c014783-a1dd-401b-59c1-2cc3e51c80d2:

releases/k3s/k3s-29.yml

@@ -0,0 +1,58 @@
+name: k3s
+version: "29"
+commit_hash: 2c5f92f
+uncommitted_changes: false
+jobs:
+- name: k3s-agent
+  version: 277c74e3c6ef78ceea4ef75e53e3119186abd5bdfe45a9a2abc5f51b22993b42
+  fingerprint: 277c74e3c6ef78ceea4ef75e53e3119186abd5bdfe45a9a2abc5f51b22993b42
+  sha1: sha256:463086b0baf9e35cfd4684ecb6ffab2f09e05f28ddc5e39e9702a1aac37ba5d3
+  packages:
+  - k3s
+  - kubectl-k3s
+  - k3s-images
+- name: k3s-agent-airgaped-images
+  version: dac8160deeef67d642c67065cdb584c53ca84807717f4b7abb3e748badb97313
+  fingerprint: dac8160deeef67d642c67065cdb584c53ca84807717f4b7abb3e748badb97313
+  sha1: sha256:56989c04162b348ce691ad78d9ceaefc4b46338df95ebe87fda1e5ce0a30d429
+  packages:
+  - k3s-images
+- name: k3s-server
+  version: 11f8ae5e7bda510b976e13d912761b110e3a412548c9acada92801d1fdcf8a8c
+  fingerprint: 11f8ae5e7bda510b976e13d912761b110e3a412548c9acada92801d1fdcf8a8c
+  sha1: sha256:a3c3c4c6df250955a293c420fe5302d0777500c62727c15522d1785a04d96fff
+  packages:
+  - k3s
+  - k9s
+  - kubectl-k3s
+- name: k3s-server-airgaped-images
+  version: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
+  fingerprint: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
+  sha1: sha256:fbae88a6d6e06d8ac29288b73a971832e77d2483978c56481844e1c7f8e77c78
+  packages:
+  - k3s-images
+packages:
+- name: k3s
+  version: a471656965e4c6f4510df6f810eb3329e99051056c23814b04e7fc0f6ae8330f
+  fingerprint: a471656965e4c6f4510df6f810eb3329e99051056c23814b04e7fc0f6ae8330f
+  sha1: sha256:9cf23c77b70f16916322d3a704b95293fabf7c931c34667224c9922533fe5698
+  dependencies: []
+- name: k3s-images
+  version: fd637b7381cbf7bd3723659eb35968898e6f26f6e8bdae4fcd893b19ae4dd8a1
+  fingerprint: fd637b7381cbf7bd3723659eb35968898e6f26f6e8bdae4fcd893b19ae4dd8a1
+  sha1: sha256:786cc18d6d51625ff7c3ebfaeb8a0a4484f5f00a49327c6d78dcf5c84c7312b1
+  dependencies: []
+- name: k9s
+  version: 8751b3231c52d45ea7efa35f7209b322e7f6ba009ace3759f052f0672d872fd2
+  fingerprint: 8751b3231c52d45ea7efa35f7209b322e7f6ba009ace3759f052f0672d872fd2
+  sha1: sha256:2498425e99005b2e433c82ab9b5bb7c40ac778eea49e46c73c8f892eba6c2bbd
+  dependencies: []
+- name: kubectl-k3s
+  version: f31573923b6cf4c6bdaa91626f558f1840a3fc53079b21d04ee53e1dcfe8e7c7
+  fingerprint: f31573923b6cf4c6bdaa91626f558f1840a3fc53079b21d04ee53e1dcfe8e7c7
+  sha1: sha256:3582db70503234eddce3522c7782245a3bbb0777c113c328d47f07313229c519
+  dependencies: []
+license:
+  version: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  fingerprint: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  sha1: sha256:cbe3175489dfaec91e9f392399fbfb68e008885feb91a3b8d493a35d2fc5a8fa

vendir.lock

@@ -2,7 +2,7 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - githubRelease:
-      url: https://api.github.com/repos/k3s-io/k3s/releases/63214645
+      url: https://api.github.com/repos/k3s-io/k3s/releases/65630171
     path: github.com/k3s-io/k3s
   - githubRelease:
       url: https://api.github.com/repos/derailed/k9s/releases/56095809

vendir.yml

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