Merge pull request #61 from poblin-orange/develop

version 22

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

@@ -43,6 +43,10 @@ builds:
     version: a4d175996786ee5d1f915411a05765fa4174895bb3b00d077c60488b42119595
     blobstore_id: aa65b3bb-66f7-45b7-678e-497b2857704a
     sha1: sha256:3f6e549c4989d7febabb3287aa9bdf54a9b9a32679129a9b34e0ee47d2bf5719
+  a4edf821060031f56e0fbbe097ca7c8dc41256be47d4550e63bee29f8e9e6a08:
+    version: a4edf821060031f56e0fbbe097ca7c8dc41256be47d4550e63bee29f8e9e6a08
+    blobstore_id: cfa97906-2a38-4c9f-5b67-7a3396c2e361
+    sha1: sha256:7ed70dfa92bf8162b798d795d40fb6a7a982dc6990beda4075fb3e063483e25a
   b2090fcd22d7ee2a9914ee24d2ce77c62e8a86594ea1aba8673a732b21e76c2d:
     version: b2090fcd22d7ee2a9914ee24d2ce77c62e8a86594ea1aba8673a732b21e76c2d
     blobstore_id: b3ec1510-a0be-4394-7835-9460919e843e

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

@@ -47,6 +47,10 @@ builds:
     version: 85cbbe9198ed988a83185dbf9ddf52e6979f18b78a902198289df16b44e37a6f
     blobstore_id: 21b746aa-39a6-40f4-5021-622a56913fb7
     sha1: sha256:3417e6aa91f950e880ec5b286ffded241c6bfef48a025a56ce69e8d65300986a
+  9f04cd73d4f7595d91de5898c210ca68a3d1b9349dc90018ea388feaf16624d5:
+    version: 9f04cd73d4f7595d91de5898c210ca68a3d1b9349dc90018ea388feaf16624d5
+    blobstore_id: d617792a-db19-4210-6a47-4e52a920aa19
+    sha1: sha256:bdb4cb81b240a673b596e05ad55d5f9146e2c6d0aa2b672570ffa56e3607d493
   a01f52790a95df1f9f9bbeeadd03fa45777a00f0f75267dc835c44ab74431edb:
     version: a01f52790a95df1f9f9bbeeadd03fa45777a00f0f75267dc835c44ab74431edb
     blobstore_id: ea78ab75-bb8a-4035-43e9-1c27ee217909

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

@@ -35,6 +35,10 @@ builds:
     version: 9b62788662a8bcdbba54b87f296239ff6e030f6f4810733301a877e627d080d3
     blobstore_id: 4119b972-97b3-4f4f-5249-6c1b8f61fec7
     sha1: sha256:ca55c357e28ce2a354374ce4a6b48c7c48b7be0655eeafabc1025b6c3a8a7765
+  bb3ac9cf8f36eb4a942180f81a9ae461459354df28f317eed882290d04a93ea3:
+    version: bb3ac9cf8f36eb4a942180f81a9ae461459354df28f317eed882290d04a93ea3
+    blobstore_id: 130324dc-da21-4544-7094-debfd2b06a5e
+    sha1: sha256:7e4aca62000901393c4e3e5a5beeb8977ab7d02edbb28e443ad5219da97b1456
   c78a8c2e8cd3d8f69ec70c3f38db944e40cdd94f79ce9a32eef8325cf9c08311:
     version: c78a8c2e8cd3d8f69ec70c3f38db944e40cdd94f79ce9a32eef8325cf9c08311
     blobstore_id: 33d21678-bde1-4b43-5283-d49ef23d4274

.final_builds/packages/k3s/index.yml

@@ -11,6 +11,10 @@ builds:
     version: 63a8458bdc0a7d3109bb5969f12af063f93d53d93574b4ca1c77b24f6beb9275
     blobstore_id: 5a907264-fd3b-475c-5643-13cf523a76f5
     sha1: sha256:9a7a3a302f7fe84323a92fb32dabaf0ed5203765472a12636e31ff02f339b583
+  76970f0fa8bbbadd2a1b95ac15fedfd009643d04ae2ae06b81730e5a30c283cf:
+    version: 76970f0fa8bbbadd2a1b95ac15fedfd009643d04ae2ae06b81730e5a30c283cf
+    blobstore_id: ce8192c4-a351-4193-52c3-5647c54d9cdc
+    sha1: sha256:471f04a12cd044b97ece0dd9e552660c514a9cb91ac177d308dd23cbef9561ff
   79950a7a1c37a84c0cda3cd8ed316bb4e4dcdbeea8a079cdcf5e5009bbac58f9:
     version: 79950a7a1c37a84c0cda3cd8ed316bb4e4dcdbeea8a079cdcf5e5009bbac58f9
     blobstore_id: d379e0a2-1a6d-4046-5e00-6587f5634ca9

.final_builds/packages/k9s/index.yml

