Browse Source
Merge pull request #3933 from riverzhang/fix-kubeadm-images
Fix installation using CRIO about download images failed
pull/3936/head
Rong Zhang
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
23 additions and
0 deletions
-
roles/download/templates/kubeadm-images.yaml.j2
|
|
|
@ -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 %} |
