Merge pull request #94 from poblin-orange/develop-1.23

release 123.2
orange-cloudfoundry · Jul 21, 2022 · 1db8688 · 1db8688
2 parents a48050e + 3b91483
commit 1db8688
Show file tree

Hide file tree

Showing 14 changed files with 123 additions and 15 deletions.
diff --git a/.final_builds/jobs/k3s-agent/index.yml b/.final_builds/jobs/k3s-agent/index.yml
@@ -39,6 +39,10 @@ builds:
     version: 5b14ed5543b5f02d5fbdfe8faf912cfe95a1ba153e9dae305a05126b5629a6bc
     blobstore_id: a6569d34-c9fc-4dfe-7bca-e4d543fed4ca
     sha1: sha256:78b3ce29792f0a098e8e9479d7eb7681e237ed0dd64feb9734a11e5a8b4893f3
+  5da0dd0a241c8a49e715a511c5b20e6a75bf707964faa564b41aa5e87f20c578:
+    version: 5da0dd0a241c8a49e715a511c5b20e6a75bf707964faa564b41aa5e87f20c578
+    blobstore_id: dd25cd5c-3721-48bc-604a-e40a94f30010
+    sha1: sha256:58dbe0443169b2d36fa7ce3c8a900b7d4d341c4a55efcf13520ffe107b89a7fa
   70212d297f06c6e9689878d0e94a1ac2d02fc891d04e1a24fcd97d6e1f27e816:
     version: 70212d297f06c6e9689878d0e94a1ac2d02fc891d04e1a24fcd97d6e1f27e816
     blobstore_id: 8444c141-64e5-46cb-7bdb-59cd7a6b2a58

diff --git a/.final_builds/jobs/k3s-server/index.yml b/.final_builds/jobs/k3s-server/index.yml
@@ -103,6 +103,10 @@ builds:
     version: ca23ca546f68cf61fcd1ab4e90c591f0dfed8aed6d48ff61fa546a9516c92150
     blobstore_id: aa8b0336-14ec-40a7-460b-128f90104cca
     sha1: sha256:3377688e3e506127447f98ed45dd2282875e86227b4e195387848c10a7c35732
+  dff3f17902ee0c445c33474c63346bffff50b389f8f3a5b16e67cdf1af2dd7a8:
+    version: dff3f17902ee0c445c33474c63346bffff50b389f8f3a5b16e67cdf1af2dd7a8
+    blobstore_id: 5d4572f9-3e26-477a-404d-6c3bb0d2a6dd
+    sha1: sha256:aeb4d59dad3d67a0150263fdf9f1779670d162894419496eb0f00cd994358a91
   e2d4607b2ca54abbad5540e320dcb6b419260b3991b3b7d4906dbd8fe5210b2f:
     version: e2d4607b2ca54abbad5540e320dcb6b419260b3991b3b7d4906dbd8fe5210b2f
     blobstore_id: a0d4c35d-9470-41b6-6d8d-d0764f01904a

diff --git a/.final_builds/packages/k3s-images/index.yml b/.final_builds/packages/k3s-images/index.yml
@@ -43,6 +43,10 @@ builds:
     version: 9b62788662a8bcdbba54b87f296239ff6e030f6f4810733301a877e627d080d3
     blobstore_id: 4119b972-97b3-4f4f-5249-6c1b8f61fec7
     sha1: sha256:ca55c357e28ce2a354374ce4a6b48c7c48b7be0655eeafabc1025b6c3a8a7765
+  ae50a79f3154a65ee0682b80f4c078bbcb77c4017b54b1c4f9b0c50924babba5:
+    version: ae50a79f3154a65ee0682b80f4c078bbcb77c4017b54b1c4f9b0c50924babba5
+    blobstore_id: 220c8fca-dab0-400a-56a8-c380a398c984
+    sha1: sha256:2961c06b2d0857e1251b59dbd675e0719e331526d5e251d6fef4cb5da2647d89
   b54fbff7e9906c53a917c10f2eb240a25decae185c13f95d0d684983195e6810:
     version: b54fbff7e9906c53a917c10f2eb240a25decae185c13f95d0d684983195e6810
     blobstore_id: da4daa42-1c94-4440-61e7-de39a74e7de6

diff --git a/.final_builds/packages/k3s/index.yml b/.final_builds/packages/k3s/index.yml
@@ -27,6 +27,10 @@ builds:
     version: 86d856c7d6464004304bdd286d2431966548c756f4cab0cd2860874637fa5c20
     blobstore_id: 22963ed2-efde-4a06-7bc5-7412dd6a1c5d
     sha1: sha256:a112fe4708dc71c4bb341902a1c126a01f5c798a717fce21e707d159227efa2f
+  8d62efaad07f19f809d33c6553b0ed927c4b2b1843ce9aa5ffa8bccd60960d39:
+    version: 8d62efaad07f19f809d33c6553b0ed927c4b2b1843ce9aa5ffa8bccd60960d39
+    blobstore_id: 60b766b6-71c0-4b60-4ad8-08ca03f55508
+    sha1: sha256:a16c46b39e3f2e050574fe069c70916530bb6c5fdc63b2cb82aa9fafecca86ba
   8ea88056382da1f76dce0ffa03251f81d0890147a1c3dd56ad4fb98868661b0c:
     version: 8ea88056382da1f76dce0ffa03251f81d0890147a1c3dd56ad4fb98868661b0c
     blobstore_id: 81b930ab-ebc2-476e-4d1e-ec38fd140f53

diff --git a/.final_builds/packages/k9s/index.yml b/.final_builds/packages/k9s/index.yml
@@ -27,6 +27,10 @@ builds:
     version: b9124d1132db86c7f2ab4ff11e4a9191a14b4436dc6c552bc512c8d1e030bbbc
     blobstore_id: f99a9ee3-d13f-421b-4e52-2f713786c806
     sha1: sha256:b718efb60ce64a6c6e09b4e7cdc1fc6e4d891c8cdc0e48a98b0cacc2300d8e08
+  d580320a78bae76f0d1fccf51020467de4c367120d883e5b788a2ae19f3c4cdb:
+    version: d580320a78bae76f0d1fccf51020467de4c367120d883e5b788a2ae19f3c4cdb
+    blobstore_id: 12e07a9e-fd3b-4cad-4256-93c5d44b1025
+    sha1: sha256:b5e3b58e32ade8791097b971ebc08ca888c7945e9097d64eb3d82c9af46c0fce
   f52aba397169bd476f99fdce84211c6ddd9abf22a4352ba3279834722b9bea2f:
     version: f52aba397169bd476f99fdce84211c6ddd9abf22a4352ba3279834722b9bea2f
     blobstore_id: 86a467bb-15a5-4826-4573-10bf5a1fd831

diff --git a/config/blobs.yml b/config/blobs.yml
@@ -1,20 +1,20 @@
 k3s-images/k3s-airgap-images-amd64.tar:
   size: 504174592
-  object_id: 8e8678b2-3977-4b3c-6487-8198b1193267
-  sha: sha256:540c9db63af2d7b22e5a1d52b052a97370dd8597faf09bdeab4408a8543e5720
+  object_id: 101e28d4-ae73-483e-48b0-f7722c8df5da
+  sha: sha256:bbc4dac4c6d8cdcf40296a98f6695fbb134900a1f10198753e070223f61ca3f4
 k3s/k3s:
-  size: 62730240
-  object_id: 35be3a83-713f-417a-42dd-a60a40fb6df5
-  sha: sha256:ac98439485048f180bd541d10d736765d8e6834232eaf9fea35fd15ba15873b7
+  size: 62742528
+  object_id: 622b3b17-7c00-4f34-7497-f06001fb2197
+  sha: sha256:602a56b68fa525e5e06f169f49b84213c182dd5ee36a57fbc992bcb919451440
 k9s/k9s:
-  size: 55255040
-  object_id: 7028fc50-beb8-4609-5aba-c0d4b1318c8f
-  sha: sha256:6fffb9e8fdd3ec0e794e46684a86b697dc4c89a7b7b297c73a4cd379f5775acd
+  size: 55824384
+  object_id: 64a1d0d4-ed41-4610-63b7-a02e401f8e0b
+  sha: sha256:bfd558c97fbc9554bcf32ba70c77b48608cfed736222b733b2f73510f7fc6428
 kubectl/kubectl:
   size: 46682112