@@ -3,6 +3,10 @@ builds:
     version: 24b739026ef4bf491afc64ba3f32f7373dfe02e72f3f12a99af4f2c2b0eb106b
     blobstore_id: 4da80913-361d-4ba5-7f98-96d9b41011a9
     sha1: sha256:c1cffd40cbbb48bd80a35acf981d428051740da0c68835de7bede43d24cb3ece
+  8751b3231c52d45ea7efa35f7209b322e7f6ba009ace3759f052f0672d872fd2:
+    version: 8751b3231c52d45ea7efa35f7209b322e7f6ba009ace3759f052f0672d872fd2
+    blobstore_id: 481d614c-eadc-476b-5619-a05ebdcf62d6
+    sha1: sha256:2498425e99005b2e433c82ab9b5bb7c40ac778eea49e46c73c8f892eba6c2bbd
   9b556fa69d85046816daa09f737ed1d1137323e671727a09780396d57781ba5e:
     version: 9b556fa69d85046816daa09f737ed1d1137323e671727a09780396d57781ba5e
     blobstore_id: 55f6b46d-f3be-4b39-7971-411eb12ee0ec

config/blobs.yml

@@ -1,16 +1,16 @@
 k3s-images/k3s-airgap-images-amd64.tar:
   size: 464734208
-  object_id: 36ae9d6e-bb98-446c-71c3-bcba61379bbe
-  sha: sha256:f7ea16000b21741f6a21b2869f62e4f769154c91d85cc61ecd0146f75a0b691b
+  object_id: f2ea0af0-32c5-4739-412a-39ae41b97ea6
+  sha: sha256:cbb8db5ab3f2c266fde09cd273064ff0b1fe86ca131a25dac780ef880f3bb481
 k3s/k3s:
-  size: 47230976
-  object_id: 961a8805-55b9-4326-79a2-33b4f84a0a2b
-  sha: sha256:cc9783c1b55360a750e102e7f76ef40353ac7d25fdb56f2e60e4bfe4c27ea5a9
+  size: 47276032
+  object_id: bb871bf7-4d31-4bdb-7e6a-66c3dc7d05dc
+  sha: sha256:44e8db2e6ce8677117e619a02b756006cb023906c88e69bf2533c37073f28a60
 k9s/k9s:
-  size: 55345152
-  object_id: ab60c63b-4855-4d38-73bf-aa90ddc5d976
-  sha: sha256:eb54cb3eca51f102683d30350f793f350d585794bb56f6323009445ab4fe7b8a
+  size: 55410688
+  object_id: 187c879e-8db3-4137-44b5-66a565e8f331
+  sha: sha256:eabb69c297a459f85e530ae84d682f2be321c1b7c607aa6d5dad113b1ceb11cb
 kubectl/kubectl:
   size: 40226816
-  object_id: a35d9768-942e-40a8-4596-30fd8062131c
+  object_id: fb13433e-aa60-4bb8-68ab-59c0fcdd18aa
   sha: sha256:2ea3006a64d48657ac72223a01c6df0e5b827703263f2586da28044ea9e97daf

jobs/k3s-agent/templates/bin/envrc

@@ -1,4 +1,6 @@
 #!/bin/bash
 
 export PATH=$PATH:/var/vcap/packages/k3s
-alias crictl="k3s crictl -c /var/vcap//store/k3s-agent/agent/etc/crictl.yaml"
+export PATH=$PATH:/var/vcap/packages/kubectl-k3s
+
+alias crictl="k3s crictl -c /var/vcap/store/k3s-agent/agent/etc/crictl.yaml"

jobs/k3s-agent/templates/bin/k3s-killall.sh

