[2.11] fix broken scale procedure (#5926)

* Update main.yml

- remove default value 'systemd' for cgroup driver in containerd role.
  this value override autodetect in kubelet_cgroup_driver_detected from docker info

* Update scale.yml

do not run etcd role when etcd_kubeadm_enabled == true
release-2.11
Mario Bris 2020-04-29 16:42:25 +02:00 committed by GitHub
parent fa0de9faa0
commit 67167bd8d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions

View File

@ -1,6 +1,4 @@
--- ---
kubelet_cgroup_driver: systemd
containerd_config: containerd_config:
grpc: grpc:
max_recv_message_size: 16777216 max_recv_message_size: 16777216

View File

@ -42,7 +42,7 @@
- { role: kubernetes/preinstall, tags: preinstall } - { role: kubernetes/preinstall, tags: preinstall }
- { role: container-engine, tags: "container-engine", when: deploy_container_engine|default(true) } - { role: container-engine, tags: "container-engine", when: deploy_container_engine|default(true) }
- { role: download, tags: download, when: "not skip_downloads" } - { 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/node, tags: node }
- { role: kubernetes/kubeadm, tags: kubeadm } - { role: kubernetes/kubeadm, tags: kubeadm }
- { role: network_plugin, tags: network } - { role: network_plugin, tags: network }