Add systemd delegate config if cpuset is missing (#4667)

* Add delegate config if cpuset is missing
canonical · Sep 10, 2024 · 19200c9 · 19200c9
1 parent 20e8104
commit 19200c9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/microk8s-resources/wrappers/run-kubelite-with-args b/microk8s-resources/wrappers/run-kubelite-with-args
@@ -133,6 +133,20 @@ then
   fi
 fi
 
+if ! is_strict &&
+   (systemctl show snap.microk8s.daemon-kubelite.service -p NRestarts | grep -qv "NRestarts=0") &&
+   (grep -qv cpuset /sys/fs/cgroup/cgroup.subtree_control) &&
+   [ ! -e /etc/systemd/system/snap.microk8s.daemon-kubelite.service.d/delegate.conf ]
+then
+  mkdir -p /etc/systemd/system/snap.microk8s.daemon-kubelite.service.d
+  tee /etc/systemd/system/snap.microk8s.daemon-kubelite.service.d/delegate.conf > /dev/null <<EOF
+[Service]
+Delegate=yes
+EOF
+  systemctl daemon-reload || true
+  snap restart microk8s || true
+fi
+
 # wait for containerd socket
 if grep -e "--address " $SNAP_DATA/args/containerd &> /dev/null
 then

diff --git a/snap/hooks/remove b/snap/hooks/remove
@@ -45,6 +45,8 @@ then
   # remove custom sysctl parameters
   rm -f /etc/sysctl.d/10-microk8s.conf
   sysctl --system
+
+  rm -rf /etc/systemd/system/snap.microk8s.daemon-kubelite.service.d || true
 fi
 
 # Clean the container location so we do not snapshot it.