Browse Source

kubeadm cri-o support.

pull/3061/head
Takashi Okamoto 6 years ago
parent
commit
236f066635
2 changed files with 6 additions and 0 deletions
  1. 3
      roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
  2. 3
      roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2

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

@ -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

@ -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 %}
Loading…
Cancel
Save