Use systemd cgroup driver instead of cgroupfs

See kubernetes/kubeadm#1394 for details.
cloudboss · Dec 13, 2019 · b193c5b · b193c5b
1 parent cd65041
commit b193c5b
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 4 deletions.
diff --git a/ci/assets/v1.16-external/cluster/vars.yml b/ci/assets/v1.16-external/cluster/vars.yml
@@ -25,6 +25,8 @@ docker_options:
   'iptables': false
   'log-driver': json-file
   'storage-driver': overlay2
+  'exec-opts':
+  - native.cgroupdriver=systemd
 node_groups:
 - name: app
   min_instances: 3

diff --git a/ci/assets/v1.16-stacked/cluster/vars.yml b/ci/assets/v1.16-stacked/cluster/vars.yml
@@ -23,6 +23,8 @@ docker_options:
   'iptables': false
   'log-driver': json-file
   'storage-driver': overlay2
+  'exec-opts':
+  - native.cgroupdriver=systemd
 node_groups:
 - name: app
   min_instances: 3

diff --git a/ci/assets/v1.17-external/cluster/vars.yml b/ci/assets/v1.17-external/cluster/vars.yml
@@ -25,6 +25,8 @@ docker_options:
   'iptables': false
   'log-driver': json-file
   'storage-driver': overlay2
+  'exec-opts':
+  - native.cgroupdriver=systemd
 node_groups:
 - name: app
   min_instances: 3

diff --git a/ci/assets/v1.17-stacked/cluster/vars.yml b/ci/assets/v1.17-stacked/cluster/vars.yml
@@ -23,6 +23,8 @@ docker_options:
   'iptables': false
   'log-driver': json-file
   'storage-driver': overlay2
+  'exec-opts':
+  - native.cgroupdriver=systemd
 node_groups:
 - name: app
   min_instances: 3

diff --git a/keights/resources/usr/share/keights/kubeadm-init-config.yaml.template b/keights/resources/usr/share/keights/kubeadm-init-config.yaml.template
@@ -102,6 +102,7 @@ authentication:
     enabled: true
   x509:
     clientCAFile: /etc/kubernetes/pki/ca.crt
+cgroupDriver: systemd
 clusterDNS:
 - {{ .ClusterDNS }}
 clusterDomain: {{ .ClusterDomain }}

diff --git a/stack/ansible/keights-stack/tasks/present.yml b/stack/ansible/keights-stack/tasks/present.yml
@@ -11,6 +11,8 @@
       'iptables': false
       'log-driver': journald
       'storage-driver': overlay2
+      'exec-opts':
+      - native.cgroupdriver=systemd
 
 - name: set etcd device
   set_fact:

diff --git a/stack/cloudformation/etcd.yml b/stack/cloudformation/etcd.yml
@@ -91,7 +91,8 @@ Parameters:
         "ip-masq": false,
         "iptables": false,
         "log-driver": "journald",
-        "storage-driver": "overlay2"
+        "storage-driver": "overlay2",
+        "exec-opts": ["native.cgroupdriver=systemd"]
       }
 
 Conditions:

diff --git a/stack/cloudformation/master-external.yml b/stack/cloudformation/master-external.yml
@@ -118,7 +118,8 @@ Parameters:
         "ip-masq": false,
         "iptables": false,
         "log-driver": "journald",
-        "storage-driver": "overlay2"
+        "storage-driver": "overlay2",
+        "exec-opts": ["native.cgroupdriver=systemd"]
       }
   KubeadmInitConfigTemplate:
     Description: >-

diff --git a/stack/cloudformation/master-stacked.yml b/stack/cloudformation/master-stacked.yml
@@ -140,7 +140,8 @@ Parameters:
         "ip-masq": false,
         "iptables": false,
         "log-driver": "journald",
-        "storage-driver": "overlay2"
+        "storage-driver": "overlay2",
+        "exec-opts": ["native.cgroupdriver=systemd"]
       }
   KubeadmInitConfigTemplate:
     Description: >-

diff --git a/stack/cloudformation/node.yml b/stack/cloudformation/node.yml
@@ -73,7 +73,8 @@ Parameters:
         "ip-masq": false,
         "iptables": false,
         "log-driver": "journald",
-        "storage-driver": "overlay2"
+        "storage-driver": "overlay2",
+        "exec-opts": ["native.cgroupdriver=systemd"]
       }
   KubeadmJoinConfigTemplate:
     Description: Template for kubeadm join config file.