Merge pull request #17 from poblin-orange/develop

update for version 7

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

@@ -7,6 +7,10 @@ builds:
     version: 1f38608d21ee257455920d16f1087120eba3ab91d50c23186e74ba93ed2b1674
     blobstore_id: acbdbcae-027d-4678-7128-746c02246279
     sha1: sha256:20d70fe44211a579629452ca9f26fb06570b048901eacde26881c804fc81e8cf
+  3ac37bb6d183cbe54221590838324785fc40f95182254acbf03ef4a6c7cef37e:
+    version: 3ac37bb6d183cbe54221590838324785fc40f95182254acbf03ef4a6c7cef37e
+    blobstore_id: e9de980f-5d77-45a9-5a89-e4cb79562737
+    sha1: sha256:6a821829144cd2ae18b63a696168e94da17701a4590fa0a89fa5c66f3f73867c
   55f25ac5d2e2e76db11009b64baaa73fcca6c28cc4020baf80541263dfa995d2:
     version: 55f25ac5d2e2e76db11009b64baaa73fcca6c28cc4020baf80541263dfa995d2
     blobstore_id: 6bcba8f2-e19b-4279-619c-f1acec3ad431

.final_builds/packages/k9s/index.yml

@@ -1,4 +1,8 @@
 builds:
+  aace0b38859c00e13f6c985d0711fff0213d5d77b894912554ab020ec775a88b:
+    version: aace0b38859c00e13f6c985d0711fff0213d5d77b894912554ab020ec775a88b
+    blobstore_id: ba66175f-21d3-4a23-43cc-30924c1c28b6
+    sha1: sha256:a7ab0bb41adee47313137197d558273451c435a44ddc95d61f5f733bb9ad4db1
   fe4389249af0fe3ced7d677e7008beadf39351d0bcdb0efff0890c3723a67aad:
     version: fe4389249af0fe3ced7d677e7008beadf39351d0bcdb0efff0890c3723a67aad
     blobstore_id: 7e62b352-50de-4e5c-66f4-cf223b78befd

addblob.sh

@@ -5,7 +5,7 @@ bosh add-blob src/k3s k3s/k3s
 wget https://github.com/rancher/k3s/releases/download/v1.19.3%2Bk3s2/k3s-airgap-images-amd64.tar -O src/k3s-airgap-images-amd64.tar
 bosh add-blob src/k3s-airgap-images-amd64.tar k3s-images/k3s-airgap-images-amd64.tar
 
-wget https://github.com/derailed/k9s/releases/download/v0.22.1/k9s_Linux_x86_64.tar.gz -O src/k9s_Linux_x86_64.tar.gz
+wget https://github.com/derailed/k9s/releases/download/v0.23.10/k9s_Linux_x86_64.tar.gz -O src/k9s_Linux_x86_64.tar.gz
 cd src
 tar xfv ./k9s_Linux_x86_64.tar.gz
 cd ..

config/blobs.yml

@@ -7,9 +7,9 @@ k3s/k3s:
   object_id: 2ac8a792-4d4a-43df-42ef-1a63d2e84173
   sha: sha256:6bc33818baa64a4821695d39445720b98061a8058ff89bd468bc31ab5bdd20f4
 k9s/k9s:
-  size: 49139712
-  object_id: ce7272d4-d76c-4d67-68a2-4ccd59366344
-  sha: sha256:04b457ba48879f64ec97ca513ad573328939b2c9b3591cb1171d7bd989e3eaef
+  size: 49360896
+  object_id: 076f426a-dd4e-4549-5b17-728c0f59e8c3
+  sha: sha256:1625460a7940f00cf81382ba55eb2df3a1bc47c90d24119d6aff482261aa0e39
 kubectl/kubectl:
   size: 43003904
   object_id: bb931f61-9bd1-4cca-71a0-bf1139913a72

jobs/k3s-server/spec

@@ -22,6 +22,10 @@ templates:
   bin/setup-user-env.erb: bin/setup-user-env
   bin/k3s-killall.sh: bin/k3s-killall.sh
 
