Merge pull request #54 from poblin-orange/develop

add support for multi-master vip

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

@@ -31,6 +31,10 @@ builds:
     version: 7079178f9125351d8c140ae67cbc739346fe428747416c548eaf204e08cb057a
     blobstore_id: 8c32507e-bf58-43b5-73bb-1744ef0af7ae
     sha1: sha256:ff1b726515927e03bb3a6d9b0e887f646d624c52595c2ca9205b816d5f5edf66
+  8085cfb6a5a58055561d7c6e548ead4cc76ec5ac59cb76209709c3f06ed617aa:
+    version: 8085cfb6a5a58055561d7c6e548ead4cc76ec5ac59cb76209709c3f06ed617aa
+    blobstore_id: a638f6d6-1baa-4266-58a7-8f78612c312e
+    sha1: sha256:57c928495d1435ba9cbf31553bf31f1b7e1697b8ef12f9ea585bec65e67367f7
   8983b337bc586123de5a47ac712a7aa23b8dc4d89a687889d3932b680d1b0381:
     version: 8983b337bc586123de5a47ac712a7aa23b8dc4d89a687889d3932b680d1b0381
     blobstore_id: 1151d4a3-75cf-4a88-7741-88f453fa9dc6

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

@@ -19,6 +19,10 @@ builds:
     version: 3ac37bb6d183cbe54221590838324785fc40f95182254acbf03ef4a6c7cef37e
     blobstore_id: e9de980f-5d77-45a9-5a89-e4cb79562737
     sha1: sha256:6a821829144cd2ae18b63a696168e94da17701a4590fa0a89fa5c66f3f73867c
+  45c741220512673c438e73d9575505b0f2e7a8b04ab56dd309f9f22edef707a0:
+    version: 45c741220512673c438e73d9575505b0f2e7a8b04ab56dd309f9f22edef707a0
+    blobstore_id: 32148562-d202-4933-688c-9803266db615
+    sha1: sha256:ad863b3879c59dda5ce2372640b102add61c41ade46794a1416efb2673a01c83
   4a63251d56d91b2e03518ab4362f9835f4583b5e808ef02007b8afbc45877a87:
     version: 4a63251d56d91b2e03518ab4362f9835f4583b5e808ef02007b8afbc45877a87
     blobstore_id: 09dbc733-d3df-489e-4849-860943406d72

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

@@ -15,6 +15,10 @@ builds:
     version: 1ea8d592a8085e2a9727de54fdd4cc09eedf345a4787d1f48eb45867c81587c3
     blobstore_id: 5c273d09-2698-4cd6-721b-9c8c80ea2a33
     sha1: sha256:86c778365c074d206d190f6517e124eadb57667bbfbf2c5c19b449ad8bfb8acc
+  216634c7f9c8c684053d50520c87d01d37670f9fb0df006d7b880277c5521cbe:
+    version: 216634c7f9c8c684053d50520c87d01d37670f9fb0df006d7b880277c5521cbe
+    blobstore_id: 3cc58eb4-27cb-48d7-6a49-9794733bad2f
+    sha1: sha256:ba0c3aa34e08840258f110cf87f624dc2e6efed49b811c1e404f6d1f0a61377a
   58422d6b2350bd73cf2437afc5c0cd75da232f7b7e45e2a513de251d3107fc7b:
     version: 58422d6b2350bd73cf2437afc5c0cd75da232f7b7e45e2a513de251d3107fc7b
     blobstore_id: 1b6e6445-ef98-4d35-499b-85a761ad3a64

.final_builds/packages/k3s/index.yml

@@ -3,6 +3,10 @@ builds:
     version: 40aa439634b35ba7dd9b6e706ca437d8e191d1cad1463aae7078e0fcca1c2ad8
     blobstore_id: f66c41c1-6304-40a5-6920-edd8a5e7dcdf
     sha1: sha256:b6ec3a2decfa0e16b84887e3c2fae96bdce20520a305f8613c5d16d45f984e53
+  51e59e09b03182cec02264570585cf5314ba53e22947c725cb2350109bc8524c:
+    version: 51e59e09b03182cec02264570585cf5314ba53e22947c725cb2350109bc8524c
+    blobstore_id: 623ce5bd-a27c-4634-769d-a28300ea2332
+    sha1: sha256:f277b2dd5c0f8a22e7a4ae685a7561a33e319b1353fb5c13004d04138d3630f2
   63a8458bdc0a7d3109bb5969f12af063f93d53d93574b4ca1c77b24f6beb9275:
     version: 63a8458bdc0a7d3109bb5969f12af063f93d53d93574b4ca1c77b24f6beb9275
     blobstore_id: 5a907264-fd3b-475c-5643-13cf523a76f5

.final_builds/packages/k9s/index.yml

@@ -15,6 +15,10 @@ builds:
     version: b9124d1132db86c7f2ab4ff11e4a9191a14b4436dc6c552bc512c8d1e030bbbc
     blobstore_id: f99a9ee3-d13f-421b-4e52-2f713786c806
     sha1: sha256:b718efb60ce64a6c6e09b4e7cdc1fc6e4d891c8cdc0e48a98b0cacc2300d8e08
