Merge pull request #65 from poblin-orange/develop

v1.21.10+k3s1

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

@@ -43,6 +43,10 @@ builds:
     version: 8983b337bc586123de5a47ac712a7aa23b8dc4d89a687889d3932b680d1b0381
     blobstore_id: 1151d4a3-75cf-4a88-7741-88f453fa9dc6
     sha1: sha256:5f2de8465476707159dbd115ada9bf7f81ceeaf9cfe29601d7d3d85f17a6e565
+  9973ad9cba58269ee6e1d1b92d8c5005f4d9e7ceea37123b285eefd057b59476:
+    version: 9973ad9cba58269ee6e1d1b92d8c5005f4d9e7ceea37123b285eefd057b59476
+    blobstore_id: 38c6cd21-68fc-471d-671c-ec38c4559fdb
+    sha1: sha256:665ea77f4b8e11e9cd832fed7fd23c3724935456a7a333e463d06ed6b32d117c
   a4d175996786ee5d1f915411a05765fa4174895bb3b00d077c60488b42119595:
     version: a4d175996786ee5d1f915411a05765fa4174895bb3b00d077c60488b42119595
     blobstore_id: aa65b3bb-66f7-45b7-678e-497b2857704a

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

@@ -19,6 +19,10 @@ builds:
     version: 1f38608d21ee257455920d16f1087120eba3ab91d50c23186e74ba93ed2b1674
     blobstore_id: acbdbcae-027d-4678-7128-746c02246279
     sha1: sha256:20d70fe44211a579629452ca9f26fb06570b048901eacde26881c804fc81e8cf
+  22a6b8260d3e7a648fa4ec0056206a29747a0bed713683fbddb3c401e7a5950f:
+    version: 22a6b8260d3e7a648fa4ec0056206a29747a0bed713683fbddb3c401e7a5950f
+    blobstore_id: 8a800741-bedd-4ee8-73df-e13f36c99312
+    sha1: sha256:b8f548c9251ecbe314cb79e5f1e7dca41aa03ca5a96205421dc6156a0f959fe0
   3ac37bb6d183cbe54221590838324785fc40f95182254acbf03ef4a6c7cef37e:
     version: 3ac37bb6d183cbe54221590838324785fc40f95182254acbf03ef4a6c7cef37e
     blobstore_id: e9de980f-5d77-45a9-5a89-e4cb79562737

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

@@ -47,4 +47,8 @@ builds:
     version: c78a8c2e8cd3d8f69ec70c3f38db944e40cdd94f79ce9a32eef8325cf9c08311
     blobstore_id: 33d21678-bde1-4b43-5283-d49ef23d4274
     sha1: sha256:359a920d70cd47fa7ce7176a2fa4bb647c17c03b8f5191f7a22ab9be65b56a9c
+  f97a05198b209a472594e898e88b0e9e0bb0acf2fa930df5e8ea5338964f9e7d:
+    version: f97a05198b209a472594e898e88b0e9e0bb0acf2fa930df5e8ea5338964f9e7d
+    blobstore_id: 3622c3f7-34e0-4225-5e6a-a974dbdf6550
+    sha1: sha256:a4be77f3d03d4156ccadc080fb450eebf301d99bed3c6dc2c44c0f14a0cb038e
 format-version: "2"

.final_builds/packages/k3s/index.yml

@@ -27,6 +27,10 @@ builds:
     version: 8ea88056382da1f76dce0ffa03251f81d0890147a1c3dd56ad4fb98868661b0c
     blobstore_id: 81b930ab-ebc2-476e-4d1e-ec38fd140f53
     sha1: sha256:aca42fbd49a94e77e31e6af7df2ad22cd61d8cecbb4484d39550bbe6b68e012a
