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

k3s-1.23.6 - nerdctl
orange-cloudfoundry · Jun 10, 2022 · 2bf3c94 · 2bf3c94
2 parents 2dd5407 + e5ea4e1
commit 2bf3c94
Show file tree

Hide file tree

Showing 17 changed files with 147 additions and 8 deletions.
diff --git a/.final_builds/jobs/k3s-agent/index.yml b/.final_builds/jobs/k3s-agent/index.yml
@@ -11,6 +11,10 @@ builds:
     version: 277c74e3c6ef78ceea4ef75e53e3119186abd5bdfe45a9a2abc5f51b22993b42
     blobstore_id: feeafba0-4960-4b57-50e8-54fb13f74224
     sha1: sha256:463086b0baf9e35cfd4684ecb6ffab2f09e05f28ddc5e39e9702a1aac37ba5d3
+  2a1d750a53a483c59cceb3b61470aa6d3a1d9b7d4d9f1f52b1ba32ae18ced29d:
+    version: 2a1d750a53a483c59cceb3b61470aa6d3a1d9b7d4d9f1f52b1ba32ae18ced29d
+    blobstore_id: 32982c45-cb8f-4601-648a-aa6067ad961c
+    sha1: sha256:1742c211fe6dcfc28896b318109e341091361c82178dc162683050de442724f3
   31331644ddf17d3128cc2c5be631f950c381d85f31b0da879bb3e7ec87c7425d:
     version: 31331644ddf17d3128cc2c5be631f950c381d85f31b0da879bb3e7ec87c7425d
     blobstore_id: 6a9f3709-73d3-4141-5fd5-8039866d0591

diff --git a/.final_builds/jobs/k3s-server/index.yml b/.final_builds/jobs/k3s-server/index.yml
@@ -55,6 +55,10 @@ builds:
     version: 5c689f4cbed991990f018e37f6bdec6e6bae4d40903a2ca174ea97bc83fcc211
     blobstore_id: a1520f02-60bf-4a66-5280-532613958e18
     sha1: sha256:f7bd953c018b897b358ffeb8e328210f3e1a2ab4d61aa8bc85013eaebdd28e0c
+  654052ec63c1dea497b962f85a56e91c59932c33794c0c2bc6a0c4e2ee864b2d:
+    version: 654052ec63c1dea497b962f85a56e91c59932c33794c0c2bc6a0c4e2ee864b2d
+    blobstore_id: 544eee63-94d3-4cae-7109-6467e58474c4
+    sha1: sha256:564121b3c7056382cf85d1ba41751b80acbb7c24c56a3dff3e33dec448197d45
   66c6019bc76d287c130841960d988232c4279aff394c7becb6a0c111a35e74d3:
     version: 66c6019bc76d287c130841960d988232c4279aff394c7becb6a0c111a35e74d3
     blobstore_id: 90f3bc61-4475-47df-5bc2-df8df8550790

diff --git a/.final_builds/packages/k3s-images/index.yml b/.final_builds/packages/k3s-images/index.yml
@@ -31,6 +31,10 @@ builds:
     version: 87d143d4959c27dd383565ff71c887976550764414b0c2159b74071515580c7f
     blobstore_id: 782e3129-376d-4fc6-5198-5fac0c7431c3
     sha1: sha256:f7a5be52c86d6ccf9d3dcff28733d50ae1ed31d897b39a93310b331bab4bd457
+  8dfef4a08a534d1b271c78cf2297e2a0641833e6ff321743658c2ff4777e2f0a:
+    version: 8dfef4a08a534d1b271c78cf2297e2a0641833e6ff321743658c2ff4777e2f0a
+    blobstore_id: ef53fa91-7b17-4e10-4681-c17749b4e686
+    sha1: sha256:cc78bdf484f28186fb51312bf1f21b2892dcfdbbfcfde23f48f613e268050f9c
   91bc70267c19c06ba5585485a95416eb0c17cef9f02002bb96a674cb714579cd:
     version: 91bc70267c19c06ba5585485a95416eb0c17cef9f02002bb96a674cb714579cd
     blobstore_id: 0261e565-07fa-4c8d-73e3-d25bd46c3247

