C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Fix installation using CRIO about download images failed
This commit is contained in:
Rong Zhang 2018-12-23 11:10:08 +08:00 committed by GitHub
commit 48b5ee5cd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
roles/download/templates/kubeadm-images.yaml.j2
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', '<') %} {% if kube_version is version('v1.11.0', '<') %}
apiVersion: kubeadm.k8s.io/v1alpha1 apiVersion: kubeadm.k8s.io/v1alpha1
{% elif kube_version is version('v1.11.0', '>=') and kube_version is version('v1.12.0', '<') %} {% elif kube_version is version('v1.11.0', '>=') and kube_version is version('v1.12.0', '<') %}
@ -14,3 +27,13 @@ kind: ClusterConfiguration
{% endif %} {% endif %}
imageRepository: {{ kube_image_repo }} imageRepository: {{ kube_image_repo }}
kubernetesVersion: {{ kube_version }} 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 %}