From fd95bda51d58d1ba20954ee88a8ee2cdc9a630a4 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Tue, 14 Dec 2021 19:37:43 -0800 Subject: [PATCH] Switch Flatcar Linux to using containerd CRI * Use containerd as the Kubernetes Container Runtime --- 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 | 2 ++ 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, 29 insertions(+), 9 deletions(-) diff --git a/aws/flatcar-linux/kubernetes/cl/controller.yaml b/aws/flatcar-linux/kubernetes/cl/controller.yaml index 3e03e1b90..313ea20de 100644 --- a/aws/flatcar-linux/kubernetes/cl/controller.yaml +++ b/aws/flatcar-linux/kubernetes/cl/controller.yaml @@ -78,7 +78,7 @@ systemd: -v /run:/run \ -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/containerd:/var/lib/containerd \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/log:/var/log \ -v /opt/cni/bin:/opt/cni/bin \ @@ -88,6 +88,8 @@ systemd: --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --cgroup-driver=systemd \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///run/containerd/containerd.sock \ --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 30dada947..b3ea9b698 100644 --- a/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -53,7 +53,7 @@ systemd: -v /run:/run \ -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/containerd:/var/lib/containerd \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/log:/var/log \ -v /opt/cni/bin:/opt/cni/bin \ @@ -63,6 +63,8 @@ systemd: --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --cgroup-driver=systemd \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///run/containerd/containerd.sock \ --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 5f7f8fcc7..c87a4fcab 100644 --- a/azure/flatcar-linux/kubernetes/cl/controller.yaml +++ b/azure/flatcar-linux/kubernetes/cl/controller.yaml @@ -75,7 +75,7 @@ systemd: -v /run:/run \ -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/containerd:/var/lib/containerd \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/log:/var/log \ -v /opt/cni/bin:/opt/cni/bin \ @@ -85,6 +85,8 @@ systemd: --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --cgroup-driver=systemd \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///run/containerd/containerd.sock \ --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 934f0ae34..e14262a91 100644 --- a/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -50,7 +50,7 @@ systemd: -v /run:/run \ -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/containerd:/var/lib/containerd \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/log:/var/log \ -v /opt/cni/bin:/opt/cni/bin \ @@ -60,6 +60,8 @@ systemd: --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --cgroup-driver=systemd \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///run/containerd/containerd.sock \ --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 dffe158cf..457ade2ad 100644 --- a/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml +++ b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml @@ -83,7 +83,7 @@ systemd: -v /run:/run \ -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/containerd:/var/lib/containerd \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/log:/var/log \ -v /opt/cni/bin:/opt/cni/bin \ @@ -93,6 +93,8 @@ systemd: --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --cgroup-driver=systemd \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///run/containerd/containerd.sock \ --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 067740c36..e4547a9f9 100644 --- a/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml +++ b/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml @@ -58,7 +58,7 @@ systemd: -v /run:/run \ -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/containerd:/var/lib/containerd \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/log:/var/log \ -v /opt/cni/bin:/opt/cni/bin \ @@ -68,6 +68,8 @@ systemd: --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --cgroup-driver=systemd \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///run/containerd/containerd.sock \ --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 ef56f1ec0..ac10eef1c 100644 --- a/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml +++ b/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml @@ -96,6 +96,8 @@ systemd: --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --cgroup-driver=systemd \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///run/containerd/containerd.sock \ --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 e87efd5ac..9d622bde7 100644 --- a/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml +++ b/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml @@ -61,7 +61,7 @@ systemd: -v /run:/run \ -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/containerd:/var/lib/containerd \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/log:/var/log \ -v /opt/cni/bin:/opt/cni/bin \ @@ -71,6 +71,8 @@ systemd: --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --cgroup-driver=systemd \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///run/containerd/containerd.sock \ --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 b10136a00..6e136cc67 100644 --- a/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml +++ b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml @@ -75,7 +75,7 @@ systemd: -v /run:/run \ -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/containerd:/var/lib/containerd \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/log:/var/log \ -v /opt/cni/bin:/opt/cni/bin \ @@ -85,6 +85,8 @@ systemd: --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --cgroup-driver=systemd \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///run/containerd/containerd.sock \ --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 934f0ae34..e14262a91 100644 --- a/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -50,7 +50,7 @@ systemd: -v /run:/run \ -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/containerd:/var/lib/containerd \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/log:/var/log \ -v /opt/cni/bin:/opt/cni/bin \ @@ -60,6 +60,8 @@ systemd: --authorization-mode=Webhook \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --cgroup-driver=systemd \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///run/containerd/containerd.sock \ --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \