Skip to content
Snippets Groups Projects
Commit 0a2f4edf authored by Matthew Mosesohn's avatar Matthew Mosesohn Committed by Kubernetes Prow Robot
Browse files

Always download coredns images with kubeadm (#5071)

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
parent 56fa4671
No related branches found
No related tags found
No related merge requests found
...@@ -13,9 +13,7 @@ etcd: ...@@ -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 %}
...@@ -69,12 +69,10 @@ etcd: ...@@ -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 }}
......
...@@ -72,13 +72,10 @@ etcd: ...@@ -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 }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment