From 4ad53339f6ee1b0be09f342dcf9dd8ca94c832bb Mon Sep 17 00:00:00 2001
From: Wong Hoi Sing Edison <hswong3i@gmail.com>
Date: Mon, 5 Feb 2018 16:26:54 +0800
Subject: [PATCH] KubeDNS template should not suffix with .yml.j2

---
 roles/kubernetes-apps/ansible/tasks/main.yml  | 32 +++++++++----------
 ... => kubedns-autoscaler-clusterrole.yml.j2} |  0
 ...edns-autoscaler-clusterrolebinding.yml.j2} |  0
 ...er-sa.yml => kubedns-autoscaler-sa.yml.j2} |  0
 .../{kubedns-sa.yml => kubedns-sa.yml.j2}     |  0
 .../{kubedns-svc.yml => kubedns-svc.yml.j2}   |  0
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename roles/kubernetes-apps/ansible/templates/{kubedns-autoscaler-clusterrole.yml => kubedns-autoscaler-clusterrole.yml.j2} (100%)
 rename roles/kubernetes-apps/ansible/templates/{kubedns-autoscaler-clusterrolebinding.yml => kubedns-autoscaler-clusterrolebinding.yml.j2} (100%)
 rename roles/kubernetes-apps/ansible/templates/{kubedns-autoscaler-sa.yml => kubedns-autoscaler-sa.yml.j2} (100%)
 rename roles/kubernetes-apps/ansible/templates/{kubedns-sa.yml => kubedns-sa.yml.j2} (100%)
 rename roles/kubernetes-apps/ansible/templates/{kubedns-svc.yml => kubedns-svc.yml.j2} (100%)

diff --git a/roles/kubernetes-apps/ansible/tasks/main.yml b/roles/kubernetes-apps/ansible/tasks/main.yml
index a15d5d593..a25d595eb 100644
--- a/roles/kubernetes-apps/ansible/tasks/main.yml
+++ b/roles/kubernetes-apps/ansible/tasks/main.yml
@@ -15,7 +15,7 @@
   kube:
     name: "kubedns"
     namespace: "{{ system_namespace }}"
-    kubectl: "{{bin_dir}}/kubectl"
+    kubectl: "{{ bin_dir }}/kubectl"
     resource: "{{ item }}"
     state: absent
   with_items:
@@ -28,7 +28,7 @@
   kube:
     name: "kubedns"
     namespace: "{{ system_namespace }}"
-    kubectl: "{{bin_dir}}/kubectl"
+    kubectl: "{{ bin_dir }}/kubectl"
     resource: "deploy"
     state: absent
   when:
@@ -38,16 +38,16 @@
 
 - name: Kubernetes Apps | Lay Down KubeDNS Template
   template:
-    src: "{{item.file}}"
-    dest: "{{kube_config_dir}}/{{item.file}}"
+    src: "{{ item.file }}.j2"
+    dest: "{{ kube_config_dir }}/{{ item.file }}"
   with_items:
-    - {name: kube-dns, file: kubedns-sa.yml, type: sa}
-    - {name: kube-dns, file: kubedns-deploy.yml.j2, type: deployment}
-    - {name: kube-dns, file: kubedns-svc.yml, type: svc}
-    - {name: kubedns-autoscaler, file: kubedns-autoscaler-sa.yml, type: sa}
-    - {name: kubedns-autoscaler, file: kubedns-autoscaler-clusterrole.yml, type: clusterrole}
-    - {name: kubedns-autoscaler, file: kubedns-autoscaler-clusterrolebinding.yml, type: clusterrolebinding}
-    - {name: kubedns-autoscaler, file: kubedns-autoscaler.yml.j2, type: deployment}
+    - { name: kube-dns, file: kubedns-sa.yml, type: sa }
+    - { name: kube-dns, file: kubedns-deploy.yml, type: deployment }
+    - { name: kube-dns, file: kubedns-svc.yml, type: svc }
+    - { name: kubedns-autoscaler, file: kubedns-autoscaler-sa.yml, type: sa }
+    - { name: kubedns-autoscaler, file: kubedns-autoscaler-clusterrole.yml, type: clusterrole }
+    - { name: kubedns-autoscaler, file: kubedns-autoscaler-clusterrolebinding.yml, type: clusterrolebinding }
+    - { name: kubedns-autoscaler, file: kubedns-autoscaler.yml, type: deployment }
   register: manifests
   when:
     - dns_mode != 'none' and inventory_hostname == groups['kube-master'][0]
@@ -58,7 +58,7 @@
 # see https://github.com/kubernetes/kubernetes/issues/45084, only needed for "old" kube-dns
 - name: Kubernetes Apps | Patch system:kube-dns ClusterRole
   command: >
-    {{bin_dir}}/kubectl patch clusterrole system:kube-dns
+    {{ bin_dir }}/kubectl patch clusterrole system:kube-dns
     --patch='{
                "rules": [
                  {
@@ -76,11 +76,11 @@
 
 - name: Kubernetes Apps | Start Resources
   kube:
-    name: "{{item.item.name}}"
+    name: "{{ item.item.name }}"
     namespace: "{{ system_namespace }}"
-    kubectl: "{{bin_dir}}/kubectl"
-    resource: "{{item.item.type}}"
-    filename: "{{kube_config_dir}}/{{item.item.file}}"
+    kubectl: "{{ bin_dir }}/kubectl"
+    resource: "{{ item.item.type }}"
+    filename: "{{ kube_config_dir }}/{{ item.item.file }}"
     state: "latest"
   with_items: "{{ manifests.results }}"
   when:
diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrole.yml b/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrole.yml.j2
similarity index 100%
rename from roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrole.yml
rename to roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrole.yml.j2
diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrolebinding.yml b/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrolebinding.yml.j2
similarity index 100%
rename from roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrolebinding.yml
rename to roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrolebinding.yml.j2
diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-sa.yml b/roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-sa.yml.j2
similarity index 100%
rename from roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-sa.yml
rename to roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-sa.yml.j2
diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-sa.yml b/roles/kubernetes-apps/ansible/templates/kubedns-sa.yml.j2
similarity index 100%
rename from roles/kubernetes-apps/ansible/templates/kubedns-sa.yml
rename to roles/kubernetes-apps/ansible/templates/kubedns-sa.yml.j2
diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-svc.yml b/roles/kubernetes-apps/ansible/templates/kubedns-svc.yml.j2
similarity index 100%
rename from roles/kubernetes-apps/ansible/templates/kubedns-svc.yml
rename to roles/kubernetes-apps/ansible/templates/kubedns-svc.yml.j2