Add OCP console hack

If TERM=xterm is specified, connect to the vm console instead of the container. Signed-off-by: Roman Mohr <[email protected]>
QEDQCD · Apr 3, 2018 · d0aef06 · d0aef06
1 parent 8f3bbe6
commit d0aef06
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/cmd/virt-launcher/Dockerfile b/cmd/virt-launcher/Dockerfile
@@ -30,6 +30,7 @@ RUN dnf -y install \
   test $(id -u qemu) = 107 # make sure that the qemu user really is 107
 
 COPY sock-connector /sock-connector
+COPY sh.sh /sh.sh
 COPY virt-launcher /virt-launcher
 
 COPY kubevirt-sudo /etc/sudoers.d/kubevirt

diff --git a/cmd/virt-launcher/entrypoint.sh b/cmd/virt-launcher/entrypoint.sh
@@ -10,6 +10,12 @@ fi
 chown :qemu /dev/kvm
 chmod 660 /dev/kvm
 
+
+# Cockpit/OCP hack to all shoing the vm terminal
+mv /usr/bin/sh /usr/bin/sh.orig
+mv /sh.sh /usr/bin/sh
+chmod +x /usr/bin/sh
+
 ./virt-launcher $@
 rc=$?
 

diff --git a/cmd/virt-launcher/sh.sh b/cmd/virt-launcher/sh.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/sh.orig
+
+if [ ${TERM} = "xterm" ] ; then
+  namespace="$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)"
+  name="$(ls /var/run/kubevirt-private/${namespace}/)"
+  /usr/bin/sh.orig -c "/sock-connector /var/run/kubevirt-private/${namespace}/${name}/virt-serial0"
+else
+  /usr/bin/sh.orig "$@"
+fi