Merge pull request #48 from poblin-orange/develop

version 18 PR.

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

@@ -43,4 +43,8 @@ builds:
     version: e75d3a2bafa394c6eed9cdd360a93f2c31092bea3db75f96790a8b07dbca7e2e
     blobstore_id: 25212fb8-33f5-4785-4d6b-0226f5580352
     sha1: sha256:97285787230e13113fb3a677a5171722cb25931791d96921a6ee6e8983c7121f
+  ea4abc985fd6300b1d7713b34758e986850e21298072a2f88f554c9499a31c28:
+    version: ea4abc985fd6300b1d7713b34758e986850e21298072a2f88f554c9499a31c28
+    blobstore_id: acf38584-093c-46f0-7010-d8ab32f85bc8
+    sha1: sha256:da5f98174808a23c6be576a1ec0bc4662a56d4b0ee7c3a95d004f18a0890f31b
 format-version: "2"

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

@@ -51,6 +51,10 @@ builds:
     version: b9298fe853acb9680ff2c3fbe595a70fed8ed7133fd57229f49c0d8a893fe87e
     blobstore_id: 485f371e-636d-46cf-51b0-bc176661c25d
     sha1: sha256:fb4739c3ddcfe126b0bba8569f5c3e79f3ed6014678e7f60eedc6eb1120bcad2
+  ca23ca546f68cf61fcd1ab4e90c591f0dfed8aed6d48ff61fa546a9516c92150:
+    version: ca23ca546f68cf61fcd1ab4e90c591f0dfed8aed6d48ff61fa546a9516c92150
+    blobstore_id: aa8b0336-14ec-40a7-460b-128f90104cca
+    sha1: sha256:3377688e3e506127447f98ed45dd2282875e86227b4e195387848c10a7c35732
   e2d4607b2ca54abbad5540e320dcb6b419260b3991b3b7d4906dbd8fe5210b2f:
     version: e2d4607b2ca54abbad5540e320dcb6b419260b3991b3b7d4906dbd8fe5210b2f
     blobstore_id: a0d4c35d-9470-41b6-6d8d-d0764f01904a

.final_builds/packages/k9s/index.yml

@@ -7,6 +7,10 @@ builds:
     version: aace0b38859c00e13f6c985d0711fff0213d5d77b894912554ab020ec775a88b
     blobstore_id: ba66175f-21d3-4a23-43cc-30924c1c28b6
     sha1: sha256:a7ab0bb41adee47313137197d558273451c435a44ddc95d61f5f733bb9ad4db1
+  b9124d1132db86c7f2ab4ff11e4a9191a14b4436dc6c552bc512c8d1e030bbbc:
+    version: b9124d1132db86c7f2ab4ff11e4a9191a14b4436dc6c552bc512c8d1e030bbbc
+    blobstore_id: f99a9ee3-d13f-421b-4e52-2f713786c806
+    sha1: sha256:b718efb60ce64a6c6e09b4e7cdc1fc6e4d891c8cdc0e48a98b0cacc2300d8e08
   fb3cd5c6d3c497bb2ed24b937fd6ffc1c8583ac87f96bbb04d2f39327a7a81a0:
     version: fb3cd5c6d3c497bb2ed24b937fd6ffc1c8583ac87f96bbb04d2f39327a7a81a0
     blobstore_id: 36ec1b20-e3e7-4d0b-5d5a-211a3b0f8ebc

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

@@ -7,6 +7,10 @@ builds:
     version: 41fe074fc5fe879b1909bdc82b3050c42b94e2d4aa945de2ce4e5f5737feb8dc
     blobstore_id: 7c6d7770-354c-44b0-6150-82614409dfb2
     sha1: sha256:79ec01ab7c166b7121052ee44ce0109bb0318bb8e14e5e23c7b1d9dc5f619910
+  879683d1f72b98af4d9cfa29f5855db733d76aed08a5b868ef0c4322262e6fc0:
+    version: 879683d1f72b98af4d9cfa29f5855db733d76aed08a5b868ef0c4322262e6fc0
+    blobstore_id: f4ffde28-4bdc-4d49-7fcf-a4a67b66a25a
+    sha1: sha256:345fd8dc9ca93d43658a80b360f730e6a9ba43bac02be1b6ab3c16a1584e5cc7
   b744c9fb2cb552dda942fb982ac3efac6f68425bf7e1f5818ee9dc465576e88f:
     version: b744c9fb2cb552dda942fb982ac3efac6f68425bf7e1f5818ee9dc465576e88f
     blobstore_id: df57a1cd-8f60-4ee0-7678-0907d768810d

addblob.sh

@@ -4,11 +4,14 @@ bosh add-blob src/github.com/k3s-io/k3s/k3s k3s/k3s
 bosh add-blob src/github.com/k3s-io/k3s/k3s-airgap-images-amd64.tar k3s-images/k3s-airgap-images-amd64.tar
 
 pushd src/github.com/derailed/k9s/
-tar xfv ./k9s_Linux_x86_64.tar.gz
+tar xfv ./k9s_v0.24.10_Linux_x86_64.tar.gz
 popd
 bosh add-blob src/github.com/derailed/k9s/k9s k9s/k9s
 
-#curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.19.10/bin/linux/amd64/kubectl -O src/kubectl
-#bosh add-blob src/kubectl kubectl/kubectl
+pushd src
+curl -LO https://dl.k8s.io/release/v1.20.7/bin/linux/amd64/kubectl --output ./src/kubectl
+chmod ugo+x kubectl
+popd
+bosh add-blob src/kubectl kubectl/kubectl
 
 

config/blobs.yml

@@ -7,10 +7,10 @@ k3s/k3s:
   object_id: c1aa8dfc-d74f-4612-4075-ebc6d1195311
   sha: sha256:95b91eb9af7fed60d5201d783edcd0de1f84fb5953cee2286fd0e5cf4d30d3f5
 k9s/k9s:
-  size: 50520064
-  object_id: 9fd21918-d323-444d-4c01-6961e6838a8f
-  sha: sha256:6427411c51754345495a94261d4d076827de34c7121697a1d038520d246cb70b
+  size: 50528256
+  object_id: dd46f679-cdc8-455b-5de7-296546059140
+  sha: sha256:c6348e90f23eef119f694ae103c2beee0022cd39306162fbed4ab255fecd2fcc
 kubectl/kubectl:
-  size: 42946560
-  object_id: 46666436-f12a-45b1-7433-a054094e3696
-  sha: sha256:dbacc1a372f00e2d15ad9a39925191c4e314e39b37dcac3e5b2f5e98f4be0d47
+  size: 40226816
+  object_id: d0f0648b-0798-4a00-7500-cd4171a90c02
+  sha: sha256:2ea3006a64d48657ac72223a01c6df0e5b827703263f2586da28044ea9e97daf

jobs/k3s-agent/spec

@@ -112,7 +112,7 @@ properties:
 
 ## args
 
-  k3s.kubelet-arg:
+  k3s.kubelet-args:
     description: (agent/flags) Customized flag for kubelet process
     default: []
 

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

@@ -51,14 +51,21 @@ case $1 in
 <% end %>
 <% end %>
 
+<% if_p('k3s.kubelet-args') do |value| %>
+<% p('k3s.kubelet-args').each do |flag| %>
+    export FLAGS="$FLAGS --kubelet-arg=<%= flag %>"
+<% end %>
+<% end %>
+
 
     exec  /var/vcap/packages/k3s/k3s agent \
     -v <%= p('k3s.v') %> \
     --token=<%= p('k3s.token') %> \
     --data-dir=/var/vcap/store/k3s-agent \
     --private-registry=/var/vcap/jobs/k3s-agent/config/registries.yaml \
     --resolv-conf=/etc/resolv.conf \
-    --node-external-ip=<%= spec.ip %> \
+    --node-ip=<%= spec.ip %> \
+    --node-external-ip=<%= spec.ip != spec.networks.marshal_dump.values.first.ip ? spec.networks.marshal_dump.values.first.ip : spec.networks.marshal_dump.values.last.ip %> \
     --node-label bosh.io/az=<%= spec.az %> \
     --node-label bosh.io/name=<%= spec.name %>  \
     --node-label bosh.io/bootstrap=<%= spec.bootstrap %>  \

jobs/k3s-agent/templates/bin/envrc

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

jobs/k3s-server/spec

@@ -68,9 +68,9 @@ properties:
     description: (cluster) Shared secret used to join a server or agent to a cluster [$K3S_TOKEN]
 
 
-  k3s.kubelet-arg: 
+  k3s.kubelet-args: 
     description: (agent/flags) Customized flag for kubelet process
-    default: ""
+    default: []
 
 
 #disable defaut k3s components

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

@@ -81,13 +81,21 @@ case $1 in
 <% end %>
 <% end %>
 
+<% if_p('k3s.kubelet-args') do |value| %>
+<% p('k3s.kubelet-args').each do |flag| %>
+    export FLAGS="$FLAGS --kubelet-arg=<%= flag %>"
+<% end %>
+<% end %>
+
 
     echo $$ > $PIDFILE
 
     exec  /var/vcap/packages/k3s/k3s server \
     -v <%= p('k3s.v') %> \
     --token=<%= p('k3s.token') %> \
     --resolv-conf=/etc/resolv.conf \
+    --node-ip=<%= spec.ip %> \
+    --node-external-ip=<%= spec.ip != spec.networks.marshal_dump.values.first.ip ? spec.networks.marshal_dump.values.first.ip : spec.networks.marshal_dump.values.last.ip %> \
     --data-dir=/var/vcap/store/k3s-server \
     --default-local-storage-path=/var/vcap/store/k3s-local-storage-path \
     --private-registry=/var/vcap/jobs/k3s-server/config/registries.yaml \

jobs/k3s-server/templates/bin/envrc

