kubeadm cri-o support.

2018-08-28 02:24:45 +00:00
parent 5ab8a712d9
commit 236f066635
2 changed files with 6 additions and 0 deletions
--- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
+++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
@ -15,3 +15,6 @@ discoveryTokenAPIServers:
 discoveryTokenUnsafeSkipCAVerification: true
 nodeRegistration:
  name: {{ inventory_hostname  }}
+{% if manage_crio %}
+  criSocket: /var/run/crio/crio.sock
+{% endif %}
--- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
@ -138,3 +138,6 @@ nodeRegistration:
  taints:
  - effect: NoSchedule
    key: node-role.kubernetes.io/master
+{% if manage_crio %}
+  criSocket: /var/run/crio/crio.sock
+{% endif %}