Merge pull request #106 from poblin-orange/develop

123.5

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

@@ -83,6 +83,10 @@ builds:
     version: c17a8adc1a8f595743f58228497c767a8bf5faab71e184c7a48c45bbeac1a843
     blobstore_id: 6d5c4e0a-e31a-49a8-5037-96aa51036a49
     sha1: sha256:71dd8c68e6c5aee6f2a1a20740fd45ba458b909dec44fe2f3a44ee7e6084da6b
+  cea72360b5c14c0686925f0df2b2ba5baf0aa5533c44447944c25ba4b2792eb1:
+    version: cea72360b5c14c0686925f0df2b2ba5baf0aa5533c44447944c25ba4b2792eb1
+    blobstore_id: 7dc506de-a6af-409c-646a-0176e01f8fb6
+    sha1: sha256:2f055820ed416b3bd7225412954c1502f61fbb58cb5ec7eed84d22a35ccfe7af
   e75d3a2bafa394c6eed9cdd360a93f2c31092bea3db75f96790a8b07dbca7e2e:
     version: e75d3a2bafa394c6eed9cdd360a93f2c31092bea3db75f96790a8b07dbca7e2e
     blobstore_id: 25212fb8-33f5-4785-4d6b-0226f5580352

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

@@ -67,6 +67,10 @@ builds:
     version: 68ef93b0ca643f4eff4170f83a91cd8624ba14daed9b2b89dcf1443b255a80f2
     blobstore_id: f3b074d1-5408-438b-4051-ca2121378ec6
     sha1: sha256:8685832196cc4f5bbef715a5f8d930b311644a873db55e4a5a8405a3da049595
+  79b692c882652e365bbfa888161dddeec62452fe9ec3cea6b53071e25ef0fd9a:
+    version: 79b692c882652e365bbfa888161dddeec62452fe9ec3cea6b53071e25ef0fd9a
+    blobstore_id: a0ed5add-7ca3-4a98-6ead-a1f8ab9b2e4b
+    sha1: sha256:abb485c90bca12979f1d75ad8902e2692aa6aae68dd49c8817757f7300255462
   85cbbe9198ed988a83185dbf9ddf52e6979f18b78a902198289df16b44e37a6f:
     version: 85cbbe9198ed988a83185dbf9ddf52e6979f18b78a902198289df16b44e37a6f
     blobstore_id: 21b746aa-39a6-40f4-5021-622a56913fb7

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

@@ -43,6 +43,10 @@ builds:
     version: 9b62788662a8bcdbba54b87f296239ff6e030f6f4810733301a877e627d080d3
     blobstore_id: 4119b972-97b3-4f4f-5249-6c1b8f61fec7
     sha1: sha256:ca55c357e28ce2a354374ce4a6b48c7c48b7be0655eeafabc1025b6c3a8a7765
+  a93c0f96c237ca3786c5257f9bc00e4cc5b67c9854731d782dd4f4ca5967d43a:
+    version: a93c0f96c237ca3786c5257f9bc00e4cc5b67c9854731d782dd4f4ca5967d43a
+    blobstore_id: b9a60276-4959-45bf-6179-5353331556f8
+    sha1: sha256:956a43b6d474c1f57468aed5993fa9503dd1742524c167a4486d2025ba721332
   ae50a79f3154a65ee0682b80f4c078bbcb77c4017b54b1c4f9b0c50924babba5:
     version: ae50a79f3154a65ee0682b80f4c078bbcb77c4017b54b1c4f9b0c50924babba5
     blobstore_id: 220c8fca-dab0-400a-56a8-c380a398c984

.final_builds/packages/k3s/index.yml

@@ -1,4 +1,8 @@
 builds:
+  21a5deb1aa8a91ea350875952194a8e971e90e0110eb1e4b39243d9a9b29b690:
+    version: 21a5deb1aa8a91ea350875952194a8e971e90e0110eb1e4b39243d9a9b29b690
+    blobstore_id: 00181855-1e85-432f-5e99-f463a63b8722
+    sha1: sha256:877c8f714d326d10cc24652b6cf3fd1d2985f9f4e1986f6e035f50f0c49353c3
   40aa439634b35ba7dd9b6e706ca437d8e191d1cad1463aae7078e0fcca1c2ad8:
     version: 40aa439634b35ba7dd9b6e706ca437d8e191d1cad1463aae7078e0fcca1c2ad8
     blobstore_id: f66c41c1-6304-40a5-6920-edd8a5e7dcdf

.final_builds/packages/k9s/index.yml

@@ -43,6 +43,10 @@ builds:
     version: fb3cd5c6d3c497bb2ed24b937fd6ffc1c8583ac87f96bbb04d2f39327a7a81a0
     blobstore_id: 36ec1b20-e3e7-4d0b-5d5a-211a3b0f8ebc
     sha1: sha256:abcbd5e38695ce4ef67cf8fdf87105da8fb71140ae4b1e70e780542dcc6083fe
+  fc860dd549d216cd09e66a25b4ff22c29557dd7e79c03f44db247f16e6d73e5c:
+    version: fc860dd549d216cd09e66a25b4ff22c29557dd7e79c03f44db247f16e6d73e5c
+    blobstore_id: 98d17da0-ab5c-40da-45a7-e5957b8724c7
+    sha1: sha256:5fc0895690049fa8c0445f79a2ec871d01d4b0dcd2df040d76a0e875f48dff55
   fe4389249af0fe3ced7d677e7008beadf39351d0bcdb0efff0890c3723a67aad:
     version: fe4389249af0fe3ced7d677e7008beadf39351d0bcdb0efff0890c3723a67aad
     blobstore_id: 7e62b352-50de-4e5c-66f4-cf223b78befd

.final_builds/packages/nerdctl/index.yml

@@ -1,4 +1,8 @@
 builds:
+  2a90585f7e5f1d0009e343808638f0e06a927103a1a057d8fda6733186da719f:
+    version: 2a90585f7e5f1d0009e343808638f0e06a927103a1a057d8fda6733186da719f
+    blobstore_id: 214794ec-be19-45ef-570e-47f64abb7907
+    sha1: sha256:e067568fa0de560293be78f27928f703fd28d01b00aaf976a3d889bec5d35cf2
   873348035e9ed6470217b992315ab126423aa4af7ce47997ca940fc753d35d61:
     version: 873348035e9ed6470217b992315ab126423aa4af7ce47997ca940fc753d35d61
     blobstore_id: a17c8b40-97ef-4a32-5e93-b472b8815a2d

addblob.sh

@@ -12,7 +12,7 @@ popd
 bosh add-blob src/github.com/derailed/k9s/k9s k9s/k9s
 
 pushd src/github.com/containerd/nerdctl/
-tar xfv ./nerdctl-0.20.0-linux-amd64.tar.gz
+tar xfv ./nerdctl-1.0.0-linux-amd64.tar.gz
 popd
 
 bosh add-blob src/github.com/containerd/nerdctl/nerdctl nerdctl/nerdctl

config/blobs.yml

@@ -1,20 +1,20 @@
 k3s-images/k3s-airgap-images-amd64.tar:
-  size: 504174592
-  object_id: ba6295fe-907e-4255-4c3b-82f65b6c6e12
-  sha: sha256:f04cc08824859e0e89d6084dd730ca4a130e191bdc0a8eae88742aab0029e77d
+  size: 513610240
+  object_id: 0cd39b47-624c-43f7-61e0-5e15d55ce7d9
+  sha: sha256:b736756d3829b39a54cb4260e7037d115caeb27a83910027131c2219dab956e4
 k3s/k3s:
-  size: 62701568
-  object_id: c9a0054a-b843-413d-56dc-85833137df4d
-  sha: sha256:82470f7556863440a39342f6e0e53f518e88dbcdb2e6a4fd0854829d4ccb63b1
+  size: 63295488
+  object_id: af2cdf78-884e-4b18-47cd-6c1d2ed42493
+  sha: sha256:334b42a96a65d7e54555827ca31f80896bf18978952f5aa5b8bb83bfdff3db0b
 k9s/k9s:
-  size: 55881728
-  object_id: 36394f30-ac2f-4b57-7d54-112ffe9a02ca
-  sha: sha256:f3f57053787ebb194a6b3956dd5e51a6c4da7073ef4ef9530ca2c5b4fdcee30f
+  size: 56823808
+  object_id: b2210de0-fd58-49c0-7e36-e2fcd755f489
+  sha: sha256:9a4dbb8e339423b3c7cd587f4abdd20351c01af15c8f1546b99f4557199e2c74
 kubectl/kubectl:
   size: 46596096
-  object_id: 3abb177e-c6e6-49c6-5a68-61c894c506fd
+  object_id: 8253430f-5c5b-4bf0-4752-1c6b47c45ef5
   sha: sha256:053561f7c68c5a037a69c52234e3cf1f91798854527692acd67091d594b616ce
 nerdctl/nerdctl:
