Merge pull request #7195 from fidencio/topic/adapt-kata-deploy-stable-to-using-ubuntu

kata-deploy-stable: Switch to using the ubuntu based payload
This commit is contained in:
Fabiano Fidêncio 2023-10-20 14:42:04 +02:00 committed by GitHub
commit f6e20ac230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 68 deletions

View File

@ -13,33 +13,32 @@ spec:
labels: labels:
name: kubelet-kata-cleanup name: kubelet-kata-cleanup
spec: spec:
serviceAccountName: kata-label-node serviceAccountName: kata-deploy-sa
hostPID: true
nodeSelector: nodeSelector:
katacontainers.io/kata-runtime: cleanup katacontainers.io/kata-runtime: cleanup
containers: containers:
- name: kube-kata-cleanup - name: kube-kata-cleanup
image: quay.io/kata-containers/kata-deploy:stable image: quay.io/kata-containers/kata-deploy:stable
imagePullPolicy: Always imagePullPolicy: Always
command: [ "bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh reset" ] command: ["bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh reset"]
env: env:
- name: NODE_NAME - name: NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: DEBUG
value: "false"
- name: SHIMS
value: "clh dragonball fc qemu-nvidia-gpu qemu-sev qemu-snp qemu-tdx qemu"
- name: DEFAULT_SHIM
value: "qemu"
- name: CREATE_RUNTIMECLASSES
value: "false"
- name: CREATE_DEFAULT_RUNTIMECLASS
value: "false"
securityContext: securityContext:
privileged: false privileged: true
volumeMounts:
- name: dbus
mountPath: /var/run/dbus
- name: systemd
mountPath: /run/systemd
volumes:
- name: dbus
hostPath:
path: /var/run/dbus
- name: systemd
hostPath:
path: /run/systemd
updateStrategy: updateStrategy:
rollingUpdate: rollingUpdate:
maxUnavailable: 1 maxUnavailable: 1

View File

@ -13,7 +13,8 @@ spec:
labels: labels:
name: kata-deploy name: kata-deploy
spec: spec:
serviceAccountName: kata-label-node serviceAccountName: kata-deploy-sa
hostPID: true
containers: containers:
- name: kube-kata - name: kube-kata
image: quay.io/kata-containers/kata-deploy:stable image: quay.io/kata-containers/kata-deploy:stable
@ -22,14 +23,24 @@ spec:
preStop: preStop:
exec: exec:
command: ["bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh cleanup"] command: ["bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh cleanup"]
command: [ "bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh install" ] command: ["bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh install"]
env: env:
- name: NODE_NAME - name: NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: DEBUG
value: "false"
- name: SHIMS
value: "clh dragonball fc qemu qemu-nvidia-gpu qemu-sev qemu-snp qemu-tdx"
- name: DEFAULT_SHIM
value: "qemu"
- name: CREATE_RUNTIMECLASSES
value: "false"
- name: CREATE_DEFAULT_RUNTIMECLASS
value: "false"
securityContext: securityContext:
privileged: false privileged: true
volumeMounts: volumeMounts:
- name: crio-conf - name: crio-conf
mountPath: /etc/crio/ mountPath: /etc/crio/
@ -37,10 +48,6 @@ spec:
mountPath: /etc/containerd/ mountPath: /etc/containerd/
- name: kata-artifacts - name: kata-artifacts
mountPath: /opt/kata/ mountPath: /opt/kata/
- name: dbus
mountPath: /var/run/dbus
- name: systemd
mountPath: /run/systemd
- name: local-bin - name: local-bin
mountPath: /usr/local/bin/ mountPath: /usr/local/bin/
volumes: volumes:
@ -54,12 +61,6 @@ spec:
hostPath: hostPath:
path: /opt/kata/ path: /opt/kata/
type: DirectoryOrCreate type: DirectoryOrCreate
- name: dbus
hostPath:
path: /var/run/dbus
- name: systemd
hostPath:
path: /run/systemd
- name: local-bin - name: local-bin
hostPath: hostPath:
path: /usr/local/bin/ path: /usr/local/bin/