Update Fedora CoreOS Kubelet for cgroups v2

* Fedora CoreOS is beginning to switch from cgroups v1 to cgroups v2 by default, which changes the sysfs hierarchy * This will be needed when using a Fedora Coreos OS image that enables cgroups v2 (`next` stream as of this writing) Rel: coreos/fedora-coreos-tracker#292
aristanetworks · Apr 26, 2021 · 13a12fd · 13a12fd
1 parent 4bd852a
commit 13a12fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/fedora-coreos/kubernetes/fcc/controller.yaml b/fedora-coreos/kubernetes/fcc/controller.yaml
@@ -67,8 +67,7 @@ systemd:
           --volume /usr/lib/os-release:/etc/os-release:ro \
           --volume /lib/modules:/lib/modules:ro \
           --volume /run:/run \
-          --volume /sys/fs/cgroup:/sys/fs/cgroup:ro \
-          --volume /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \
+          --volume /sys/fs/cgroup:/sys/fs/cgroup \
           --volume /var/lib/calico:/var/lib/calico:ro \
           --volume /var/lib/docker:/var/lib/docker \
           --volume /var/lib/kubelet:/var/lib/kubelet:rshared,z \

diff --git a/fedora-coreos/kubernetes/fcc/worker.yaml b/fedora-coreos/kubernetes/fcc/worker.yaml
@@ -40,8 +40,7 @@ systemd:
           --volume /usr/lib/os-release:/etc/os-release:ro \
           --volume /lib/modules:/lib/modules:ro \
           --volume /run:/run \
-          --volume /sys/fs/cgroup:/sys/fs/cgroup:ro \
-          --volume /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \
+          --volume /sys/fs/cgroup:/sys/fs/cgroup \
           --volume /var/lib/calico:/var/lib/calico:ro \
           --volume /var/lib/docker:/var/lib/docker \
           --volume /var/lib/kubelet:/var/lib/kubelet:rshared,z \