Fix installation using CRIO about download images failed

This commit is contained in:
rongzhang 2018-12-23 00:15:09 +08:00
parent e7b835eb4c
commit 62a8961d8f

View file

@ -1,3 +1,16 @@
{% if kube_version is version('v1.12.0', '>=') %}
apiVersion: kubeadm.k8s.io/v1beta1
kind: InitConfiguration
nodeRegistration:
{% 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 %}
---
{% endif %}
{% if kube_version is version('v1.11.0', '<') %}
apiVersion: kubeadm.k8s.io/v1alpha1
{% elif kube_version is version('v1.11.0', '>=') and kube_version is version('v1.12.0', '<') %}
@ -14,3 +27,13 @@ kind: ClusterConfiguration
{% endif %}
imageRepository: {{ kube_image_repo }}
kubernetesVersion: {{ kube_version }}
{% if kube_version is version('v1.12.0', '<') %}
nodeRegistration:
{% 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 %}
{% endif %}