@@ -63,6 +63,7 @@ do_unmount() {
 do_unmount '/run/k3s'
 do_unmount '/var/lib/rancher/k3s'
 do_unmount '/var/vcap/data/k3s-agent/kubelet/pods' #bosh fs layout adaptation
+do_unmount '/var/vcap/data/k3s-agent/kubelet/plugins/kubernetes.io/csi' #bosh fs adaptation for csi mount (eg: longhorn)
 do_unmount '/run/netns/cni-'
 
 # Delete network interface(s) that match 'master cni0'

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

@@ -1,6 +1,11 @@
 #!/bin/sh
+export JOB_DIR=/var/vcap/jobs/k3s-agent
 /var/vcap/packages/k3s/k3s check-config
 
+# Setup ssh env vars
+${JOB_DIR}/bin/setup-user-env
+
+
 #prepare a persistent directory so /etc/rancher/node paswword file is kept on bosh recreate
 mkdir -p /etc
 mkdir -p /var/vcap/store/k3s-node/etc/rancher

jobs/k3s-server/templates/bin/k3s-killall.sh

@@ -63,6 +63,8 @@ do_unmount() {
 do_unmount '/run/k3s'
 do_unmount '/var/lib/rancher/k3s'
 do_unmount '/var/vcap/data/k3s-agent/kubelet/pods' #bosh fs layout adaptation
+do_unmount '/var/vcap/data/k3s-agent/kubelet/plugins/kubernetes.io/csi' #bosh fs adaptation for csi mount (eg: longhorn)
+
 do_unmount '/run/netns/cni-'
 
 # Delete network interface(s) that match 'master cni0'

releases/k3s/index.yml

@@ -29,6 +29,8 @@ builds:
     version: "17"
   7f7ad91b-e067-4862-4b39-b2fb7b241259:
     version: "2"
+  90cdc6d1-cf5e-4db7-4156-64c9842867c8:
+    version: "22"
   aa13e70f-e6f6-402f-54ae-3505a9e67570:
     version: "7"
   b1374cae-5d51-4318-58fc-f2734f5077b3:

releases/k3s/k3s-22.yml

@@ -0,0 +1,58 @@
+name: k3s
+version: "22"
+commit_hash: 746da5b
+uncommitted_changes: false
+jobs:
+- name: k3s-agent
+  version: a4edf821060031f56e0fbbe097ca7c8dc41256be47d4550e63bee29f8e9e6a08
+  fingerprint: a4edf821060031f56e0fbbe097ca7c8dc41256be47d4550e63bee29f8e9e6a08
+  sha1: sha256:7ed70dfa92bf8162b798d795d40fb6a7a982dc6990beda4075fb3e063483e25a
+  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: 9f04cd73d4f7595d91de5898c210ca68a3d1b9349dc90018ea388feaf16624d5
+  fingerprint: 9f04cd73d4f7595d91de5898c210ca68a3d1b9349dc90018ea388feaf16624d5
+  sha1: sha256:bdb4cb81b240a673b596e05ad55d5f9146e2c6d0aa2b672570ffa56e3607d493
+  packages:
+  - k3s
+  - k9s
+  - kubectl-k3s
+- name: k3s-server-airgaped-images
+  version: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
+  fingerprint: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
+  sha1: sha256:fbae88a6d6e06d8ac29288b73a971832e77d2483978c56481844e1c7f8e77c78
+  packages:
+  - k3s-images
+packages:
+- name: k3s
+  version: 76970f0fa8bbbadd2a1b95ac15fedfd009643d04ae2ae06b81730e5a30c283cf
+  fingerprint: 76970f0fa8bbbadd2a1b95ac15fedfd009643d04ae2ae06b81730e5a30c283cf
+  sha1: sha256:471f04a12cd044b97ece0dd9e552660c514a9cb91ac177d308dd23cbef9561ff
+  dependencies: []
+- name: k3s-images
+  version: bb3ac9cf8f36eb4a942180f81a9ae461459354df28f317eed882290d04a93ea3
+  fingerprint: bb3ac9cf8f36eb4a942180f81a9ae461459354df28f317eed882290d04a93ea3
+  sha1: sha256:7e4aca62000901393c4e3e5a5beeb8977ab7d02edbb28e443ad5219da97b1456
+  dependencies: []
+- name: k9s
+  version: 8751b3231c52d45ea7efa35f7209b322e7f6ba009ace3759f052f0672d872fd2
+  fingerprint: 8751b3231c52d45ea7efa35f7209b322e7f6ba009ace3759f052f0672d872fd2
+  sha1: sha256:2498425e99005b2e433c82ab9b5bb7c40ac778eea49e46c73c8f892eba6c2bbd
+  dependencies: []
+- name: kubectl-k3s
+  version: 879683d1f72b98af4d9cfa29f5855db733d76aed08a5b868ef0c4322262e6fc0
+  fingerprint: 879683d1f72b98af4d9cfa29f5855db733d76aed08a5b868ef0c4322262e6fc0
+  sha1: sha256:345fd8dc9ca93d43658a80b360f730e6a9ba43bac02be1b6ab3c16a1584e5cc7
+  dependencies: []
+license:
+  version: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  fingerprint: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  sha1: sha256:cbe3175489dfaec91e9f392399fbfb68e008885feb91a3b8d493a35d2fc5a8fa

vendir.lock

@@ -2,10 +2,10 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - githubRelease:
-      url: https://api.github.com/repos/k3s-io/k3s/releases/52643096
+      url: https://api.github.com/repos/k3s-io/k3s/releases/55583387
     path: github.com/k3s-io/k3s
   - githubRelease:
-      url: https://api.github.com/repos/derailed/k9s/releases/53558283
+      url: https://api.github.com/repos/derailed/k9s/releases/56095809
     path: github.com/derailed/k9s
   path: src
 kind: LockConfig

vendir.yml

@@ -11,7 +11,7 @@ directories:
   - path: github.com/k3s-io/k3s
     githubRelease:
       slug: k3s-io/k3s
-      tag: v1.20.12+k3s1 
+      tag: v1.20.14+k3s1 
       disableAutoChecksumValidation: true 
     includePaths:
     - "k3s"
@@ -21,7 +21,7 @@ directories:
   - path: github.com/derailed/k9s
     githubRelease:
       slug: derailed/k9s
-      tag: v0.25.3
+      tag: v0.25.18
       disableAutoChecksumValidation: true 
     includePaths:
     - "k9s_Linux_x86_64.tar.gz"