-  size: 26677248
-  object_id: 8361a3a8-b12b-4fa4-70af-afd1bf77e6e6
-  sha: sha256:828c048c90c477b67d47961136a35e4a48f41c85c42244ea9e879676650d616a
+  size: 27639808
+  object_id: 35182aa8-3862-443e-7436-0c38b3b70b1b
+  sha: sha256:49a369bdee22b80e99d2e100a7140b8a7c2f982cdf45a5bace3136444b882fd6

jobs/k3s-agent/spec

@@ -144,4 +144,8 @@ properties:
       shutdownGracePeriod: 30s
       shutdownGracePeriodCriticalPods: 10s
 
+  k3s.containerd_additional_env_vars:
+    description: additional env vars to set for containerd (the key will be prefixed with CONTAINERD_, and set in k3s launch context
+    default: []
+
 

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

@@ -72,6 +72,14 @@ case $1 in
 <% end %>
 <% end %>
 
+
+<% if_p('k3s.containerd_additional_env_vars') do |value| %>
+<% p('k3s.containerd_additional_env_vars').each do |var| %>
+  export CONTAINERD_<%= var['name'] %>="<%= var['value'] %>"
+<% end %>
+<% end %>
+
+
 #set external ip flags
 <% if spec.ip != spec.networks.marshal_dump.values.first.ip %>
 #define first ip as external_ip

jobs/k3s-server/spec

@@ -189,6 +189,11 @@ properties:
       shutdownGracePeriod: 30s
       shutdownGracePeriodCriticalPods: 10s
 
+  k3s.containerd_additional_env_vars:
+    description: additional env vars (name/value map array) to set for containerd (the key will be prefixed with CONTAINERD_, and set in k3s launch context
+    default: []
+
+
 #audit policy file
   k3s.audit-policy-file:
     description: if set, defines and activate audit policy for k8s server

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

@@ -114,6 +114,13 @@ case $1 in
 <% end %>
 <% end %>
 
+
+<% if_p('k3s.containerd_additional_env_vars') do |value| %>
+<% p('k3s.containerd_additional_env_vars').each do |var| %>
+    export CONTAINERD_<%= var['name'] %>="<%= var['value'] %>"
+<% end %>
+<% end %>
+
 #set tls san for api
 <% if_p('k3s.master_vip_api') do |flag| %>
     export FLAGS="$FLAGS --tls-san=<%= flag %>"

releases/k3s/index.yml

@@ -65,4 +65,6 @@ builds:
     version: "123"
   d465033d-b0d3-4d55-5ad0-a57940fec5c9:
     version: "14"
+  fa2e4492-8da7-42b7-7ed5-5f0c0fe0a50c:
+    version: "123.5"
 format-version: "2"

releases/k3s/k3s-123.5.yml

@@ -0,0 +1,65 @@
+name: k3s
+version: "123.5"
+commit_hash: a5324fe
+uncommitted_changes: false
+jobs:
+- name: k3s-agent
+  version: cea72360b5c14c0686925f0df2b2ba5baf0aa5533c44447944c25ba4b2792eb1
+  fingerprint: cea72360b5c14c0686925f0df2b2ba5baf0aa5533c44447944c25ba4b2792eb1
+  sha1: sha256:2f055820ed416b3bd7225412954c1502f61fbb58cb5ec7eed84d22a35ccfe7af
+  packages:
+  - k3s
+  - kubectl-k3s
+  - k3s-images
+  - nerdctl
+- name: k3s-agent-airgaped-images
+  version: dac8160deeef67d642c67065cdb584c53ca84807717f4b7abb3e748badb97313
+  fingerprint: dac8160deeef67d642c67065cdb584c53ca84807717f4b7abb3e748badb97313
+  sha1: sha256:56989c04162b348ce691ad78d9ceaefc4b46338df95ebe87fda1e5ce0a30d429
+  packages:
+  - k3s-images
+- name: k3s-server
+  version: 79b692c882652e365bbfa888161dddeec62452fe9ec3cea6b53071e25ef0fd9a
+  fingerprint: 79b692c882652e365bbfa888161dddeec62452fe9ec3cea6b53071e25ef0fd9a
+  sha1: sha256:abb485c90bca12979f1d75ad8902e2692aa6aae68dd49c8817757f7300255462
+  packages:
+  - k3s
+  - k9s
+  - kubectl-k3s
+  - nerdctl
+- name: k3s-server-airgaped-images
+  version: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
+  fingerprint: 3e8cc00744f582f54235a554c9a5a1bcbc16c8848330d8b17fbe1ab270f7d2ef
+  sha1: sha256:fbae88a6d6e06d8ac29288b73a971832e77d2483978c56481844e1c7f8e77c78
+  packages:
+  - k3s-images
+packages:
+- name: k3s
+  version: 21a5deb1aa8a91ea350875952194a8e971e90e0110eb1e4b39243d9a9b29b690
+  fingerprint: 21a5deb1aa8a91ea350875952194a8e971e90e0110eb1e4b39243d9a9b29b690
+  sha1: sha256:877c8f714d326d10cc24652b6cf3fd1d2985f9f4e1986f6e035f50f0c49353c3
+  dependencies: []
+- name: k3s-images
+  version: a93c0f96c237ca3786c5257f9bc00e4cc5b67c9854731d782dd4f4ca5967d43a
+  fingerprint: a93c0f96c237ca3786c5257f9bc00e4cc5b67c9854731d782dd4f4ca5967d43a
+  sha1: sha256:956a43b6d474c1f57468aed5993fa9503dd1742524c167a4486d2025ba721332
+  dependencies: []
+- name: k9s
+  version: fc860dd549d216cd09e66a25b4ff22c29557dd7e79c03f44db247f16e6d73e5c
+  fingerprint: fc860dd549d216cd09e66a25b4ff22c29557dd7e79c03f44db247f16e6d73e5c
+  sha1: sha256:5fc0895690049fa8c0445f79a2ec871d01d4b0dcd2df040d76a0e875f48dff55
+  dependencies: []
+- name: kubectl-k3s
+  version: bfd15f2669c343c9a81bd633d3f829f262f8924a851954ea5aa96efdf21a6f2c
+  fingerprint: bfd15f2669c343c9a81bd633d3f829f262f8924a851954ea5aa96efdf21a6f2c
+  sha1: sha256:9583aa53ccb2da187edc3ee84b520c3cb20544f9d7f44cd4edfc396653ecf4c8
+  dependencies: []
+- name: nerdctl
+  version: 2a90585f7e5f1d0009e343808638f0e06a927103a1a057d8fda6733186da719f
+  fingerprint: 2a90585f7e5f1d0009e343808638f0e06a927103a1a057d8fda6733186da719f
+  sha1: sha256:e067568fa0de560293be78f27928f703fd28d01b00aaf976a3d889bec5d35cf2
+  dependencies: []
+license:
+  version: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  fingerprint: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  sha1: sha256:cbe3175489dfaec91e9f392399fbfb68e008885feb91a3b8d493a35d2fc5a8fa

vendir.lock

@@ -2,16 +2,16 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - githubRelease:
-      tag: v1.23.10+k3s1
-      url: https://api.github.com/repos/k3s-io/k3s/releases/75302137
+      tag: v1.23.13+k3s1
+      url: https://api.github.com/repos/k3s-io/k3s/releases/80963685
     path: github.com/k3s-io/k3s
   - githubRelease:
-      tag: v0.26.3
-      url: https://api.github.com/repos/derailed/k9s/releases/73605147
+      tag: v0.26.7
+      url: https://api.github.com/repos/derailed/k9s/releases/80222550
     path: github.com/derailed/k9s
   - githubRelease:
-      tag: v0.20.0
-      url: https://api.github.com/repos/containerd/nerdctl/releases/67046917
+      tag: v1.0.0
+      url: https://api.github.com/repos/containerd/nerdctl/releases/80611624
     path: github.com/containerd/nerdctl
   path: src
 kind: LockConfig

vendir.yml

@@ -11,7 +11,7 @@ directories:
   - path: github.com/k3s-io/k3s
     githubRelease:
       slug: k3s-io/k3s
-      tag: v1.23.10+k3s1 
+      tag: v1.23.13+k3s1 
       disableAutoChecksumValidation: true 
     includePaths:
     - "k3s"
@@ -21,7 +21,7 @@ directories:
   - path: github.com/derailed/k9s
     githubRelease:
       slug: derailed/k9s
-      tag: v0.26.3
+      tag: v0.26.7
       disableAutoChecksumValidation: true 
     includePaths:
     - "k9s_Linux_x86_64.tar.gz"
@@ -30,8 +30,8 @@ directories:
   - path: github.com/containerd/nerdctl
     githubRelease:
       slug: containerd/nerdctl
-      tag: v0.20.0
+      tag: v1.0.0
       disableAutoChecksumValidation: true
     includePaths:
-    - "nerdctl-0.20.0-linux-amd64.tar.gz"
+    - "nerdctl-1.0.0-linux-amd64.tar.gz"