CadolesKube
/
typhoon
mirror of https://github.com/puppetmaster/typhoon.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Dalton Hubble 2021-11-12 21:03:48 -08:00
parent 65083aca7d
commit 4fd43b39ad
11 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.md
View File

@ -11,6 +11,11 @@ Notable changes between versions.
* Allow use of Terraform provider `google` [v4.0+](https://github.com/hashicorp/terraform-provider-google/releases/tag/v4.0.0) * Allow use of Terraform provider `google` [v4.0+](https://github.com/hashicorp/terraform-provider-google/releases/tag/v4.0.0)
### Flatcar Linux
* Change Kubelet mounts for cgroups v2 ([#1064](https://github.com/poseidon/typhoon/pull/1064))
* Update cgroup driver from cgroupfs to systemd (Flatcar Linux changed default) ([#1064](https://github.com/poseidon/typhoon/pull/1064))
### Addons ### Addons
* Update Prometheus from v2.30.3 to [v2.31.1](https://github.com/prometheus/prometheus/releases/tag/v2.31.1) * Update Prometheus from v2.30.3 to [v2.31.1](https://github.com/prometheus/prometheus/releases/tag/v2.31.1)

4
aws/flatcar-linux/kubernetes/cl/controller.yaml
View File

@ -76,8 +76,7 @@ systemd:
-v /usr/lib/os-release:/etc/os-release:ro \ -v /usr/lib/os-release:/etc/os-release:ro \
-v /lib/modules:/lib/modules:ro \ -v /lib/modules:/lib/modules:ro \
-v /run:/run \ -v /run:/run \
-v /sys/fs/cgroup:/sys/fs/cgroup:ro \ -v /sys/fs/cgroup:/sys/fs/cgroup \
-v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \
-v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/calico:/var/lib/calico:ro \
-v /var/lib/docker:/var/lib/docker \ -v /var/lib/docker:/var/lib/docker \
-v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \
@ -88,6 +87,7 @@ systemd:
--authentication-token-webhook \ --authentication-token-webhook \
--authorization-mode=Webhook \ --authorization-mode=Webhook \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--cgroup-driver=systemd \
--client-ca-file=/etc/kubernetes/ca.crt \ --client-ca-file=/etc/kubernetes/ca.crt \
--cluster_dns=${cluster_dns_service_ip} \ --cluster_dns=${cluster_dns_service_ip} \
--cluster_domain=${cluster_domain_suffix} \ --cluster_domain=${cluster_domain_suffix} \

4
aws/flatcar-linux/kubernetes/workers/cl/worker.yaml
View File

@ -51,8 +51,7 @@ systemd:
-v /usr/lib/os-release:/etc/os-release:ro \ -v /usr/lib/os-release:/etc/os-release:ro \
-v /lib/modules:/lib/modules:ro \ -v /lib/modules:/lib/modules:ro \
-v /run:/run \ -v /run:/run \
-v /sys/fs/cgroup:/sys/fs/cgroup:ro \ -v /sys/fs/cgroup:/sys/fs/cgroup \
-v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \
-v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/calico:/var/lib/calico:ro \
-v /var/lib/docker:/var/lib/docker \ -v /var/lib/docker:/var/lib/docker \
-v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \
@ -63,6 +62,7 @@ systemd:
--authentication-token-webhook \ --authentication-token-webhook \
--authorization-mode=Webhook \ --authorization-mode=Webhook \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--cgroup-driver=systemd \
--client-ca-file=/etc/kubernetes/ca.crt \ --client-ca-file=/etc/kubernetes/ca.crt \
--cluster_dns=${cluster_dns_service_ip} \ --cluster_dns=${cluster_dns_service_ip} \
--cluster_domain=${cluster_domain_suffix} \ --cluster_domain=${cluster_domain_suffix} \

4
azure/flatcar-linux/kubernetes/cl/controller.yaml
View File

@ -73,8 +73,7 @@ systemd:
-v /usr/lib/os-release:/etc/os-release:ro \ -v /usr/lib/os-release:/etc/os-release:ro \
-v /lib/modules:/lib/modules:ro \ -v /lib/modules:/lib/modules:ro \
-v /run:/run \ -v /run:/run \
-v /sys/fs/cgroup:/sys/fs/cgroup:ro \ -v /sys/fs/cgroup:/sys/fs/cgroup \
-v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \
-v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/calico:/var/lib/calico:ro \
-v /var/lib/docker:/var/lib/docker \ -v /var/lib/docker:/var/lib/docker \
-v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \
@ -85,6 +84,7 @@ systemd:
--authentication-token-webhook \ --authentication-token-webhook \
--authorization-mode=Webhook \ --authorization-mode=Webhook \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--cgroup-driver=systemd \
--client-ca-file=/etc/kubernetes/ca.crt \ --client-ca-file=/etc/kubernetes/ca.crt \
--cluster_dns=${cluster_dns_service_ip} \ --cluster_dns=${cluster_dns_service_ip} \
--cluster_domain=${cluster_domain_suffix} \ --cluster_domain=${cluster_domain_suffix} \

4
azure/flatcar-linux/kubernetes/workers/cl/worker.yaml
View File

@ -48,8 +48,7 @@ systemd:
-v /usr/lib/os-release:/etc/os-release:ro \ -v /usr/lib/os-release:/etc/os-release:ro \
-v /lib/modules:/lib/modules:ro \ -v /lib/modules:/lib/modules:ro \
-v /run:/run \ -v /run:/run \
-v /sys/fs/cgroup:/sys/fs/cgroup:ro \ -v /sys/fs/cgroup:/sys/fs/cgroup \
-v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \
-v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/calico:/var/lib/calico:ro \
-v /var/lib/docker:/var/lib/docker \ -v /var/lib/docker:/var/lib/docker \
-v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \
@ -60,6 +59,7 @@ systemd:
--authentication-token-webhook \ --authentication-token-webhook \
--authorization-mode=Webhook \ --authorization-mode=Webhook \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--cgroup-driver=systemd \
--client-ca-file=/etc/kubernetes/ca.crt \ --client-ca-file=/etc/kubernetes/ca.crt \
--cluster_dns=${cluster_dns_service_ip} \ --cluster_dns=${cluster_dns_service_ip} \
--cluster_domain=${cluster_domain_suffix} \ --cluster_domain=${cluster_domain_suffix} \

4
bare-metal/flatcar-linux/kubernetes/cl/controller.yaml
View File

@ -81,8 +81,7 @@ systemd:
-v /usr/lib/os-release:/etc/os-release:ro \ -v /usr/lib/os-release:/etc/os-release:ro \
-v /lib/modules:/lib/modules:ro \ -v /lib/modules:/lib/modules:ro \
-v /run:/run \ -v /run:/run \
-v /sys/fs/cgroup:/sys/fs/cgroup:ro \ -v /sys/fs/cgroup:/sys/fs/cgroup \
-v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \
-v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/calico:/var/lib/calico:ro \
-v /var/lib/docker:/var/lib/docker \ -v /var/lib/docker:/var/lib/docker \
-v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \
@ -93,6 +92,7 @@ systemd:
--authentication-token-webhook \ --authentication-token-webhook \
--authorization-mode=Webhook \ --authorization-mode=Webhook \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--cgroup-driver=systemd \
--client-ca-file=/etc/kubernetes/ca.crt \ --client-ca-file=/etc/kubernetes/ca.crt \
--cluster_dns=${cluster_dns_service_ip} \ --cluster_dns=${cluster_dns_service_ip} \
--cluster_domain=${cluster_domain_suffix} \ --cluster_domain=${cluster_domain_suffix} \

4
bare-metal/flatcar-linux/kubernetes/cl/worker.yaml
View File

@ -56,8 +56,7 @@ systemd:
-v /usr/lib/os-release:/etc/os-release:ro \ -v /usr/lib/os-release:/etc/os-release:ro \
-v /lib/modules:/lib/modules:ro \ -v /lib/modules:/lib/modules:ro \
-v /run:/run \ -v /run:/run \
-v /sys/fs/cgroup:/sys/fs/cgroup:ro \ -v /sys/fs/cgroup:/sys/fs/cgroup \
-v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \
-v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/calico:/var/lib/calico:ro \
-v /var/lib/docker:/var/lib/docker \ -v /var/lib/docker:/var/lib/docker \
-v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \
@ -68,6 +67,7 @@ systemd:
--authentication-token-webhook \ --authentication-token-webhook \
--authorization-mode=Webhook \ --authorization-mode=Webhook \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--cgroup-driver=systemd \
--client-ca-file=/etc/kubernetes/ca.crt \ --client-ca-file=/etc/kubernetes/ca.crt \
--cluster_dns=${cluster_dns_service_ip} \ --cluster_dns=${cluster_dns_service_ip} \
--cluster_domain=${cluster_domain_suffix} \ --cluster_domain=${cluster_domain_suffix} \

4
digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml
View File

@ -84,8 +84,7 @@ systemd:
-v /usr/lib/os-release:/etc/os-release:ro \ -v /usr/lib/os-release:/etc/os-release:ro \
-v /lib/modules:/lib/modules:ro \ -v /lib/modules:/lib/modules:ro \
-v /run:/run \ -v /run:/run \
-v /sys/fs/cgroup:/sys/fs/cgroup:ro \ -v /sys/fs/cgroup:/sys/fs/cgroup \
-v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \
-v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/calico:/var/lib/calico:ro \
-v /var/lib/docker:/var/lib/docker \ -v /var/lib/docker:/var/lib/docker \
-v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \
@ -96,6 +95,7 @@ systemd:
--authentication-token-webhook \ --authentication-token-webhook \
--authorization-mode=Webhook \ --authorization-mode=Webhook \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--cgroup-driver=systemd \
--client-ca-file=/etc/kubernetes/ca.crt \ --client-ca-file=/etc/kubernetes/ca.crt \
--cluster_dns=${cluster_dns_service_ip} \ --cluster_dns=${cluster_dns_service_ip} \
--cluster_domain=${cluster_domain_suffix} \ --cluster_domain=${cluster_domain_suffix} \

4
digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml
View File

@ -59,8 +59,7 @@ systemd:
-v /usr/lib/os-release:/etc/os-release:ro \ -v /usr/lib/os-release:/etc/os-release:ro \
-v /lib/modules:/lib/modules:ro \ -v /lib/modules:/lib/modules:ro \
-v /run:/run \ -v /run:/run \
-v /sys/fs/cgroup:/sys/fs/cgroup:ro \ -v /sys/fs/cgroup:/sys/fs/cgroup \
-v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \
-v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/calico:/var/lib/calico:ro \
-v /var/lib/docker:/var/lib/docker \ -v /var/lib/docker:/var/lib/docker \
-v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \
@ -71,6 +70,7 @@ systemd:
--authentication-token-webhook \ --authentication-token-webhook \
--authorization-mode=Webhook \ --authorization-mode=Webhook \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--cgroup-driver=systemd \
--client-ca-file=/etc/kubernetes/ca.crt \ --client-ca-file=/etc/kubernetes/ca.crt \
--cluster_dns=${cluster_dns_service_ip} \ --cluster_dns=${cluster_dns_service_ip} \
--cluster_domain=${cluster_domain_suffix} \ --cluster_domain=${cluster_domain_suffix} \

4
google-cloud/flatcar-linux/kubernetes/cl/controller.yaml
View File

@ -73,8 +73,7 @@ systemd:
-v /usr/lib/os-release:/etc/os-release:ro \ -v /usr/lib/os-release:/etc/os-release:ro \
-v /lib/modules:/lib/modules:ro \ -v /lib/modules:/lib/modules:ro \
-v /run:/run \ -v /run:/run \
-v /sys/fs/cgroup:/sys/fs/cgroup:ro \ -v /sys/fs/cgroup:/sys/fs/cgroup \
-v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \
-v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/calico:/var/lib/calico:ro \
-v /var/lib/docker:/var/lib/docker \ -v /var/lib/docker:/var/lib/docker \
-v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \
@ -85,6 +84,7 @@ systemd:
--authentication-token-webhook \ --authentication-token-webhook \
--authorization-mode=Webhook \ --authorization-mode=Webhook \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--cgroup-driver=systemd \
--client-ca-file=/etc/kubernetes/ca.crt \ --client-ca-file=/etc/kubernetes/ca.crt \
--cluster_dns=${cluster_dns_service_ip} \ --cluster_dns=${cluster_dns_service_ip} \
--cluster_domain=${cluster_domain_suffix} \ --cluster_domain=${cluster_domain_suffix} \

4
google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml
View File

@ -48,8 +48,7 @@ systemd:
-v /usr/lib/os-release:/etc/os-release:ro \ -v /usr/lib/os-release:/etc/os-release:ro \
-v /lib/modules:/lib/modules:ro \ -v /lib/modules:/lib/modules:ro \
-v /run:/run \ -v /run:/run \
-v /sys/fs/cgroup:/sys/fs/cgroup:ro \ -v /sys/fs/cgroup:/sys/fs/cgroup \
-v /sys/fs/cgroup/systemd:/sys/fs/cgroup/systemd \
-v /var/lib/calico:/var/lib/calico:ro \ -v /var/lib/calico:/var/lib/calico:ro \
-v /var/lib/docker:/var/lib/docker \ -v /var/lib/docker:/var/lib/docker \
-v /var/lib/kubelet:/var/lib/kubelet:rshared \ -v /var/lib/kubelet:/var/lib/kubelet:rshared \
@ -60,6 +59,7 @@ systemd:
--authentication-token-webhook \ --authentication-token-webhook \
--authorization-mode=Webhook \ --authorization-mode=Webhook \
--bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \
--cgroup-driver=systemd \
--client-ca-file=/etc/kubernetes/ca.crt \ --client-ca-file=/etc/kubernetes/ca.crt \
--cluster_dns=${cluster_dns_service_ip} \ --cluster_dns=${cluster_dns_service_ip} \
--cluster_domain=${cluster_domain_suffix} \ --cluster_domain=${cluster_domain_suffix} \