diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml index e876a2c61f0032a55c904d156df3c7587d45ae15..1d343fc005af4a61118f986fa08e76e38afc0295 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 094be2a15ab819446ca6eb091238e7410d7f8aed..4f53a1201120de84a10656de266b4ddf66929643 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 }