diff --git a/.final_builds/packages/k3s/index.yml b/.final_builds/packages/k3s/index.yml
@@ -11,6 +11,10 @@ builds:
     version: 63a8458bdc0a7d3109bb5969f12af063f93d53d93574b4ca1c77b24f6beb9275
     blobstore_id: 5a907264-fd3b-475c-5643-13cf523a76f5
     sha1: sha256:9a7a3a302f7fe84323a92fb32dabaf0ed5203765472a12636e31ff02f339b583
+  66afbb171ed384172a7c7bef2e151757e322eca525452fb143e02a637137db13:
+    version: 66afbb171ed384172a7c7bef2e151757e322eca525452fb143e02a637137db13
+    blobstore_id: 68dcfe9a-84f7-4adf-583f-514ce18d099e
+    sha1: sha256:3924d14155d3a605ae33d3075ca54a2ae720dfeeee7c11cef435a88c02994dd1
   76970f0fa8bbbadd2a1b95ac15fedfd009643d04ae2ae06b81730e5a30c283cf:
     version: 76970f0fa8bbbadd2a1b95ac15fedfd009643d04ae2ae06b81730e5a30c283cf
     blobstore_id: ce8192c4-a351-4193-52c3-5647c54d9cdc

diff --git a/.final_builds/packages/nerdctl/index.yml b/.final_builds/packages/nerdctl/index.yml
@@ -0,0 +1,6 @@
+builds:
+  873348035e9ed6470217b992315ab126423aa4af7ce47997ca940fc753d35d61:
+    version: 873348035e9ed6470217b992315ab126423aa4af7ce47997ca940fc753d35d61
+    blobstore_id: a17c8b40-97ef-4a32-5e93-b472b8815a2d
+    sha1: sha256:90396174af92ef2013bb4a4106b03760143b32ae3fd75564c0d16c784d37dea2
+format-version: "2"
diff --git a/addblob.sh b/addblob.sh
@@ -3,11 +3,20 @@ set -x
 bosh add-blob src/github.com/k3s-io/k3s/k3s k3s/k3s
 bosh add-blob src/github.com/k3s-io/k3s/k3s-airgap-images-amd64.tar k3s-images/k3s-airgap-images-amd64.tar
 
+
 pushd src/github.com/derailed/k9s/
 tar xfv ./k9s_Linux_x86_64.tar.gz
 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
+popd
+
+bosh add-blob src/github.com/containerd/nerdctl/nerdctl nerdctl/nerdctl
+
 pushd src
 curl -LO https://dl.k8s.io/release/v1.21.9/bin/linux/amd64/kubectl --output ./src/kubectl
 chmod ugo+x kubectl

diff --git a/config/blobs.yml b/config/blobs.yml
@@ -1,11 +1,11 @@
 k3s-images/k3s-airgap-images-amd64.tar:
-  size: 500852736
-  object_id: d0ac1937-28e7-45dd-53ea-6da3bff08239
-  sha: sha256:62675de088b3d690be769c55fc264b55d4cf6901d15c45f6ef7ac30a67e10235
+  size: 504154112
+  object_id: 02f52d94-778d-4ae9-6985-efa4286dfd07
+  sha: sha256:ced9dd7814fc2fdfb52673d107d6d04a96555ae66b3faf75a07b4564c099a324
 k3s/k3s:
-  size: 49225728
-  object_id: 8853d095-c99f-4278-5753-f856f1d6cccc
-  sha: sha256:93576e03aa4ef1c05f192517e7a4900339e5f773479ad98be524324a23315b9a
+  size: 62664704
+  object_id: 8ae75984-56cc-43ba-5eca-dbaff347ef10
+  sha: sha256:a60e039130faf2f0d349a79738e185616fd8e74ab9e0e356ce8127216fd8f9c4
 k9s/k9s:
   size: 55410688
   object_id: 0b3b0840-1db4-4ac5-53b1-0f62a80862cb
