From f86cb23ffbed592ab3d75eac9ebd524f86d92836 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsakalozos Date: Wed, 1 Dec 2021 15:52:18 +0200 Subject: [PATCH 1/2] Update the PATH containerd-shims has to find runc --- microk8s-resources/wrappers/run-containerd-with-args | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/microk8s-resources/wrappers/run-containerd-with-args b/microk8s-resources/wrappers/run-containerd-with-args index dcd5c2f972..1c67b866b0 100755 --- a/microk8s-resources/wrappers/run-containerd-with-args +++ b/microk8s-resources/wrappers/run-containerd-with-args @@ -7,6 +7,14 @@ if [ -d /sys/kernel/security/apparmor ] && [ "$(cat /proc/self/attr/current)" != exec aa-exec -p unconfined -- "$0" "$@" fi +# Why we put the /snap/microk8s/current in the path? +# containerd-shims need to call runc. They inherit their PATH from containerd. +# As the snap refreshes runc changes location, eg moves from +# /snap/microk8s/123/usr/bin/runc to /snap/microk8s/124/usr/runc. +# containerd-shims need to look for runc in /snap/microk8s/current/usr/bin/runc +SNAP_CURRENT="/snap/microk8s/current" +CURRENT_PATH="$SNAP_CURRENT/usr/sbin:$SNAP_CURRENT/usr/bin:$SNAP_CURRENT/sbin:$SNAP_CURRENT/bin" +export PATH="$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CURRENT_PATH:$PATH" export PATH="$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH" ARCH="$($SNAP/bin/uname -m)" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/lib:$SNAP/usr/lib:$SNAP/lib/$ARCH-linux-gnu:$SNAP/usr/lib/$ARCH-linux-gnu" From 1e30c585adef859bb2b1f4b3bd08df3c30a7aee4 Mon Sep 17 00:00:00 2001 From: Konstantinos Tsakalozos Date: Wed, 1 Dec 2021 16:58:36 +0200 Subject: [PATCH 2/2] Clean the PATH --- microk8s-resources/wrappers/run-containerd-with-args | 1 - 1 file changed, 1 deletion(-) diff --git a/microk8s-resources/wrappers/run-containerd-with-args b/microk8s-resources/wrappers/run-containerd-with-args index 1c67b866b0..a07c2a9150 100755 --- a/microk8s-resources/wrappers/run-containerd-with-args +++ b/microk8s-resources/wrappers/run-containerd-with-args @@ -15,7 +15,6 @@ fi SNAP_CURRENT="/snap/microk8s/current" CURRENT_PATH="$SNAP_CURRENT/usr/sbin:$SNAP_CURRENT/usr/bin:$SNAP_CURRENT/sbin:$SNAP_CURRENT/bin" export PATH="$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$CURRENT_PATH:$PATH" -export PATH="$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH" ARCH="$($SNAP/bin/uname -m)" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/lib:$SNAP/usr/lib:$SNAP/lib/$ARCH-linux-gnu:$SNAP/usr/lib/$ARCH-linux-gnu" export LD_LIBRARY_PATH=$SNAP_LIBRARY_PATH:$LD_LIBRARY_PATH