Skip to content

node-installer: fixes for containerd 2 #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 28, 2025
Merged

node-installer: fixes for containerd 2 #301

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba26c4b
node-installer: detect containerd config version instead of $IS_K3S
shirok1 Mar 27, 2025
5bfc960
node-installer: K3S & RKE2 can detect spin shim, no need to configure
shirok1 Mar 27, 2025
e513c36
node-installer: fix K3S by linking shim to PATH
shirok1 Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions node-installer/script/installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,8 @@ if pgrep -f snap/microk8s > /dev/null; then
fi
elif ls $NODE_ROOT/var/lib/rancher/rke2/agent/etc/containerd/config.toml > /dev/null 2>&1 ; then
IS_RKE2_AGENT=true
cp $NODE_ROOT/var/lib/rancher/rke2/agent/etc/containerd/config.toml $NODE_ROOT/var/lib/rancher/rke2/agent/etc/containerd/config.toml.tmpl
CONTAINERD_CONF=/var/lib/rancher/rke2/agent/etc/containerd/config.toml.tmpl
elif ls $NODE_ROOT/var/lib/rancher/k3s/agent/etc/containerd/config.toml > /dev/null 2>&1 ; then
IS_K3S=true
cp $NODE_ROOT/var/lib/rancher/k3s/agent/etc/containerd/config.toml $NODE_ROOT/var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl
CONTAINERD_CONF=/var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl
elif pgrep -f /var/lib/k0s/bin/kubelet > /dev/null; then
IS_K0S_WORKER=true
CONTAINERD_CONF=/etc/k0s/containerd.d/spin.toml
Expand Down Expand Up @@ -67,9 +63,16 @@ mkdir -p $NODE_ROOT$KWASM_DIR/bin/

cp /assets/containerd-shim-spin-v2 $NODE_ROOT$KWASM_DIR/bin/

if ! grep -q spin $NODE_ROOT$CONTAINERD_CONF; then
# A bug in containerd makes BinaryName not work with shim not in PATH, so this statically links the kwasm installation to path
# https://github.com/containerd/containerd/issues/11480
mkdir -p $NODE_ROOT/usr/local/bin/
ln -s $KWASM_DIR/bin/containerd-shim-spin-v2 $NODE_ROOT/usr/local/bin/containerd-shim-spin

# K3S and RKE2 can detect spin shim themselves, no need to configure
# https://github.com/k3s-io/k3s/pull/9519
if ! ( $IS_K3S || $IS_RKE2_AGENT ) && ! grep -q spin $NODE_ROOT$CONTAINERD_CONF; then
echo "Adding Spin runtime to containerd"
if $IS_K3S; then
if grep -q "version = 3" $NODE_ROOT$CONTAINERD_CONF; then
echo '
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes."spin"]
runtime_type = "'$KWASM_DIR'/bin/containerd-shim-spin-v2"
Expand All @@ -88,7 +91,7 @@ fi
# configure SystemdCgroup
if ! grep -q 'runtimes.spin.options' $NODE_ROOT$CONTAINERD_CONF && [ "$SYSTEMD_CGROUP" = "true" ]; then
echo "Setting SystemdCgroup to $SYSTEMD_CGROUP in Spin containerd configuration"
if $IS_K3S; then
if grep -q "version = 3" $NODE_ROOT$CONTAINERD_CONF; then
echo '
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.spin.options]
SystemdCgroup = '$SYSTEMD_CGROUP'
Expand Down
Loading