Skip to content
Snippets Groups Projects
Unverified Commit 48b5ee5c authored by Rong Zhang's avatar Rong Zhang Committed by GitHub
Browse files

Merge pull request #3933 from riverzhang/fix-kubeadm-images

Fix installation using CRIO about download images failed
parents e7b835eb 62a8961d
No related branches found
No related tags found
No related merge requests found
{% 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 %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment