mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-04-28 11:44:38 +00:00
ci.ocp: Add a workaround to optionally enable skip_mount_home
the latest upstream kata-containers requires the skip_mount_home to be enabled, which is default on OCP 4.14+ but disabled on OCP 4.13-. Let's use a "WORKAROUND_9206_CRIO" (called by kata-containers GH issue) variable to allow users to enable this treatement when needed. Related to: #9206 Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
This commit is contained in:
parent
739d627b4e
commit
6525c94065
@ -0,0 +1,28 @@
|
|||||||
|
---
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: DaemonSet
|
||||||
|
metadata:
|
||||||
|
name: workaround-9206-crio-ds
|
||||||
|
spec:
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: workaround-9206-crio-ds
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: workaround-9206-crio-ds
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: workaround-9206-crio-ds
|
||||||
|
image: alpine
|
||||||
|
volumeMounts:
|
||||||
|
- name: host-dir
|
||||||
|
mountPath: /tmp/config
|
||||||
|
securityContext:
|
||||||
|
runAsUser: 0
|
||||||
|
privileged: true
|
||||||
|
command: ["/bin/sh", "-c", "while [ ! -f '/tmp/config/10-workaround-9206-crio' ]; do sleep 1; done; echo 'Config file present'; sleep infinity"]
|
||||||
|
volumes:
|
||||||
|
- name: host-dir
|
||||||
|
hostPath:
|
||||||
|
path: /etc/crio/crio.conf.d/
|
@ -0,0 +1,18 @@
|
|||||||
|
---
|
||||||
|
apiVersion: machineconfiguration.openshift.io/v1
|
||||||
|
kind: MachineConfig
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
machineconfiguration.openshift.io/role: worker
|
||||||
|
name: 10-workaround-9206-crio
|
||||||
|
spec:
|
||||||
|
config:
|
||||||
|
ignition:
|
||||||
|
version: 2.2.0
|
||||||
|
storage:
|
||||||
|
files:
|
||||||
|
- contents:
|
||||||
|
source: data:text/plain;charset=utf-8;base64,W2NyaW9dCnN0b3JhZ2Vfb3B0aW9uID0gWwoJIm92ZXJsYXkuc2tpcF9tb3VudF9ob21lPXRydWUiLApdCg==
|
||||||
|
filesystem: root
|
||||||
|
mode: 0644
|
||||||
|
path: /etc/crio/crio.conf.d/10-workaround-9206-crio
|
@ -27,6 +27,10 @@ KATA_WITH_SYSTEM_QEMU=${KATA_WITH_SYSTEM_QEMU:-no}
|
|||||||
#
|
#
|
||||||
KATA_WITH_HOST_KERNEL=${KATA_WITH_HOST_KERNEL:-no}
|
KATA_WITH_HOST_KERNEL=${KATA_WITH_HOST_KERNEL:-no}
|
||||||
|
|
||||||
|
# Enable workaround for OCP 4.13 https://github.com/kata-containers/kata-containers/pull/9206
|
||||||
|
#
|
||||||
|
WORKAROUND_9206_CRIO=${WORKAROUND_9206_CRIO:-no}
|
||||||
|
|
||||||
# Leverage kata-deploy to install Kata Containers in the cluster.
|
# Leverage kata-deploy to install Kata Containers in the cluster.
|
||||||
#
|
#
|
||||||
apply_kata_deploy() {
|
apply_kata_deploy() {
|
||||||
@ -224,6 +228,13 @@ if [ ${SELINUX_PERMISSIVE} == "yes" ]; then
|
|||||||
wait_for_reboot
|
wait_for_reboot
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ "$WORKAROUND_9206_CRIO" == "yes" ]]; then
|
||||||
|
info "Applying workaround to enable skip_mount_home in crio on OCP 4.13"
|
||||||
|
oc apply -f "${deployments_dir}/workaround-9206-crio.yaml"
|
||||||
|
oc apply -f "${deployments_dir}/workaround-9206-crio-ds.yaml"
|
||||||
|
wait_for_app_pods_message workaround-9206-crio-ds "$num_nodes" "Config file present" 1200 || echo "Failed to apply the workaround, proceeding anyway..."
|
||||||
|
fi
|
||||||
|
|
||||||
# FIXME: Remove when https://github.com/kata-containers/kata-containers/pull/8417 is resolved
|
# FIXME: Remove when https://github.com/kata-containers/kata-containers/pull/8417 is resolved
|
||||||
# Selinux context is currently not handled by kata-deploy
|
# Selinux context is currently not handled by kata-deploy
|
||||||
oc apply -f ${deployments_dir}/relabel_selinux.yaml
|
oc apply -f ${deployments_dir}/relabel_selinux.yaml
|
||||||
|
Loading…
Reference in New Issue
Block a user