From 5f87eb3ec934318d6850ab33c2f951d0aa3906a7 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 17 Apr 2021 11:45:52 -0700 Subject: [PATCH] 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: https://github.com/coreos/fedora-coreos-tracker/issues/292 --- CHANGES.md | 4 ++++ aws/fedora-coreos/kubernetes/fcc/controller.yaml | 3 +-- aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml | 3 +-- azure/fedora-coreos/kubernetes/fcc/controller.yaml | 3 +-- azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml | 3 +-- bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml | 3 +-- bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml | 3 +-- digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml | 3 +-- digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml | 3 +-- google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml | 3 +-- google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml | 3 +-- 11 files changed, 14 insertions(+), 20 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8a9d7e6ee..d2a2cf141 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -20,6 +20,10 @@ Notable changes between versions. * Reduce the default `disk_size` from 40GB to 30GB ([#983](https://github.com/poseidon/typhoon/pull/983)) +### Fedora CoreOS + +* Update Kubelet mounts for cgroups v2 ([#978](https://github.com/poseidon/typhoon/pull/978)) + ### Addons * Update kube-state-metrics from v2.0.0-rc.1 to [v2.0.0](https://github.com/kubernetes/kube-state-metrics/releases/tag/v2.0.0) diff --git a/aws/fedora-coreos/kubernetes/fcc/controller.yaml b/aws/fedora-coreos/kubernetes/fcc/controller.yaml index ddcd71f24..a9ae3d2fc 100644 --- a/aws/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/aws/fedora-coreos/kubernetes/fcc/controller.yaml @@ -72,8 +72,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/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml index cd9d61edd..22fa59919 100644 --- a/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -45,8 +45,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/azure/fedora-coreos/kubernetes/fcc/controller.yaml b/azure/fedora-coreos/kubernetes/fcc/controller.yaml index 6ccd51d2d..1b4f60d16 100644 --- a/azure/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/azure/fedora-coreos/kubernetes/fcc/controller.yaml @@ -68,8 +68,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/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml index 7460c61b8..db33daa3a 100644 --- a/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -41,8 +41,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/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml index 4920ea74e..24c731988 100644 --- a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/bare-metal/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/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml b/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml index b47d7a437..14f7515e2 100644 --- a/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml +++ b/bare-metal/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 \ diff --git a/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml b/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml index 4f94bc563..0cab08a4f 100644 --- a/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml @@ -70,8 +70,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/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml b/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml index c2843d71e..a7486c4b5 100644 --- a/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml +++ b/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml @@ -44,8 +44,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/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml index 68be821f7..9b20754ec 100644 --- a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml @@ -68,8 +68,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/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml index b8d8f1ecc..e46c66bb6 100644 --- a/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -41,8 +41,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 \