fix(t8s-cluster/management-cluster): adjust containerd config to work…

… with cgroupv2 (#636)

charts/t8s-cluster/templates/management-cluster/clusterClass/kubeadmConfigTemplate/_helpers.tpl

@@ -1,28 +1,29 @@
 {{- define "t8s-cluster.clusterClass.containerdConfig.plugins" -}}
+  {{- $_ := set . "Values" .context.Values -}}
 [plugins]
   [plugins."io.containerd.grpc.v1.cri"]
-  {{- $_ := set . "Values" .context.Values -}}
-  {{- if .Values.containerRegistryMirror.mirrorEndpoint }}
+    {{- if .Values.containerRegistryMirror.mirrorEndpoint }}
     [plugins."io.containerd.grpc.v1.cri".registry]
       config_path = "/etc/containerd/registries.conf.d"
-  {{- end }}
-  {{- if .gpu }}
+    {{- end }}
     [plugins."io.containerd.grpc.v1.cri".containerd]
       default_runtime_name = "runc"
       [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
         # TODO: this is only needed because of https://github.com/containerd/containerd/issues/5837
         [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
           runtime_type = "io.containerd.runc.v2"
+          # TODO: this is only needed because of https://github.com/containerd/containerd/issues/5837
           [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
             SystemdCgroup = true
+        {{- if .gpu }}
         [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia]
           privileged_without_host_devices = false
           runtime_engine = ""
           runtime_root = ""
           runtime_type = "io.containerd.runc.v2"
           [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia.options]
             BinaryName = "/usr/local/nvidia/toolkit/nvidia-container-runtime"
-  {{- end -}}
+        {{- end -}}
 {{- end -}}
 
 {{- define "t8s-cluster.clusterClass.containerdConfig.containerRegistryMirrorConfigs" -}}