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

Always download coredns images with kubeadm (#5071)

Browse source 
Fixes situation when using manual mode because it
tries to download coredns v1.3.1 from the same
image repository where kubernetes images are
downloaded from.

Change-Id: Ibbec8a72c8162ce8befa74e2013a268737ea5f8a
This commit is contained in:
Matthew Mosesohn 2019-08-13 18:53:43 +03:00 committed by Kubernetes Prow Robot
parent 56fa46716e
commit 0a2f4edfc6
3 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/download/templates/kubeadm-images.yaml.j2
View file

@ -13,9 +13,7 @@ etcd:
{% for endpoint in etcd_access_addresses.split(',') %} {% for endpoint in etcd_access_addresses.split(',') %}
- {{ endpoint }} - {{ endpoint }}
{% endfor %} {% endfor %}
{% if dns_mode in ['coredns', 'coredns_dual'] %}
dns: dns:
type: CoreDNS type: CoreDNS
imageRepository: {{ coredns_image_repo | regex_replace('/coredns$','') }} imageRepository: {{ coredns_image_repo | regex_replace('/coredns$','') }}
imageTag: {{ coredns_image_tag }} imageTag: {{ coredns_image_tag }}
{% endif %}

2
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
View file

@ -69,12 +69,10 @@ etcd:
- {{ san }} - {{ san }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if dns_mode in ['coredns', 'coredns_dual'] %}
dns: dns:
type: CoreDNS type: CoreDNS
imageRepository: {{ coredns_image_repo | regex_replace('/coredns$','') }} imageRepository: {{ coredns_image_repo | regex_replace('/coredns$','') }}
imageTag: {{ coredns_image_tag }} imageTag: {{ coredns_image_tag }}
{% endif %}
networking: networking:
dnsDomain: {{ dns_domain }} dnsDomain: {{ dns_domain }}
serviceSubnet: {{ kube_service_addresses }} serviceSubnet: {{ kube_service_addresses }}

3
roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2
View file

@ -72,13 +72,10 @@ etcd:
- {{ san }} - {{ san }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if dns_mode in ['coredns', 'coredns_dual'] %}
dns: dns:
type: CoreDNS type: CoreDNS
imageRepository: {{ coredns_image_repo | regex_replace('/coredns$','') }} imageRepository: {{ coredns_image_repo | regex_replace('/coredns$','') }}
imageTag: {{ coredns_image_tag }} imageTag: {{ coredns_image_tag }}
{% endif %}
networking: networking:
dnsDomain: {{ dns_domain }} dnsDomain: {{ dns_domain }}
serviceSubnet: {{ kube_service_addresses }} serviceSubnet: {{ kube_service_addresses }}