@@ -5,4 +5,4 @@ export PATH=$PATH:/var/vcap/packages/k9s
 export PATH=$PATH:/var/vcap/packages/kubectl-k3s
 
 export KUBECONFIG=/var/vcap/store/k3s-server/kubeconfig.yml
-alias crictl="k3s crictl"
+alias crictl="k3s crictl -c /var/vcap/store/k3s-server/agent/etc/crictl.yaml"

releases/k3s/index.yml

@@ -7,6 +7,8 @@ builds:
     version: "4"
   30fb0991-0e29-4d14-551d-fc03e90e9320:
     version: "13"
+  38972de0-573b-4ccf-42f3-7b9a0632a64e:
+    version: "18"
   4bd13971-4d5f-45ef-71cd-8b9f587f8fa1:
     version: "10"
   4e64a643-4d01-48fa-794b-6564cef26f31:

releases/k3s/k3s-18.yml

@@ -0,0 +1,58 @@
+name: k3s
+version: "18"
+commit_hash: 07adf6f
+uncommitted_changes: false
+jobs:
+- name: k3s-agent
+  version: ea4abc985fd6300b1d7713b34758e986850e21298072a2f88f554c9499a31c28
+  fingerprint: ea4abc985fd6300b1d7713b34758e986850e21298072a2f88f554c9499a31c28
+  sha1: sha256:da5f98174808a23c6be576a1ec0bc4662a56d4b0ee7c3a95d004f18a0890f31b
+  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: ca23ca546f68cf61fcd1ab4e90c591f0dfed8aed6d48ff61fa546a9516c92150
+  fingerprint: ca23ca546f68cf61fcd1ab4e90c591f0dfed8aed6d48ff61fa546a9516c92150
+  sha1: sha256:3377688e3e506127447f98ed45dd2282875e86227b4e195387848c10a7c35732
+  packages:
+  - k3s
+  - k9s
+  - kubectl-k3s
+- name: k3s-server-airgaped-images
+  version: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
+  fingerprint: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
+  sha1: sha256:fbae88a6d6e06d8ac29288b73a971832e77d2483978c56481844e1c7f8e77c78
+  packages:
+  - k3s-images
+packages:
+- name: k3s
+  version: aa0b9b2a5448049da2018239119f8b9aec0b6cb8ed34b443d896728325f8258e
+  fingerprint: aa0b9b2a5448049da2018239119f8b9aec0b6cb8ed34b443d896728325f8258e
+  sha1: sha256:bc8263eb8d902a8fd9e0cac846712f35ee2b6fb0d5bb2f0cd19fe9169e0e6da8
+  dependencies: []
+- name: k3s-images
+  version: 1ea8d592a8085e2a9727de54fdd4cc09eedf345a4787d1f48eb45867c81587c3
+  fingerprint: 1ea8d592a8085e2a9727de54fdd4cc09eedf345a4787d1f48eb45867c81587c3
+  sha1: sha256:86c778365c074d206d190f6517e124eadb57667bbfbf2c5c19b449ad8bfb8acc
+  dependencies: []
+- name: k9s
+  version: b9124d1132db86c7f2ab4ff11e4a9191a14b4436dc6c552bc512c8d1e030bbbc
+  fingerprint: b9124d1132db86c7f2ab4ff11e4a9191a14b4436dc6c552bc512c8d1e030bbbc
+  sha1: sha256:b718efb60ce64a6c6e09b4e7cdc1fc6e4d891c8cdc0e48a98b0cacc2300d8e08
+  dependencies: []
+- name: kubectl-k3s
+  version: 879683d1f72b98af4d9cfa29f5855db733d76aed08a5b868ef0c4322262e6fc0
+  fingerprint: 879683d1f72b98af4d9cfa29f5855db733d76aed08a5b868ef0c4322262e6fc0
+  sha1: sha256:345fd8dc9ca93d43658a80b360f730e6a9ba43bac02be1b6ab3c16a1584e5cc7
+  dependencies: []
+license:
+  version: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  fingerprint: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  sha1: sha256:cbe3175489dfaec91e9f392399fbfb68e008885feb91a3b8d493a35d2fc5a8fa

vendir.lock

@@ -5,7 +5,7 @@ directories:
       url: https://api.github.com/repos/k3s-io/k3s/releases/43254774
     path: github.com/k3s-io/k3s
   - githubRelease:
-      url: https://api.github.com/repos/derailed/k9s/releases/42394825
+      url: https://api.github.com/repos/derailed/k9s/releases/43263254
     path: github.com/derailed/k9s
   path: src
 kind: LockConfig

vendir.yml

@@ -21,9 +21,9 @@ directories:
   - path: github.com/derailed/k9s
     githubRelease:
       slug: derailed/k9s
-      tag: v0.24.9 
+      tag: v0.24.10 
       disableAutoChecksumValidation: true 
     includePaths:
-    - "k9s_Linux_x86_64.tar.gz"
+    - "k9s_v0.24.10_Linux_x86_64.tar.gz"