etcd: deploy container engine if needed (#7532)
If the etcd cluster is separate and the etcd_deployment_type is "host", there is no need for a container engine on the etcd nodes Do not rely on a 'default(true)' filter, but define a proper default in kubespray-defaults depending on etcd deployment method and if internal or external etcd is used
This commit is contained in:
@ -57,7 +57,7 @@
|
||||
serial: "{{ serial | default('20%') }}"
|
||||
roles:
|
||||
- { role: kubespray-defaults }
|
||||
- { role: container-engine, tags: "container-engine", when: deploy_container_engine|default(true) }
|
||||
- { role: container-engine, tags: "container-engine", when: deploy_container_engine }
|
||||
|
||||
- hosts: etcd
|
||||
gather_facts: False
|
||||
@ -94,7 +94,7 @@
|
||||
roles:
|
||||
- { role: kubespray-defaults }
|
||||
- { role: upgrade/pre-upgrade, tags: pre-upgrade }
|
||||
- { role: container-engine, tags: "container-engine", when: deploy_container_engine|default(true) }
|
||||
- { role: container-engine, tags: "container-engine", when: deploy_container_engine }
|
||||
- { role: kubernetes/node, tags: node }
|
||||
- { role: kubernetes/control-plane, tags: master, upgrade_cluster_setup: true }
|
||||
- { role: kubernetes/client, tags: client }
|
||||
@ -125,7 +125,7 @@
|
||||
roles:
|
||||
- { role: kubespray-defaults }
|
||||
- { role: upgrade/pre-upgrade, tags: pre-upgrade }
|
||||
- { role: container-engine, tags: "container-engine", when: deploy_container_engine|default(true) }
|
||||
- { role: container-engine, tags: "container-engine", when: deploy_container_engine }
|
||||
- { role: kubernetes/node, tags: node }
|
||||
- { role: kubernetes/kubeadm, tags: kubeadm }
|
||||
- { role: kubernetes/node-label, tags: node-label }
|
||||
|
Reference in New Issue
Block a user