+  98032e1f99aa30ca6892598dc1e0a7cde930443f3ffe6b70d9c8e71dcc5a6421:
+    version: 98032e1f99aa30ca6892598dc1e0a7cde930443f3ffe6b70d9c8e71dcc5a6421
+    blobstore_id: 21ba262f-a2a6-43b8-7975-4705486879f1
+    sha1: sha256:37b7bdee1ec1c238eb6b9fe28f40a054e5a263eac99b1191c03d077192e05e3b
   98291cbdc65f113ab4613899c1d5df44f2bb2a74b0eb8f91f3e97ab25261f13b:
     version: 98291cbdc65f113ab4613899c1d5df44f2bb2a74b0eb8f91f3e97ab25261f13b
     blobstore_id: 2264bc6e-9fd2-4142-585c-a27cdb49f25b

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

@@ -19,4 +19,8 @@ builds:
     version: d581d558a37afdc5289a59160b82c8823f18e6b8d4d06618137d4de444029d8f
     blobstore_id: da833117-d8f5-4ef5-60b3-bb19832cf1ed
     sha1: sha256:197a23e8ff54e68313d4be27d7423c04a1989f24ab129bda387a960297745df8
+  f31573923b6cf4c6bdaa91626f558f1840a3fc53079b21d04ee53e1dcfe8e7c7:
+    version: f31573923b6cf4c6bdaa91626f558f1840a3fc53079b21d04ee53e1dcfe8e7c7
+    blobstore_id: 12096730-a1bc-4675-69fc-a1e703960140
+    sha1: sha256:3582db70503234eddce3522c7782245a3bbb0777c113c328d47f07313229c519
 format-version: "2"

addblob.sh

@@ -9,7 +9,7 @@ popd
 bosh add-blob src/github.com/derailed/k9s/k9s k9s/k9s
 
 pushd src
-curl -LO https://dl.k8s.io/release/v1.21.8/bin/linux/amd64/kubectl --output ./src/kubectl
+curl -LO https://dl.k8s.io/release/v1.21.9/bin/linux/amd64/kubectl --output ./src/kubectl
 chmod ugo+x kubectl
 popd
 bosh add-blob src/kubectl kubectl/kubectl

config/blobs.yml

@@ -1,16 +1,16 @@
 k3s-images/k3s-airgap-images-amd64.tar:
-  size: 467035136
-  object_id: 3cac5c89-62ea-4dcc-552a-12fa99605379
-  sha: sha256:83516189159f10fd83da710671d4524ab7a5640c731c296eb61133f4d5e64112
+  size: 498181120
+  object_id: 3f192c02-495c-47ac-5c74-5849d3c86f47
+  sha: sha256:a10f1f58851c7f5eeae0699ca761cad30d8ec297ca2d39ad692aecc87c01f74f
 k3s/k3s:
-  size: 48988160
-  object_id: a901b8ca-a1c6-42d5-642b-025050db5b60
-  sha: sha256:5b9043828b61a7ebb0c0b27636ac295ca5a55f3634bd0eb135976757d1fe4c13
+  size: 49082368
+  object_id: a84494e2-29b3-43e9-7f1c-f498e758e75b
+  sha: sha256:7a9cf9a0f2318b09f8b449f96440fdd3d877fcfd5e25b275a0e705400641ce3d
 k9s/k9s:
   size: 55410688
-  object_id: 850998f4-1515-4529-67c0-d0d6b1718367
+  object_id: 0b3b0840-1db4-4ac5-53b1-0f62a80862cb
   sha: sha256:eabb69c297a459f85e530ae84d682f2be321c1b7c607aa6d5dad113b1ceb11cb
 kubectl/kubectl:
   size: 46682112
-  object_id: 0218c1e5-63ed-4112-5a72-0c2c9b276aa6
-  sha: sha256:84eaef3da0b508666e58917ebe9a6b32dcc6367bddf6e4489b909451877e3e70
+  object_id: 9ecc8f62-db06-493a-760d-febb1f450316
+  sha: sha256:195d5387f2a6ca7b8ab5c2134b4b6cc27f29372f54b771947ba7c18ee983fbe6

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

@@ -76,10 +76,10 @@ case $1 in
     --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/name=<%= spec.name %> \
     --node-label bosh.io/bootstrap=<%= spec.bootstrap %>  \
     --node-label bosh.io/index=<%= spec.index %>  \
