diff --git a/roles/download/templates/kubeadm-images.yaml.j2 b/roles/download/templates/kubeadm-images.yaml.j2 index b237fd7aef6bc170f86cfbe7ca0c7ad97da1b53d..e75f62e487fb10046bf79ec6f956a16ca2b744b6 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 b7b0f2c30e252d355229bf19293e1d8b8e0f7fc2..b3469a804c80c9b27b4e77d3f68f069dd3fefb4d 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 3d13577fe2098de9c9e1ad5a1952909ee103747a..8f6516f1c1200aaebedd0f5c3f5446ecf7aeff88 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 }}