+  config/datastore-cafile.erb: config/datastore-cafile
+  config/datastore-certfile.erb: config/datastore-certfile
+  config/datastore-keyfile.erb: config/datastore-keyfile
+
 
 # Documentation https://bosh.io/docs/links.html
 # Tutorial      https://gist.github.com/Amit-PivotalLabs/c39528248b8cdc4ba8e347f8aa68abb6
@@ -70,6 +74,8 @@ properties:
     description: (agent/flags) Customized flag for kubelet process
     default: ""
 
+## drain options
+
   k3s.drain.delete-local-data:
     description:  continue even if there are pods using emptyDir (local data that will be deleted when the node is drained).
     default: false
@@ -101,6 +107,19 @@ properties:
   k3s.drain.selector:  #Not implemented
     description: Selector (label query) to filter on
 
+## db options
+  k3s.datastore-endpoint:
+    description: Specify etcd, Mysql, Postgres, or Sqlite (default) data source name
+  k3s.datastore-cafile:
+    description: TLS Certificate Authority file used to secure datastore backend communication
+  k3s.datastore-certfile:
+    description: TLS certification file used to secure datastore backend communication
+  k3s.datastore-keyfile:
+    description: TLS key file used to secure datastore backend communication
+
+
+
+
 #done    
 #   -v value                                   (logging) Number for the log level verbosity (default: 0)
 #   --bind-address value                       (listener) k3s bind address (default: 0.0.0.0)

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

@@ -12,6 +12,24 @@ case $1 in
     chown -R vcap:vcap $RUN_DIR $LOG_DIR
 
     export K3S_NODE_NAME=<%= spec.name %>-<%= spec.index %>
+
+    <% if_p('k3s.datastore-endpoint') do |value| %>
+    export K3S_DATASTORE_ENDPOINT=<%= p('k3s.datastore-endpoint') %>
+    <<% end %>
+    
+    <% if_p('k3s.datastore-cafile') do |value| %>
+    export K3S_DATASTORE_CAFILE=/var/vcap/jobs/k3s-server/config/datastore-cafile
+    <<% end %>
+
+    <% if_p('k3s.datastore-certfile') do |value| %>
+    export K3S_DATASTORE_CERTFILE=/var/vcap/jobs/k3s-server/config/datastore-certfile
+    <<% end %>
+
+    <% if_p('k3s.datastore-keyfile') do |value| %>
+    export K3S_DATASTORE_KEYFILE=/var/vcap/jobs/k3s-server/config/datastore-keyfile 
+    <<% end %>
+    
+    
 
     echo $$ > $PIDFILE
       
@@ -20,7 +38,7 @@ case $1 in
     --token=<%= p('k3s.token') %> \
     --resolv-conf=/etc/resolv.conf \
     --data-dir=/var/vcap/store/k3s-server \
-    --default-local-storage-path=/var/vcap/store/k3s-server/local-storage-path \
+    --default-local-storage-path=/var/vcap/store/k3s-local-storage-path \
     --private-registry=/var/vcap/jobs/k3s-server/config/registries.yaml \
     --write-kubeconfig=/var/vcap/store/k3s-server/k3s.yaml \
     --write-kubeconfig-mode=755 \

jobs/k3s-server/templates/config/datastore-cafile.erb

@@ -0,0 +1,3 @@
+<% if_p('k3s.datastore-cafile') do |value| %>
+<%= p('k3s.datastore-cafile') %>
+<<% end %>

jobs/k3s-server/templates/config/datastore-certfile.erb

@@ -0,0 +1,3 @@
+<% if_p('k3s.datastore-certfile') do |value| %>
+<%= p('k3s.datastore-certfile') %>
+<<% end %>

jobs/k3s-server/templates/config/datastore-keyfile.erb

@@ -0,0 +1,3 @@
+<% if_p('k3s.datastore-keyfile') do |value| %>
+<%= p('k3s.datastore-keyfile') %>
+<<% end %>

