Don't specify cgroup driver... cgroupfs is the default.

If someone wants to use another then a dropin with KUBELET_EXTRA_ARGS will work fine!
errm · Apr 10, 2019 · d0ae081 · d0ae081
1 parent a70e65a
commit d0ae081
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/system/system_test.go b/pkg/system/system_test.go
@@ -273,7 +273,7 @@ WantedBy=multi-user.target
 	fs.Check(t, "/etc/systemd/system/kubelet.service", expected, 0640)
 
 	expected = `[Service]
-Environment="KUBELET_CONTAINER_RUNTIME_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --cgroup-driver=systemd"
+Environment="KUBELET_CONTAINER_RUNTIME_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
 `
 	fs.Check(t, "/etc/systemd/system/kubelet.service.d/40-container-runtime.conf", expected, 0640)
 }

diff --git a/pkg/system/templates/etc/systemd/system/kubelet.service.d/40-container-runtime.conf b/pkg/system/templates/etc/systemd/system/kubelet.service.d/40-container-runtime.conf
@@ -1,6 +1,6 @@
 [Service]
 {{- if eq .Node.ContainerRuntime "containerd" }}
-Environment="KUBELET_CONTAINER_RUNTIME_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock --cgroup-driver=systemd"
+Environment="KUBELET_CONTAINER_RUNTIME_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
 {{ else if eq .Node.ContainerRuntime "docker" }}
 Environment="KUBELET_CONTAINER_RUNTIME_ARGS=--container-runtime=docker"
 {{ end -}}