mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-15 06:34:03 +00:00
kata-deploy: Add kata-qemu-runtime-rs-coco-dev runtime class
Add the runtime class and shim references for the new non-tee runtime-rs class Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
parent
7eee5a0d9b
commit
abc486ca7c
@ -127,7 +127,7 @@ All values can be overridden with --set key=value or a custom `-f myvalues.yaml`
|
|||||||
| `k8sDistribution` | Set the k8s distribution to use: `k8s`, `k0s`, `k3s`, `rke2`, `microk8s` | `k8s` |
|
| `k8sDistribution` | Set the k8s distribution to use: `k8s`, `k0s`, `k3s`, `rke2`, `microk8s` | `k8s` |
|
||||||
| `nodeSelector` | Node labels for pod assignment. Allows restricting deployment to specific nodes | `{}` |
|
| `nodeSelector` | Node labels for pod assignment. Allows restricting deployment to specific nodes | `{}` |
|
||||||
| `env.debug` | Enable debugging in the `configuration.toml` | `false` |
|
| `env.debug` | Enable debugging in the `configuration.toml` | `false` |
|
||||||
| `env.shims` | List of shims to deploy | `clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx` |
|
| `env.shims` | List of shims to deploy | `clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-runtime-rs-coco-dev qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx` |
|
||||||
| `env.defaultShim` | The default shim to use if none specified | `qemu` |
|
| `env.defaultShim` | The default shim to use if none specified | `qemu` |
|
||||||
| `env.createRuntimeClasses` | Create the k8s `runtimeClasses` | `true` |
|
| `env.createRuntimeClasses` | Create the k8s `runtimeClasses` | `true` |
|
||||||
| `env.createDefaultRuntimeClass` | Create the default k8s `runtimeClass` | `false` |
|
| `env.createDefaultRuntimeClass` | Create the default k8s `runtimeClass` | `false` |
|
||||||
|
@ -13,7 +13,7 @@ k8sDistribution: "k8s"
|
|||||||
nodeSelector: {}
|
nodeSelector: {}
|
||||||
env:
|
env:
|
||||||
debug: "false"
|
debug: "false"
|
||||||
shims: "clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx"
|
shims: "clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-runtime-rs-coco-dev qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx"
|
||||||
defaultShim: "qemu"
|
defaultShim: "qemu"
|
||||||
createRuntimeClasses: "true"
|
createRuntimeClasses: "true"
|
||||||
createDefaultRuntimeClass: "false"
|
createDefaultRuntimeClass: "false"
|
||||||
|
@ -33,7 +33,7 @@ spec:
|
|||||||
- name: DEBUG
|
- name: DEBUG
|
||||||
value: "false"
|
value: "false"
|
||||||
- name: SHIMS
|
- name: SHIMS
|
||||||
value: "clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx"
|
value: "clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-runtime-rs-coco-dev qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx"
|
||||||
- name: DEFAULT_SHIM
|
- name: DEFAULT_SHIM
|
||||||
value: "qemu"
|
value: "qemu"
|
||||||
- name: CREATE_RUNTIMECLASSES
|
- name: CREATE_RUNTIMECLASSES
|
||||||
|
@ -0,0 +1,13 @@
|
|||||||
|
---
|
||||||
|
kind: RuntimeClass
|
||||||
|
apiVersion: node.k8s.io/v1
|
||||||
|
metadata:
|
||||||
|
name: kata-qemu-runtime-rs-coco-dev
|
||||||
|
handler: kata-qemu-runtime-rs-coco-dev
|
||||||
|
overhead:
|
||||||
|
podFixed:
|
||||||
|
memory: "160Mi"
|
||||||
|
cpu: "250m"
|
||||||
|
scheduling:
|
||||||
|
nodeSelector:
|
||||||
|
katacontainers.io/kata-runtime: "true"
|
@ -131,6 +131,19 @@ scheduling:
|
|||||||
---
|
---
|
||||||
kind: RuntimeClass
|
kind: RuntimeClass
|
||||||
apiVersion: node.k8s.io/v1
|
apiVersion: node.k8s.io/v1
|
||||||
|
metadata:
|
||||||
|
name: kata-qemu-runtime-rs-coco-dev
|
||||||
|
handler: kata-qemu-runtime-rs-coco-dev
|
||||||
|
overhead:
|
||||||
|
podFixed:
|
||||||
|
memory: "160Mi"
|
||||||
|
cpu: "250m"
|
||||||
|
scheduling:
|
||||||
|
nodeSelector:
|
||||||
|
katacontainers.io/kata-runtime: "true"
|
||||||
|
---
|
||||||
|
kind: RuntimeClass
|
||||||
|
apiVersion: node.k8s.io/v1
|
||||||
metadata:
|
metadata:
|
||||||
name: kata-qemu-se
|
name: kata-qemu-se
|
||||||
handler: kata-qemu-se
|
handler: kata-qemu-se
|
||||||
|
@ -35,7 +35,7 @@ info() {
|
|||||||
|
|
||||||
DEBUG="${DEBUG:-"false"}"
|
DEBUG="${DEBUG:-"false"}"
|
||||||
|
|
||||||
SHIMS="${SHIMS:-"clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx"}"
|
SHIMS="${SHIMS:-"clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-runtime-rs qemu-runtime-rs-coco-dev qemu-se-runtime-rs qemu-snp qemu-tdx stratovirt qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx"}"
|
||||||
IFS=' ' read -a shims <<< "$SHIMS"
|
IFS=' ' read -a shims <<< "$SHIMS"
|
||||||
DEFAULT_SHIM="${DEFAULT_SHIM:-"qemu"}"
|
DEFAULT_SHIM="${DEFAULT_SHIM:-"qemu"}"
|
||||||
default_shim="$DEFAULT_SHIM"
|
default_shim="$DEFAULT_SHIM"
|
||||||
@ -216,7 +216,7 @@ function is_containerd_capable_of_using_drop_in_files() {
|
|||||||
echo "false"
|
echo "false"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local version_major=$(kubectl get node $NODE_NAME -o jsonpath='{.status.nodeInfo.containerRuntimeVersion}' | grep -oE '[0-9]+\.[0-9]+' | cut -d'.' -f1)
|
local version_major=$(kubectl get node $NODE_NAME -o jsonpath='{.status.nodeInfo.containerRuntimeVersion}' | grep -oE '[0-9]+\.[0-9]+' | cut -d'.' -f1)
|
||||||
if [ $version_major -lt 2 ]; then
|
if [ $version_major -lt 2 ]; then
|
||||||
# Only containerd 2.0 does the merge of the plugins section from different snippets,
|
# Only containerd 2.0 does the merge of the plugins section from different snippets,
|
||||||
@ -261,7 +261,7 @@ function get_kata_containers_config_path() {
|
|||||||
# Map the runtime shim name to the appropriate configuration
|
# Map the runtime shim name to the appropriate configuration
|
||||||
# file directory.
|
# file directory.
|
||||||
case "$shim" in
|
case "$shim" in
|
||||||
cloud-hypervisor | dragonball | qemu-runtime-rs | qemu-se-runtime-rs) config_path="$rust_config_path" ;;
|
cloud-hypervisor | dragonball | qemu-runtime-rs | qemu-runtime-rs-coco-dev | qemu-se-runtime-rs) config_path="$rust_config_path" ;;
|
||||||
*) config_path="$golang_config_path" ;;
|
*) config_path="$golang_config_path" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -273,7 +273,7 @@ function get_kata_containers_runtime_path() {
|
|||||||
|
|
||||||
local runtime_path
|
local runtime_path
|
||||||
case "$shim" in
|
case "$shim" in
|
||||||
cloud-hypervisor | dragonball | qemu-runtime-rs | qemu-se-runtime-rs)
|
cloud-hypervisor | dragonball | qemu-runtime-rs | qemu-runtime-rs-coco-dev | qemu-se-runtime-rs)
|
||||||
runtime_path="${dest_dir}/runtime-rs/bin/containerd-shim-kata-v2"
|
runtime_path="${dest_dir}/runtime-rs/bin/containerd-shim-kata-v2"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
Loading…
Reference in New Issue
Block a user