Merge pull request #426 from CARV-ICS-FORTH/cadvisor

fix issues of cadvisor when used in conjuction with rootless engines
CARV-ICS-FORTH · Aug 18, 2023 · f80a214 · f80a214
2 parents e6239a0 + 87a6add
commit f80a214
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## Changes Since Last Release
 
 ### Changed defaults / behaviours
-- ...
+- Prevent cadvisor from failing when cgroup is not mounted.
 
 ### New Features & Functionality
 - ...

diff --git a/charts/system/templates/telemetry/cadvisor/cadvisor.yml b/charts/system/templates/telemetry/cadvisor/cadvisor.yml
@@ -52,8 +52,8 @@ spec:
               # to find out the reason. Just exit with success and let experiment to continue.
               [ -d "/proc/${mainPID}" ] || { echo "/proc/${mainPID} does not exists.";  exit 0; }
 
-              # Unmount the local cgroup
-              umount /sys/fs/cgroup
+              # Unmount the local cgroup (return successfully if cgroup is not mounted)
+              umount /sys/fs/cgroup || return 0
 
               # Tap into the cgroup of the main container, and mount it locally
               nsenter -t ${mainPID} -C -- mount -t cgroup2 none /sys/fs/cgroup