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)