From 0a2f4edfc67e649fa6ade77d57bd2f3ec0267fe3 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <matthew.mosesohn@gmail.com>
Date: Tue, 13 Aug 2019 18:53:43 +0300
Subject: [PATCH] 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
---
 roles/download/templates/kubeadm-images.yaml.j2                | 2 --
 .../kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 | 2 --
 .../kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 | 3 ---
 3 files changed, 7 deletions(-)

diff --git a/roles/download/templates/kubeadm-images.yaml.j2 b/roles/download/templates/kubeadm-images.yaml.j2
index b237fd7ae..e75f62e48 100644
--- a/roles/download/templates/kubeadm-images.yaml.j2
+++ b/roles/download/templates/kubeadm-images.yaml.j2
@@ -13,9 +13,7 @@ etcd:
 {% for endpoint in etcd_access_addresses.split(',') %}
       - {{ endpoint }}
 {% endfor %}
-{% if dns_mode in ['coredns', 'coredns_dual'] %}
 dns:
   type: CoreDNS
   imageRepository: {{ coredns_image_repo | regex_replace('/coredns$','') }}
   imageTag: {{ coredns_image_tag }}
-{% endif %}
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
index b7b0f2c30..b3469a804 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
@@ -69,12 +69,10 @@ etcd:
       - {{ san }}
 {% endfor %}
 {% endif %}
-{% if dns_mode in ['coredns', 'coredns_dual'] %}
 dns:
   type: CoreDNS
   imageRepository: {{ coredns_image_repo | regex_replace('/coredns$','') }}
   imageTag: {{ coredns_image_tag }}
-{% endif %}
 networking:
   dnsDomain: {{ dns_domain }}
   serviceSubnet: {{ kube_service_addresses }}
diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2
index 3d13577fe..8f6516f1c 100644
--- a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2
@@ -72,13 +72,10 @@ etcd:
       - {{ san }}
 {% endfor %}
 {% endif %}
-
-{% if dns_mode in ['coredns', 'coredns_dual'] %}
 dns:
   type: CoreDNS
   imageRepository: {{ coredns_image_repo | regex_replace('/coredns$','') }}
   imageTag: {{ coredns_image_tag }}
-{% endif %}
 networking:
   dnsDomain: {{ dns_domain }}
   serviceSubnet: {{ kube_service_addresses }}