From f5e6961dcb105777a1505d497f48150c3891b419 Mon Sep 17 00:00:00 2001 From: Jakob Naucke Date: Fri, 10 Dec 2021 16:44:57 +0100 Subject: [PATCH] kata-deploy: Configure Kata & containerd for CCv0 Introduce kata-cc runtime class, shim & config - Specify cri_handler in containerd config - Specify to use initrd - Specify kernel_params according to guest config - Specify service_offload Signed-off-by: Jakob Naucke --- .../kata-deploy/base/kata-deploy.yaml | 2 ++ .../packaging/kata-deploy/scripts/kata-deploy.sh | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml b/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml index d500b1f1f5..3e2aba3404 100644 --- a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml +++ b/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml @@ -28,6 +28,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: CONFIGURE_CC + value: "yes" securityContext: privileged: false volumeMounts: diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh index 0d0afcece7..ca172ef166 100755 --- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh @@ -18,6 +18,7 @@ shims=( "qemu" "clh" ) +[ "${CONFIGURE_CC:-}" == "yes" ] && shims+=("cc") # If we fail for any reason a message will be displayed die() { @@ -171,7 +172,8 @@ function configure_containerd_runtime() { else cat < \ + "/opt/kata/share/defaults/kata-containers/configuration-cc.toml" + fi +} + function remove_artifacts() { echo "deleting kata artifacts" rm -rf /opt/kata/ @@ -287,6 +300,7 @@ function main() { install_artifacts configure_cri_runtime "$runtime" + configure_kata kubectl label node "$NODE_NAME" --overwrite katacontainers.io/kata-runtime=true ;; cleanup)