From 8cb54cd74d93d79a9af4487215be2ebfed7d4baa Mon Sep 17 00:00:00 2001 From: Sergey Date: Sun, 22 Sep 2019 11:07:22 +0300 Subject: [PATCH] fix broken scale procedure: (#5193) - do not run etcd role when etcd_kubeadm_enabled == true - remove default value 'systemd' for cgroup driver in containerd role. this value override autodetect in kubelet_cgroup_driver_detected from docker info --- roles/container-engine/containerd/defaults/main.yml | 2 -- scale.yml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml index e876a2c61..1d343fc00 100644 --- a/roles/container-engine/containerd/defaults/main.yml +++ b/roles/container-engine/containerd/defaults/main.yml @@ -1,6 +1,4 @@ --- -kubelet_cgroup_driver: systemd - containerd_config: grpc: max_recv_message_size: 16777216 diff --git a/scale.yml b/scale.yml index 094be2a15..4f53a1201 100644 --- a/scale.yml +++ b/scale.yml @@ -42,7 +42,7 @@ - { role: kubernetes/preinstall, tags: preinstall } - { role: container-engine, tags: "container-engine", when: deploy_container_engine|default(true) } - { role: download, tags: download, when: "not skip_downloads" } - - { role: etcd, tags: etcd, etcd_cluster_setup: false } + - { role: etcd, tags: etcd, etcd_cluster_setup: false, when: "not etcd_kubeadm_enabled|default(false)" } - { role: kubernetes/node, tags: node } - { role: kubernetes/kubeadm, tags: kubeadm } - { role: network_plugin, tags: network }