kata-deploy-stable: Adapt to what we're using in the stable branch

This is basically to make sure that folks trying to use the kata-deploy
script from the main branch, to deploy **stable** kata-deploy images, do
not have a hard time.

Fixes: #7194

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-06-28 15:02:56 +02:00
parent 79ed501a20
commit a93fdb014b
2 changed files with 68 additions and 68 deletions

View File

@ -6,40 +6,39 @@ metadata:
namespace: kube-system namespace: kube-system
spec: spec:
selector: selector:
matchLabels: matchLabels:
name: kubelet-kata-cleanup name: kubelet-kata-cleanup
template: template:
metadata: metadata:
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
securityContext: - name: DEBUG
privileged: false value: "false"
volumeMounts: - name: SHIMS
- name: dbus value: "clh dragonball fc qemu-nvidia-gpu qemu-sev qemu-snp qemu-tdx qemu"
mountPath: /var/run/dbus - name: DEFAULT_SHIM
- name: systemd value: "qemu"
mountPath: /run/systemd - name: CREATE_RUNTIMECLASSES
volumes: value: "false"
- name: dbus - name: CREATE_DEFAULT_RUNTIMECLASS
hostPath: value: "false"
path: /var/run/dbus securityContext:
- name: systemd privileged: true
hostPath:
path: /run/systemd
updateStrategy: updateStrategy:
rollingUpdate: rollingUpdate:
maxUnavailable: 1 maxUnavailable: 1

View File

@ -6,43 +6,50 @@ metadata:
namespace: kube-system namespace: kube-system
spec: spec:
selector: selector:
matchLabels: matchLabels:
name: kata-deploy name: kata-deploy
template: template:
metadata: metadata:
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
imagePullPolicy: Always imagePullPolicy: Always
lifecycle: lifecycle:
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
securityContext: - name: DEBUG
privileged: false value: "false"
volumeMounts: - name: SHIMS
- name: crio-conf value: "clh dragonball fc qemu qemu-nvidia-gpu qemu-sev qemu-snp qemu-tdx"
mountPath: /etc/crio/ - name: DEFAULT_SHIM
- name: containerd-conf value: "qemu"
mountPath: /etc/containerd/ - name: CREATE_RUNTIMECLASSES
- name: kata-artifacts value: "false"
mountPath: /opt/kata/ - name: CREATE_DEFAULT_RUNTIMECLASS
- name: dbus value: "false"
mountPath: /var/run/dbus securityContext:
- name: systemd privileged: true
mountPath: /run/systemd volumeMounts:
- name: local-bin - name: crio-conf
mountPath: /usr/local/bin/ mountPath: /etc/crio/
- name: containerd-conf
mountPath: /etc/containerd/
- name: kata-artifacts
mountPath: /opt/kata/
- name: local-bin
mountPath: /usr/local/bin/
volumes: volumes:
- name: crio-conf - name: crio-conf
hostPath: hostPath:
@ -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/