From feed29d7eddee0c5b9c5708c32fa7aa492eced2d Mon Sep 17 00:00:00 2001 From: Feilong Wang Date: Fri, 3 Aug 2018 09:44:21 +1200 Subject: [PATCH] Using cgroupfs as default cgroup-driver This is a part of fixes for k8s v1.11.1 recently we're doing. When testing the k8s v1.11.1, we just found some small but annoying issues: 1. cgroup-driver with systemd not working well with Fedora Atomic, so we're going to use cgroupfs as the default cgroup-driver. 2. The $ char need to be escaped wc-notify-master.sh Task: 23223 Story: 2003103 Change-Id: I995f5b82abadfdb7f78f7c098ac7a7f1e5c34fd3 --- doc/source/user/index.rst | 7 ++++++- .../templates/kubernetes/fragments/wc-notify-master.sh | 2 +- .../k8s_fedora_atomic_v1/templates/kubecluster.yaml | 2 +- .../drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml | 2 +- .../drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst index f227321bc4..99cb5d6bf4 100644 --- a/doc/source/user/index.rst +++ b/doc/source/user/index.rst @@ -356,8 +356,9 @@ the table are linked to more details elsewhere in the user guide. | `kubeproxy_options`_ | extra kubeproxy | "" | | | args | | +---------------------------------------+--------------------+---------------+ -| `cgroup_driver`_ | - systemd | "systemd" | +| `cgroup_driver`_ | - systemd | "cgroupfs" | | | - cgroupfs | | ++---------------------------------------+--------------------+---------------+ | `cloud_provider_enabled`_ | - true | true | | | - false | | +---------------------------------------+--------------------+---------------+ @@ -2167,6 +2168,10 @@ Calico needs extra mounts for the kubelet container. See `commit `_ of atomic-system-containers for more information. +**NOTE:** We have seen some issues using systemd as cgroup-driver with Calico +together, so we highly recommend to use cgroupfs as the cgroup-driver for +Calico. + Network for VMs --------------- diff --git a/magnum/drivers/common/templates/kubernetes/fragments/wc-notify-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/wc-notify-master.sh index fc78415794..6544317721 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/wc-notify-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/wc-notify-master.sh @@ -13,7 +13,7 @@ WC_NOTIFY_SERVICE=/etc/systemd/system/wc-notify.service cat > $WC_NOTIFY_BIN < cgroup driver name that kubelet should use, ideally the same as the docker cgroup driver. - default: "systemd" + default: "cgroupfs" wait_condition_timeout: type: number diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml index f1015baf56..92f8fbeeca 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml @@ -66,7 +66,7 @@ parameters: description: > cgroup driver name that kubelet should use, ideally the same as the docker cgroup driver. - default: "systemd" + default: "cgroupfs" volume_driver: type: string diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml index e554e96123..e38a218ac1 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml @@ -56,7 +56,7 @@ parameters: description: > cgroup driver name that kubelet should use, ideally the same as the docker cgroup driver. - default: "systemd" + default: "cgroupfs" tls_disabled: type: boolean