@@ -14,3 +14,7 @@ kubectl/kubectl:
   size: 46682112
   object_id: 9ecc8f62-db06-493a-760d-febb1f450316
   sha: sha256:195d5387f2a6ca7b8ab5c2134b4b6cc27f29372f54b771947ba7c18ee983fbe6
+nerdctl/nerdctl:
+  size: 26677248
+  object_id: 303148e0-3626-4c9e-73fc-e143fd7b879e
+  sha: sha256:828c048c90c477b67d47961136a35e4a48f41c85c42244ea9e879676650d616a
diff --git a/jobs/k3s-agent/spec b/jobs/k3s-agent/spec
@@ -5,6 +5,7 @@ packages:
 - k3s
 - kubectl-k3s
 - k3s-images
+- nerdctl
 templates:
   config/bpm.yml: config/bpm.yml
   bin/pre-start.erb: bin/pre-start

diff --git a/jobs/k3s-agent/templates/bin/envrc b/jobs/k3s-agent/templates/bin/envrc
@@ -2,5 +2,10 @@
 
 export PATH=$PATH:/var/vcap/packages/k3s
 export PATH=$PATH:/var/vcap/packages/kubectl-k3s
+export PATH=$PATH:/var/vcap/packages/nerdctl
 
 alias crictl="k3s crictl -c /var/vcap/store/k3s-agent/agent/etc/crictl.yaml"
+
+alias nerdctl="nerdctl --address /run/k3s/containerd/containerd.sock --namespace k8s.io"
+
+
diff --git a/jobs/k3s-server/spec b/jobs/k3s-server/spec
@@ -5,6 +5,7 @@ packages:
 - k3s
 - k9s
 - kubectl-k3s
+- nerdctl
 templates:
   config/bpm.yml: config/bpm.yml
   bin/pre-start.erb: bin/pre-start

diff --git a/jobs/k3s-server/templates/bin/envrc b/jobs/k3s-server/templates/bin/envrc
@@ -3,6 +3,8 @@
 export PATH=$PATH:/var/vcap/packages/k3s
 export PATH=$PATH:/var/vcap/packages/k9s
 export PATH=$PATH:/var/vcap/packages/kubectl-k3s
+export PATH=$PATH:/var/vcap/packages/nerdctl
 
 export KUBECONFIG=/var/vcap/store/k3s-server/kubeconfig.yml
 alias crictl="k3s crictl -c /var/vcap/store/k3s-server/agent/etc/crictl.yaml"
+alias nerdctl="nerdctl --address /run/k3s/containerd/containerd.sock --namespace k8s.io"
diff --git a/packages/nerdctl/packaging b/packages/nerdctl/packaging
@@ -0,0 +1,12 @@
+set -e # exit immediately if a simple command exits with a non-zero status
+set -u # report the usage of uninitialized variables
+
+# Detect # of CPUs so make jobs can be parallelized
+CPUS=$(grep -c ^processor /proc/cpuinfo)
+ # Available variables
+# $BOSH_COMPILE_TARGET - where this package & spec'd source files are available
+# $BOSH_INSTALL_TARGET - where you copy/install files to be included in package
+export HOME=/var/vcap
+cp ${BOSH_COMPILE_TARGET}/nerdctl/nerdctl ${BOSH_INSTALL_TARGET}/nerdctl
+chmod ugo+x ${BOSH_INSTALL_TARGET}/nerdctl
+
diff --git a/packages/nerdctl/spec b/packages/nerdctl/spec
@@ -0,0 +1,5 @@
+---
+name: nerdctl 
+dependencies: []
+files:
+- nerdctl/nerdctl
diff --git a/releases/k3s/index.yml b/releases/k3s/index.yml
@@ -55,6 +55,8 @@ builds:
     version: "3"
   c9a1c25b-7712-43a1-6ecc-9c9374b62897:
     version: "15"
+  d2b9074f-7e3e-4342-6e6c-a4384d82c822:
+    version: "123"
   d465033d-b0d3-4d55-5ad0-a57940fec5c9:
     version: "14"
 format-version: "2"
diff --git a/releases/k3s/k3s-123.yml b/releases/k3s/k3s-123.yml
@@ -0,0 +1,65 @@
+name: k3s
+version: "123"
+commit_hash: 2175afb
+uncommitted_changes: false
+jobs:
+- name: k3s-agent
+  version: 2a1d750a53a483c59cceb3b61470aa6d3a1d9b7d4d9f1f52b1ba32ae18ced29d
+  fingerprint: 2a1d750a53a483c59cceb3b61470aa6d3a1d9b7d4d9f1f52b1ba32ae18ced29d
+  sha1: sha256:1742c211fe6dcfc28896b318109e341091361c82178dc162683050de442724f3
+  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: 654052ec63c1dea497b962f85a56e91c59932c33794c0c2bc6a0c4e2ee864b2d
+  fingerprint: 654052ec63c1dea497b962f85a56e91c59932c33794c0c2bc6a0c4e2ee864b2d
+  sha1: sha256:564121b3c7056382cf85d1ba41751b80acbb7c24c56a3dff3e33dec448197d45
+  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: 66afbb171ed384172a7c7bef2e151757e322eca525452fb143e02a637137db13
+  fingerprint: 66afbb171ed384172a7c7bef2e151757e322eca525452fb143e02a637137db13
+  sha1: sha256:3924d14155d3a605ae33d3075ca54a2ae720dfeeee7c11cef435a88c02994dd1
+  dependencies: []
+- name: k3s-images
+  version: 8dfef4a08a534d1b271c78cf2297e2a0641833e6ff321743658c2ff4777e2f0a
+  fingerprint: 8dfef4a08a534d1b271c78cf2297e2a0641833e6ff321743658c2ff4777e2f0a
+  sha1: sha256:cc78bdf484f28186fb51312bf1f21b2892dcfdbbfcfde23f48f613e268050f9c
+  dependencies: []
+- name: k9s
+  version: 8751b3231c52d45ea7efa35f7209b322e7f6ba009ace3759f052f0672d872fd2
+  fingerprint: 8751b3231c52d45ea7efa35f7209b322e7f6ba009ace3759f052f0672d872fd2
+  sha1: sha256:2498425e99005b2e433c82ab9b5bb7c40ac778eea49e46c73c8f892eba6c2bbd
+  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,10 +2,13 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - githubRelease:
-      url: https://api.github.com/repos/k3s-io/k3s/releases/65630171
+      url: https://api.github.com/repos/k3s-io/k3s/releases/65630036
     path: github.com/k3s-io/k3s
   - githubRelease:
       url: https://api.github.com/repos/derailed/k9s/releases/56095809
     path: github.com/derailed/k9s
+  - githubRelease:
+      url: https://api.github.com/repos/containerd/nerdctl/releases/67046917
+    path: github.com/containerd/nerdctl
   path: src
 kind: LockConfig
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.21.12+k3s1 
+      tag: v1.23.6+k3s1 
       disableAutoChecksumValidation: true 
     includePaths:
     - "k3s"
@@ -27,3 +27,11 @@ directories:
     - "k9s_Linux_x86_64.tar.gz"
 
 
+  - path: github.com/containerd/nerdctl
+    githubRelease:
+      slug: containerd/nerdctl 
+      tag: v0.20.0 
+      disableAutoChecksumValidation: true 
+    includePaths:
+    - "nerdctl-0.20.0-linux-amd64.tar.gz"
+