Switch to kubeadm deployment mode (#3461)

* Switch to kubeadm deployment mode

Discuss:https://github.com/kubernetes-incubator/kubespray/issues/3301

* Add non-kubeadm upgrage to kubeadm cluster
This commit is contained in:
Rong Zhang
2018-11-21 17:35:40 +08:00
committed by k8s-ci-robot
parent 7875c38023
commit 0cfcd39d55
15 changed files with 64 additions and 39 deletions

View File

@@ -18,6 +18,8 @@ nodeRegistration:
name: {{ inventory_hostname }}
{% if container_manager == 'crio' %}
criSocket: /var/run/crio/crio.sock
{% elif container_manager == 'rkt' %}
criSocket: /var/run/rkt.sock
{% else %}
criSocket: /var/run/dockershim.sock
{% endif %}