+  f52aba397169bd476f99fdce84211c6ddd9abf22a4352ba3279834722b9bea2f:
+    version: f52aba397169bd476f99fdce84211c6ddd9abf22a4352ba3279834722b9bea2f
+    blobstore_id: 86a467bb-15a5-4826-4573-10bf5a1fd831
+    sha1: sha256:127dcddaf1c723ea3f839dfccec0e0c27bdcd12498bed8c90647dbd0ffff427b
   fb3cd5c6d3c497bb2ed24b937fd6ffc1c8583ac87f96bbb04d2f39327a7a81a0:
     version: fb3cd5c6d3c497bb2ed24b937fd6ffc1c8583ac87f96bbb04d2f39327a7a81a0
     blobstore_id: 36ec1b20-e3e7-4d0b-5d5a-211a3b0f8ebc

config/blobs.yml

@@ -1,16 +1,16 @@
 k3s-images/k3s-airgap-images-amd64.tar:
-  size: 368877056
-  object_id: 08e7c2da-24d0-4ffa-7059-42f1fd89121f
-  sha: sha256:30f4d0ae79d0552320ee4e41fd51295f5060980e42008e33d7f809b91d32fa23
+  size: 464734208
+  object_id: 36ae9d6e-bb98-446c-71c3-bcba61379bbe
+  sha: sha256:f7ea16000b21741f6a21b2869f62e4f769154c91d85cc61ecd0146f75a0b691b
 k3s/k3s:
-  size: 47329280
-  object_id: 4ea25234-3273-4589-7db8-2ae63cdfffc3
-  sha: sha256:f48a6ec7010dc3fa650b046f140f0b9f85ca690f917ec9612ccb3a180f1fa7b0
+  size: 47230976
+  object_id: 961a8805-55b9-4326-79a2-33b4f84a0a2b
+  sha: sha256:cc9783c1b55360a750e102e7f76ef40353ac7d25fdb56f2e60e4bfe4c27ea5a9
 k9s/k9s:
-  size: 56107008
-  object_id: 9b2cbb59-653a-4de5-60e8-a42829078d87
-  sha: sha256:eb231ee1b420e46b735284d3a3aae9182be3b74ece493c75af934aa11d679003
+  size: 55521280
+  object_id: 1ae53940-e1a9-4c65-620b-245943c3ac34
+  sha: sha256:30d224999c38039888f08af4c017730e5fa3e6298b0946ab5d5a75efc59ec891
 kubectl/kubectl:
   size: 40226816
-  object_id: d0f0648b-0798-4a00-7500-cd4171a90c02
+  object_id: a35d9768-942e-40a8-4596-30fd8062131c
   sha: sha256:2ea3006a64d48657ac72223a01c6df0e5b827703263f2586da28044ea9e97daf

jobs/k3s-agent/spec

@@ -121,3 +121,6 @@ properties:
     description: (agent/flags) Customized flag for kube-proxy process
     default: []
 
+  k3s.master_vip_api:
+    description: externaly defined vip ip for HA k3s (enables multi master instance groups). This is used for public api access, tls-san, and agents to server communication
+

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

@@ -12,8 +12,15 @@ case $1 in
 
     echo $$ > $PIDFILE
 
-	export servers="<% masters = link('k3s-server') %><% masters.instances.each do |instance| %> --server=https://<%= instance.address %>:6443 <% end %>"
-
+    #set server ips (or vip)
+    export servers="<% masters = link('k3s-server') %><% masters.instances.each do |instance| %> --server=https://<%= instance.address %>:6443 <% end %>"
+
+
+    #override server if vip
+<% if_p('k3s.master_vip_api') do |flag| %>
+    export servers=" --server=https://<%= flag %>:6443"
+<% end %>
+
 
     export K3S_NODE_NAME=<%= spec.name %>-<%= spec.index %>
 
@@ -35,7 +42,7 @@ case $1 in
 
 <% if_p('k3s.node-taints') do |value| %>
 <% p('k3s.node-taints').each do |taint| %>
-    export FLAGS="$FLAGS --node-taint <%= taint %>"
+    export FLAGS="$FLAGS --node-taint=<%= taint %>"
 <% end %>
 <% end %>
 

jobs/k3s-server/spec

@@ -157,6 +157,8 @@ properties:
   k3s.token-file-content:
     description: token-file content. see https://kubernetes.io/docs/reference/access-authn-authz/authentication/#static-token-file
 
+  k3s.master_vip_api:
+    description: externaly defined vip ip for HA k3s (enables multi master instance groups). This is used for public api access, tls-san, and agents to server communication
 
 #done    
 #   -v value                                   (logging) Number for the log level verbosity (default: 0)

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

@@ -53,7 +53,7 @@ case $1 in
 
 <% if_p('k3s.node-taints') do |value| %>
 <% p('k3s.node-taints').each do |taint| %>
-    export FLAGS="$FLAGS --node-taint <%= taint %>"
+    export FLAGS="$FLAGS --node-taint=<%= taint %>"
 <% end %>
 <% end %>
 
@@ -87,6 +87,11 @@ case $1 in
 <% end %>
 <% end %>
 
+#set tls san for api
+<% if_p('k3s.master_vip_api') do |flag| %>
+    export FLAGS="$FLAGS --tls-san=<%= flag %>"
+<% end %>
+
     echo $$ > $PIDFILE
 
     ulimit -n 1048576    # open files

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

@@ -10,3 +10,8 @@
 #prepare kubeconfig for remote access 
 
 cat /var/vcap/store/k3s-server/k3s.yaml |sed -r 's/(\b[0-9]{1,3}\.){3}[0-9]{1,3}\b'/"<%= spec.ip %>"/ > /var/vcap/store/k3s-server/kubeconfig.yml
+
+
+<% if_p('k3s.master_vip_api') do |vip| %>
+cat /var/vcap/store/k3s-server/k3s.yaml |sed -r 's/(\b[0-9]{1,3}\.){3}[0-9]{1,3}\b'/"<%= vip %>"/ > /var/vcap/store/k3s-server/kubeconfig.yml
+<% end %>

releases/k3s/index.yml

@@ -19,6 +19,8 @@ builds:
     version: "16"
   67fbfa08-b57c-41c8-7d89-590fed66e482:
     version: "19"
+  67fd5410-038b-41d7-5470-22f55de21d68:
+    version: "20"
   69e76586-6f75-423f-6a92-a13775aab2bb:
     version: "5"
   70ae22e2-9a7e-4826-630c-a49f617ad223:

releases/k3s/k3s-20.yml

@@ -0,0 +1,58 @@
+name: k3s
+version: "20"
+commit_hash: 522031a
+uncommitted_changes: false
+jobs:
+- name: k3s-agent
+  version: 8085cfb6a5a58055561d7c6e548ead4cc76ec5ac59cb76209709c3f06ed617aa
+  fingerprint: 8085cfb6a5a58055561d7c6e548ead4cc76ec5ac59cb76209709c3f06ed617aa
+  sha1: sha256:57c928495d1435ba9cbf31553bf31f1b7e1697b8ef12f9ea585bec65e67367f7
+  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: 45c741220512673c438e73d9575505b0f2e7a8b04ab56dd309f9f22edef707a0
+  fingerprint: 45c741220512673c438e73d9575505b0f2e7a8b04ab56dd309f9f22edef707a0
+  sha1: sha256:ad863b3879c59dda5ce2372640b102add61c41ade46794a1416efb2673a01c83
+  packages:
+  - k3s
+  - k9s
+  - kubectl-k3s
+- name: k3s-server-airgaped-images
+  version: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
+  fingerprint: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
+  sha1: sha256:fbae88a6d6e06d8ac29288b73a971832e77d2483978c56481844e1c7f8e77c78
+  packages:
+  - k3s-images
+packages:
+- name: k3s
+  version: 51e59e09b03182cec02264570585cf5314ba53e22947c725cb2350109bc8524c
+  fingerprint: 51e59e09b03182cec02264570585cf5314ba53e22947c725cb2350109bc8524c
+  sha1: sha256:f277b2dd5c0f8a22e7a4ae685a7561a33e319b1353fb5c13004d04138d3630f2
+  dependencies: []
+- name: k3s-images
+  version: 216634c7f9c8c684053d50520c87d01d37670f9fb0df006d7b880277c5521cbe
+  fingerprint: 216634c7f9c8c684053d50520c87d01d37670f9fb0df006d7b880277c5521cbe
+  sha1: sha256:ba0c3aa34e08840258f110cf87f624dc2e6efed49b811c1e404f6d1f0a61377a
+  dependencies: []
+- name: k9s
+  version: f52aba397169bd476f99fdce84211c6ddd9abf22a4352ba3279834722b9bea2f
+  fingerprint: f52aba397169bd476f99fdce84211c6ddd9abf22a4352ba3279834722b9bea2f
+  sha1: sha256:127dcddaf1c723ea3f839dfccec0e0c27bdcd12498bed8c90647dbd0ffff427b
+  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/46636377
+      url: https://api.github.com/repos/k3s-io/k3s/releases/52643096
     path: github.com/k3s-io/k3s
   - githubRelease:
-      url: https://api.github.com/repos/derailed/k9s/releases/45905459
+      url: https://api.github.com/repos/derailed/k9s/releases/53504665
     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.9+k3s1 
+      tag: v1.20.12+k3s1 
       disableAutoChecksumValidation: true 
     includePaths:
     - "k3s"
@@ -21,7 +21,7 @@ directories:
   - path: github.com/derailed/k9s
     githubRelease:
       slug: derailed/k9s
-      tag: v0.24.14 
+      tag: v0.25.1
       disableAutoChecksumValidation: true 
     includePaths:
     - "k9s_Linux_x86_64.tar.gz"