ws-daemon: Align cgroupv2 decisions with others

Author: utam0k

components/ws-daemon/pkg/daemon/daemon.go

@@ -17,6 +17,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
+	"github.com/gitpod-io/gitpod/common-go/cgroups"
 	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/ws-daemon/api"
 	"github.com/gitpod-io/gitpod/ws-daemon/pkg/container"
@@ -58,7 +59,12 @@ func NewDaemon(config Config, reg prometheus.Registerer) (*Daemon, error) {
 		cgCustomizer,
 		markUnmountFallback,
 	}
-	if _, err := os.Stat("/sys/fs/cgroup/cgroup.controllers"); os.IsNotExist(err) {
+
+	unified, err := cgroups.IsUnifiedCgroupSetup()
+	if err != nil {
+		return nil, xerrors.Errorf("could not determine cgroup setup: %w", err)
+	}
+	if unified {
 		listener = append(listener, CacheReclaim(config.Resources.CGroupBasePath))
 	}