-    --node-label bosh.io/address=<%= spec.address %>  \
+    --node-label bosh.io/address=<%= spec.ip %>  \
     --node-label topology.kubernetes.io/zone=<%= spec.az %> \
       $FLAGS \
       $servers \

jobs/k3s-server/spec

@@ -10,7 +10,6 @@ templates:
   bin/pre-start.erb: bin/pre-start
   bin/post-start.erb: bin/post-start  
   bin/pre-stop.erb: bin/pre-stop
-  bin/pre-stop.erb: bin/pre-stop
   bin/post-deploy.erb: bin/post-deploy
   bin/drain.erb: bin/drain
   bin/ctl.erb: bin/ctl

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

@@ -119,10 +119,10 @@ case $1 in
     --tls-san=<%= spec.networks.send(spec.networks.methods(false).first).dns_record_name %> \
     --node-external-ip=<%= spec.ip %> \
     --node-label bosh.io/az=<%= spec.az %> \
-    --node-label bosh.io/name=<%= spec.name %>  \
+    --node-label bosh.io/name=<%= spec.name %> \
     --node-label bosh.io/bootstrap=<%= spec.bootstrap %>  \
     --node-label bosh.io/index=<%= spec.index %>  \
-    --node-label bosh.io/address=<%= spec.address %>  \
+    --node-label bosh.io/address=<%= spec.ip %>  \
     --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: "18"
   4bd13971-4d5f-45ef-71cd-8b9f587f8fa1:
     version: "10"
+  4c014783-a1dd-401b-59c1-2cc3e51c80d2:
+    version: "25"
   4d82d8ad-574d-41b1-5cd4-aece1bd4703b:
     version: "24"
   4e64a643-4d01-48fa-794b-6564cef26f31:

releases/k3s/k3s-25.yml

@@ -0,0 +1,58 @@
+name: k3s
+version: "25"
+commit_hash: 181fd61
+uncommitted_changes: false
+jobs:
+- name: k3s-agent
+  version: 9973ad9cba58269ee6e1d1b92d8c5005f4d9e7ceea37123b285eefd057b59476
+  fingerprint: 9973ad9cba58269ee6e1d1b92d8c5005f4d9e7ceea37123b285eefd057b59476
+  sha1: sha256:665ea77f4b8e11e9cd832fed7fd23c3724935456a7a333e463d06ed6b32d117c
+  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: 22a6b8260d3e7a648fa4ec0056206a29747a0bed713683fbddb3c401e7a5950f
+  fingerprint: 22a6b8260d3e7a648fa4ec0056206a29747a0bed713683fbddb3c401e7a5950f
+  sha1: sha256:b8f548c9251ecbe314cb79e5f1e7dca41aa03ca5a96205421dc6156a0f959fe0
+  packages:
+  - k3s
+  - k9s
+  - kubectl-k3s
+- name: k3s-server-airgaped-images
+  version: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
+  fingerprint: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
+  sha1: sha256:fbae88a6d6e06d8ac29288b73a971832e77d2483978c56481844e1c7f8e77c78
+  packages:
+  - k3s-images
+packages:
+- name: k3s
+  version: 98032e1f99aa30ca6892598dc1e0a7cde930443f3ffe6b70d9c8e71dcc5a6421
+  fingerprint: 98032e1f99aa30ca6892598dc1e0a7cde930443f3ffe6b70d9c8e71dcc5a6421
+  sha1: sha256:37b7bdee1ec1c238eb6b9fe28f40a054e5a263eac99b1191c03d077192e05e3b
+  dependencies: []
+- name: k3s-images
+  version: f97a05198b209a472594e898e88b0e9e0bb0acf2fa930df5e8ea5338964f9e7d
+  fingerprint: f97a05198b209a472594e898e88b0e9e0bb0acf2fa930df5e8ea5338964f9e7d
+  sha1: sha256:a4be77f3d03d4156ccadc080fb450eebf301d99bed3c6dc2c44c0f14a0cb038e
+  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/57081149
+      url: https://api.github.com/repos/k3s-io/k3s/releases/60429322
     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.8+k3s2 
+      tag: v1.21.10+k3s1 
       disableAutoChecksumValidation: true 
     includePaths:
     - "k3s"