-  object_id: 6612c055-fd47-448d-716c-1c161eef1634
+  object_id: bc159aa5-6913-4397-63f0-b23460aed1a1
   sha: sha256:195d5387f2a6ca7b8ab5c2134b4b6cc27f29372f54b771947ba7c18ee983fbe6
 nerdctl/nerdctl:
   size: 26677248
-  object_id: 71cd3430-69a3-4939-42fb-ba8298b6cc77
+  object_id: 62873a01-0971-48d1-4a12-471e7fc23622
   sha: sha256:828c048c90c477b67d47961136a35e4a48f41c85c42244ea9e879676650d616a
diff --git a/jobs/k3s-agent/spec b/jobs/k3s-agent/spec
@@ -54,6 +54,8 @@ properties:
   registry.mirrors.tls.ca:
     description: private registry ca
 
+  k3s.node_name_prefix:
+    description: explicitly set k8s node name. If not set, <instance-group-name>-<index> is set automatically. If set, name is <node_name_prefix>-<index> 
 
   k3s.v:
     description: "(logging) Number for the log level verbosity (default: 0)"

diff --git a/jobs/k3s-agent/templates/bin/ctl.erb b/jobs/k3s-agent/templates/bin/ctl.erb
@@ -23,7 +23,16 @@ case $1 in
 
 
     export K3S_NODE_NAME=<%= spec.name %>-<%= spec.index %>
-
+
+
+<% if_p('k3s.node_name_prefix') do |prefix| %>
+    export K3S_NODE_NAME=<%= prefix %>-<%= spec.index %>
+<% end %>
+
+
+
+
+
     <% if_p('k3s.token-file-content') do |value| %>
     export K3S_TOKEN_FILE=/var/vcap/jobs/k3s-agent/config/token.csv
     <% end %>

diff --git a/jobs/k3s-server/spec b/jobs/k3s-server/spec
@@ -74,6 +74,8 @@ properties:
     description: (agent/flags) Customized flag for kubelet process
     default: []
 
+  k3s.node_name_prefix:
+    description: explicitly set k8s node name. If not set, <instance-group-name>-<index> is set automatically. If set, name is <node_name_prefix>-<index> 
 
 #disable defaut k3s components
   k3s.disable: 

diff --git a/jobs/k3s-server/templates/bin/ctl.erb b/jobs/k3s-server/templates/bin/ctl.erb
@@ -13,6 +13,11 @@ case $1 in
 
     export K3S_NODE_NAME=<%= spec.name %>-<%= spec.index %>
 
+<% if_p('k3s.node_name_prefix') do |prefix| %>
+    export K3S_NODE_NAME=<%= prefix %>-<%= spec.index %>
+<% end %>
+
+
     <% if_p('k3s.datastore-endpoint') do |value| %>
     export K3S_DATASTORE_ENDPOINT=<%= p('k3s.datastore-endpoint') %>
     <% end %>

diff --git a/releases/k3s/index.yml b/releases/k3s/index.yml
@@ -41,6 +41,8 @@ builds:
     version: "22"
   93efe4d1-bcb8-4144-60f1-0157abb62eed:
     version: "23"
+  944bf1bd-4bc7-476c-6947-1c9745954ed7:
+    version: "123.2"
   a240d97b-b6f9-4b2b-4d27-884f7282c8ad:
     version: "28"
   aa13e70f-e6f6-402f-54ae-3505a9e67570:

diff --git a/releases/k3s/k3s-123.2.yml b/releases/k3s/k3s-123.2.yml
@@ -0,0 +1,65 @@
+name: k3s
+version: "123.2"
+commit_hash: 9ad856a
+uncommitted_changes: false
+jobs:
+- name: k3s-agent
+  version: 5da0dd0a241c8a49e715a511c5b20e6a75bf707964faa564b41aa5e87f20c578
+  fingerprint: 5da0dd0a241c8a49e715a511c5b20e6a75bf707964faa564b41aa5e87f20c578
+  sha1: sha256:58dbe0443169b2d36fa7ce3c8a900b7d4d341c4a55efcf13520ffe107b89a7fa
+  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: dff3f17902ee0c445c33474c63346bffff50b389f8f3a5b16e67cdf1af2dd7a8
+  fingerprint: dff3f17902ee0c445c33474c63346bffff50b389f8f3a5b16e67cdf1af2dd7a8
+  sha1: sha256:aeb4d59dad3d67a0150263fdf9f1779670d162894419496eb0f00cd994358a91
+  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: 8d62efaad07f19f809d33c6553b0ed927c4b2b1843ce9aa5ffa8bccd60960d39
+  fingerprint: 8d62efaad07f19f809d33c6553b0ed927c4b2b1843ce9aa5ffa8bccd60960d39
+  sha1: sha256:a16c46b39e3f2e050574fe069c70916530bb6c5fdc63b2cb82aa9fafecca86ba
+  dependencies: []
+- name: k3s-images
+  version: ae50a79f3154a65ee0682b80f4c078bbcb77c4017b54b1c4f9b0c50924babba5
+  fingerprint: ae50a79f3154a65ee0682b80f4c078bbcb77c4017b54b1c4f9b0c50924babba5
+  sha1: sha256:2961c06b2d0857e1251b59dbd675e0719e331526d5e251d6fef4cb5da2647d89
+  dependencies: []
+- name: k9s
+  version: d580320a78bae76f0d1fccf51020467de4c367120d883e5b788a2ae19f3c4cdb
+  fingerprint: d580320a78bae76f0d1fccf51020467de4c367120d883e5b788a2ae19f3c4cdb
+  sha1: sha256:b5e3b58e32ade8791097b971ebc08ca888c7945e9097d64eb3d82c9af46c0fce
+  dependencies: []
+- name: kubectl-k3s
+  version: f31573923b6cf4c6bdaa91626f558f1840a3fc53079b21d04ee53e1dcfe8e7c7
+  fingerprint: f31573923b6cf4c6bdaa91626f558f1840a3fc53079b21d04ee53e1dcfe8e7c7
+  sha1: sha256:3582db70503234eddce3522c7782245a3bbb0777c113c328d47f07313229c519
+  dependencies: []
+- name: nerdctl
+  version: 873348035e9ed6470217b992315ab126423aa4af7ce47997ca940fc753d35d61
+  fingerprint: 873348035e9ed6470217b992315ab126423aa4af7ce47997ca940fc753d35d61
+  sha1: sha256:90396174af92ef2013bb4a4106b03760143b32ae3fd75564c0d16c784d37dea2
+  dependencies: []
+license:
+  version: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  fingerprint: cf0ca1fe65dee9607c7bb9460a3f20835e582cbb7f5b2c3625fba2e21d7e91b9
+  sha1: sha256:cbe3175489dfaec91e9f392399fbfb68e008885feb91a3b8d493a35d2fc5a8fa
diff --git a/vendir.lock b/vendir.lock
@@ -2,12 +2,15 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - githubRelease:
-      url: https://api.github.com/repos/k3s-io/k3s/releases/71411111
+      tag: v1.23.9+k3s1
+      url: https://api.github.com/repos/k3s-io/k3s/releases/72277541
     path: github.com/k3s-io/k3s
   - githubRelease:
-      url: https://api.github.com/repos/derailed/k9s/releases/71006850
+      tag: v0.26.0
+      url: https://api.github.com/repos/derailed/k9s/releases/72173680
     path: github.com/derailed/k9s
   - githubRelease:
+      tag: v0.20.0
       url: https://api.github.com/repos/containerd/nerdctl/releases/67046917
     path: github.com/containerd/nerdctl
   path: src

diff --git a/vendir.yml b/vendir.yml
@@ -11,7 +11,7 @@ directories:
   - path: github.com/k3s-io/k3s
     githubRelease:
       slug: k3s-io/k3s
-      tag: v1.23.8+k3s2 
+      tag: v1.23.9+k3s1 
       disableAutoChecksumValidation: true 
     includePaths:
     - "k3s"
@@ -21,7 +21,7 @@ directories:
   - path: github.com/derailed/k9s
     githubRelease:
       slug: derailed/k9s
-      tag: v0.25.21
+      tag: v0.26.0
       disableAutoChecksumValidation: true 
     includePaths:
     - "k9s_Linux_x86_64.tar.gz"