From 557b9c364525423c466a8ca9ac26b399a0347ecf Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Fri, 12 Nov 2021 21:03:48 -0800 Subject: [PATCH] Fix Flatcar Linux docker driver and add cgroups v2 * Remove `/sys/fs/cgroup/systemd` mount since Flatcar Linux uses cgroups v2 * Flatcar Linux's `docker` switched from the `cgroupfs` to `systemd` driver without notice --- aws/flatcar-linux/kubernetes/cl/controller.yaml | 4 ++-- aws/flatcar-linux/kubernetes/workers/cl/worker.yaml | 4 ++-- azure/flatcar-linux/kubernetes/cl/controller.yaml | 4 ++-- azure/flatcar-linux/kubernetes/workers/cl/worker.yaml | 4 ++-- bare-metal/flatcar-linux/kubernetes/cl/controller.yaml | 4 ++-- bare-metal/flatcar-linux/kubernetes/cl/worker.yaml | 4 ++-- digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml | 4 ++-- digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml | 4 ++-- google-cloud/flatcar-linux/kubernetes/cl/controller.yaml | 4 ++-- google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/aws/flatcar-linux/kubernetes/cl/controller.yaml b/aws/flatcar-linux/kubernetes/cl/controller.yaml index a96e0cc54..3ed8b0aa3 100644 --- a/aws/flatcar-linux/kubernetes/cl/controller.yaml +++ b/aws/flatcar-linux/kubernetes/cl/controller.yaml @@ -76,8 +76,7 @@ systemd: -v /usr/lib/os-release:/etc/os-release:ro \ -v /lib/modules:/lib/modules:ro \ -v /run:/run \ - -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ - -v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \ + -v /sys/fs/cgroup:/sys/fs/cgroup \ -v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/docker:/var/lib/docker \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ @@ -88,6 +87,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ + --cgroup-driver=systemd \ --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ diff --git a/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml b/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml index 32fce2bb0..68e6bdd8a 100644 --- a/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -51,8 +51,7 @@ systemd: -v /usr/lib/os-release:/etc/os-release:ro \ -v /lib/modules:/lib/modules:ro \ -v /run:/run \ - -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ - -v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \ + -v /sys/fs/cgroup:/sys/fs/cgroup \ -v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/docker:/var/lib/docker \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ @@ -63,6 +62,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ + --cgroup-driver=systemd \ --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ diff --git a/azure/flatcar-linux/kubernetes/cl/controller.yaml b/azure/flatcar-linux/kubernetes/cl/controller.yaml index d3a38cbc6..b2fb13eb0 100644 --- a/azure/flatcar-linux/kubernetes/cl/controller.yaml +++ b/azure/flatcar-linux/kubernetes/cl/controller.yaml @@ -73,8 +73,7 @@ systemd: -v /usr/lib/os-release:/etc/os-release:ro \ -v /lib/modules:/lib/modules:ro \ -v /run:/run \ - -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ - -v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \ + -v /sys/fs/cgroup:/sys/fs/cgroup \ -v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/docker:/var/lib/docker \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ @@ -85,6 +84,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ + --cgroup-driver=systemd \ --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ diff --git a/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml b/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml index 015fcd161..e1f7e10b1 100644 --- a/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -48,8 +48,7 @@ systemd: -v /usr/lib/os-release:/etc/os-release:ro \ -v /lib/modules:/lib/modules:ro \ -v /run:/run \ - -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ - -v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \ + -v /sys/fs/cgroup:/sys/fs/cgroup \ -v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/docker:/var/lib/docker \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ @@ -60,6 +59,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ + --cgroup-driver=systemd \ --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ diff --git a/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml index f10f2a95d..5acd92fd3 100644 --- a/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml +++ b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml @@ -81,8 +81,7 @@ systemd: -v /usr/lib/os-release:/etc/os-release:ro \ -v /lib/modules:/lib/modules:ro \ -v /run:/run \ - -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ - -v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \ + -v /sys/fs/cgroup:/sys/fs/cgroup \ -v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/docker:/var/lib/docker \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ @@ -93,6 +92,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ + --cgroup-driver=systemd \ --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ diff --git a/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml b/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml index b8a1dcd51..d74d0efb4 100644 --- a/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml +++ b/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml @@ -56,8 +56,7 @@ systemd: -v /usr/lib/os-release:/etc/os-release:ro \ -v /lib/modules:/lib/modules:ro \ -v /run:/run \ - -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ - -v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \ + -v /sys/fs/cgroup:/sys/fs/cgroup \ -v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/docker:/var/lib/docker \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ @@ -68,6 +67,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ + --cgroup-driver=systemd \ --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ diff --git a/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml b/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml index 2320ffe00..4df32d18d 100644 --- a/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml +++ b/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml @@ -84,8 +84,7 @@ systemd: -v /usr/lib/os-release:/etc/os-release:ro \ -v /lib/modules:/lib/modules:ro \ -v /run:/run \ - -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ - -v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \ + -v /sys/fs/cgroup:/sys/fs/cgroup \ -v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/docker:/var/lib/docker \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ @@ -96,6 +95,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ + --cgroup-driver=systemd \ --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ diff --git a/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml b/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml index 4e5f1a4cf..4766edb92 100644 --- a/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml +++ b/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml @@ -59,8 +59,7 @@ systemd: -v /usr/lib/os-release:/etc/os-release:ro \ -v /lib/modules:/lib/modules:ro \ -v /run:/run \ - -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ - -v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \ + -v /sys/fs/cgroup:/sys/fs/cgroup \ -v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/docker:/var/lib/docker \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ @@ -71,6 +70,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ + --cgroup-driver=systemd \ --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ diff --git a/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml index 9371c730a..f1a2d43ce 100644 --- a/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml +++ b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml @@ -73,8 +73,7 @@ systemd: -v /usr/lib/os-release:/etc/os-release:ro \ -v /lib/modules:/lib/modules:ro \ -v /run:/run \ - -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ - -v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \ + -v /sys/fs/cgroup:/sys/fs/cgroup \ -v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/docker:/var/lib/docker \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ @@ -85,6 +84,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ + --cgroup-driver=systemd \ --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ diff --git a/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml b/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml index 015fcd161..e1f7e10b1 100644 --- a/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -48,8 +48,7 @@ systemd: -v /usr/lib/os-release:/etc/os-release:ro \ -v /lib/modules:/lib/modules:ro \ -v /run:/run \ - -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ - -v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \ + -v /sys/fs/cgroup:/sys/fs/cgroup \ -v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/docker:/var/lib/docker \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ @@ -60,6 +59,7 @@ systemd: --authentication-token-webhook \ --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ + --cgroup-driver=systemd \ --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \