External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-22 05:30:51 -03:30
Code Issues Packages Projects Releases Wiki Activity

kubeadm cri-o support.

Browse Source
This commit is contained in:
Takashi Okamoto
2018-08-28 02:24:45 +00:00
parent 5ab8a712d9
commit 236f066635
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
View File

@@ -15,3 +15,6 @@ discoveryTokenAPIServers:
discoveryTokenUnsafeSkipCAVerification: true discoveryTokenUnsafeSkipCAVerification: true
nodeRegistration: nodeRegistration:
name: {{ inventory_hostname }} name: {{ inventory_hostname }}
{% if manage_crio %}
criSocket: /var/run/crio/crio.sock
{% endif %}

3
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
View File

@@ -138,3 +138,6 @@ nodeRegistration:
taints: taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master
{% if manage_crio %}
criSocket: /var/run/crio/crio.sock
{% endif %}