From 2fb27c852141ef49eaa2824591ada41d23888b92 Mon Sep 17 00:00:00 2001
From: Stefan Prietl <ederst@users.noreply.github.com>
Date: Thu, 28 Mar 2019 14:26:43 +0100
Subject: [PATCH] Use static files in KubeDNS templating task (#4379)
This commit adapts the "Lay Down KubeDNS Template" task to use the static
files moved by pull request [1]
[1] https://github.com/kubernetes-sigs/kubespray/pull/4341
---
.../kubernetes-apps/ansible/tasks/kubedns.yml | 21 ++++++++++---------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/roles/kubernetes-apps/ansible/tasks/kubedns.yml b/roles/kubernetes-apps/ansible/tasks/kubedns.yml
index 0627a5fca..ecf029d5a 100644
--- a/roles/kubernetes-apps/ansible/tasks/kubedns.yml
+++ b/roles/kubernetes-apps/ansible/tasks/kubedns.yml
@@ -1,18 +1,19 @@
---
- name: Kubernetes Apps | Lay Down KubeDNS Template
- template:
- src: "{{ item.file }}.j2"
+ action: "{{ item.module }}"
+ args:
+ src: "{{ item.file }}{% if item.module == 'template' %}.j2{% endif %}"
dest: "{{ kube_config_dir }}/{{ item.file }}"
with_items:
- - { name: kube-dns, file: kubedns-sa.yml, type: sa }
- - { name: kube-dns, file: kubedns-config.yml, type: configmap }
- - { name: kube-dns, file: kubedns-deploy.yml, type: deployment }
- - { name: kube-dns, file: kubedns-svc.yml, type: svc }
- - { name: dns-autoscaler, file: dns-autoscaler-sa.yml, type: sa }
- - { name: dns-autoscaler, file: dns-autoscaler-clusterrole.yml, type: clusterrole }
- - { name: dns-autoscaler, file: dns-autoscaler-clusterrolebinding.yml, type: clusterrolebinding }
- - { name: dns-autoscaler, file: dns-autoscaler.yml, type: deployment }
+ - { name: kube-dns, module: template, file: kubedns-sa.yml, type: sa }
+ - { name: kube-dns, module: template, file: kubedns-config.yml, type: configmap }
+ - { name: kube-dns, module: template, file: kubedns-deploy.yml, type: deployment }
+ - { name: kube-dns, module: template, file: kubedns-svc.yml, type: svc }
+ - { name: dns-autoscaler, module: copy, file: dns-autoscaler-sa.yml, type: sa }
+ - { name: dns-autoscaler, module: copy, file: dns-autoscaler-clusterrole.yml, type: clusterrole }
+ - { name: dns-autoscaler, module: copy, file: dns-autoscaler-clusterrolebinding.yml, type: clusterrolebinding }
+ - { name: dns-autoscaler, module: template, file: dns-autoscaler.yml, type: deployment }
register: kubedns_manifests
when:
- dns_mode in ['kubedns','dnsmasq_kubedns']
--
GitLab