releases/k3s/index.yml

@@ -9,6 +9,8 @@ builds:
     version: "6"
   7f7ad91b-e067-4862-4b39-b2fb7b241259:
     version: "2"
+  aa13e70f-e6f6-402f-54ae-3505a9e67570:
+    version: "7"
   c83221a4-9990-46f7-5fb0-e90adcaec54e:
     version: "3"
 format-version: "2"

releases/k3s/k3s-7.yml

@@ -0,0 +1,52 @@
+name: k3s
+version: "7"
+commit_hash: 34db727
+uncommitted_changes: false
+jobs:
+- name: k3s-agent
+  version: 31331644ddf17d3128cc2c5be631f950c381d85f31b0da879bb3e7ec87c7425d
+  fingerprint: 31331644ddf17d3128cc2c5be631f950c381d85f31b0da879bb3e7ec87c7425d
+  sha1: sha256:f9765052a793d1f650ef88beb2362ff851ead6c0367d47b5c99b88907b7b82a9
+  packages:
+  - k3s
+  - kubectl-k3s
+  - k3s-images
+- name: k3s-airgaped-images
+  version: 99126a51b26e8df4e7009e55869d8167bc9f554aed95f3eef688a1e13f669f2b
+  fingerprint: 99126a51b26e8df4e7009e55869d8167bc9f554aed95f3eef688a1e13f669f2b
+  sha1: sha256:9c4a0f047fa7c3f4a9a1d55f6686378979a292158147746296ed4b94eb8dd5ba
+  packages:
+  - k3s-images
+- name: k3s-server
+  version: 3ac37bb6d183cbe54221590838324785fc40f95182254acbf03ef4a6c7cef37e
+  fingerprint: 3ac37bb6d183cbe54221590838324785fc40f95182254acbf03ef4a6c7cef37e
+  sha1: sha256:6a821829144cd2ae18b63a696168e94da17701a4590fa0a89fa5c66f3f73867c
+  packages:
+  - k3s
+  - k9s
+  - kubectl-k3s
+packages:
+- name: k3s
+  version: 40aa439634b35ba7dd9b6e706ca437d8e191d1cad1463aae7078e0fcca1c2ad8
+  fingerprint: 40aa439634b35ba7dd9b6e706ca437d8e191d1cad1463aae7078e0fcca1c2ad8
+  sha1: sha256:b6ec3a2decfa0e16b84887e3c2fae96bdce20520a305f8613c5d16d45f984e53
+  dependencies: []
+- name: k3s-images
+  version: c78a8c2e8cd3d8f69ec70c3f38db944e40cdd94f79ce9a32eef8325cf9c08311
+  fingerprint: c78a8c2e8cd3d8f69ec70c3f38db944e40cdd94f79ce9a32eef8325cf9c08311
+  sha1: sha256:359a920d70cd47fa7ce7176a2fa4bb647c17c03b8f5191f7a22ab9be65b56a9c
+  dependencies: []
+- name: k9s
+  version: aace0b38859c00e13f6c985d0711fff0213d5d77b894912554ab020ec775a88b
+  fingerprint: aace0b38859c00e13f6c985d0711fff0213d5d77b894912554ab020ec775a88b
+  sha1: sha256:a7ab0bb41adee47313137197d558273451c435a44ddc95d61f5f733bb9ad4db1
+  dependencies: []
+- name: kubectl-k3s
+  version: 41fe074fc5fe879b1909bdc82b3050c42b94e2d4aa945de2ce4e5f5737feb8dc
+  fingerprint: 41fe074fc5fe879b1909bdc82b3050c42b94e2d4aa945de2ce4e5f5737feb8dc
+  sha1: sha256:79ec01ab7c166b7121052ee44ce0109bb0318bb8e14e5e23c7b1d9dc5f619910
+  dependencies: []
+license:
+  version: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  fingerprint: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  sha1: sha256:cbe3175489dfaec91e9f392399fbfb68e008885feb91a3b8d493a35d2fc5a8fa