From f0a60163e95d7e152e11eea7763d578fbc270e0e Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Thu, 4 May 2023 15:37:52 +0100 Subject: [PATCH] runtime-payload: Update to reflect new base - The upstream runtime-payload is based on ubuntu now, so we need to update systemd and dbus paths to be compatible - See https://github.com/confidential-containers/operator/pull/180 Fixes: #869 Signed-off-by: stevenhorsman --- install/yamls/ccruntime-peer-pods.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/install/yamls/ccruntime-peer-pods.yaml b/install/yamls/ccruntime-peer-pods.yaml index 13e737caf..8775a2167 100644 --- a/install/yamls/ccruntime-peer-pods.yaml +++ b/install/yamls/ccruntime-peer-pods.yaml @@ -23,9 +23,9 @@ spec: name: containerd-conf - mountPath: /opt/confidential-containers/ name: kata-artifacts - - mountPath: /var/run/dbus + - mountPath: /var/run/dbus/system_bus_socket name: dbus - - mountPath: /run/systemd + - mountPath: /run/systemd/system name: systemd - mountPath: /usr/local/bin/ name: local-bin @@ -43,11 +43,11 @@ spec: type: DirectoryOrCreate name: kata-artifacts - hostPath: - path: /var/run/dbus + path: /var/run/dbus/system_bus_socket type: "" name: dbus - hostPath: - path: /run/systemd + path: /run/systemd/system type: "" name: systemd - hostPath: @@ -64,9 +64,9 @@ spec: name: confidential-containers-artifacts - mountPath: /etc/systemd/system/ name: etc-systemd-system - - mountPath: /var/run/dbus + - mountPath: /var/run/dbus/system_bus_socket name: dbus - - mountPath: /run/systemd + - mountPath: /run/systemd/system name: systemd volumes: - hostPath: @@ -78,11 +78,11 @@ spec: type: "" name: etc-systemd-system - hostPath: - path: /var/run/dbus + path: /var/run/dbus/system_bus_socket type: "" name: dbus - hostPath: - path: /run/systemd + path: /run/systemd/system type: "" name: systemd preInstall: @@ -92,9 +92,9 @@ spec: name: confidential-containers-artifacts - mountPath: /etc/systemd/system/ name: etc-systemd-system - - mountPath: /var/run/dbus + - mountPath: /var/run/dbus/system_bus_socket name: dbus - - mountPath: /run/systemd + - mountPath: /run/systemd/system name: systemd - mountPath: /run/hyp.env name: hyp-env @@ -108,11 +108,11 @@ spec: type: "" name: etc-systemd-system - hostPath: - path: /var/run/dbus + path: /var/run/dbus/system_bus_socket type: "" name: dbus - hostPath: - path: /run/systemd + path: /run/systemd/system type: "" name: systemd - hostPath: