KubeDNS template should not suffix with .yml.j2

pull/2249/head
Wong Hoi Sing Edison 2018-02-05 16:26:54 +08:00
parent bd1f0bcfd7
commit 4ad53339f6
6 changed files with 16 additions and 16 deletions

View File

@ -15,7 +15,7 @@
kube: kube:
name: "kubedns" name: "kubedns"
namespace: "{{ system_namespace }}" namespace: "{{ system_namespace }}"
kubectl: "{{bin_dir}}/kubectl" kubectl: "{{ bin_dir }}/kubectl"
resource: "{{ item }}" resource: "{{ item }}"
state: absent state: absent
with_items: with_items:
@ -28,7 +28,7 @@
kube: kube:
name: "kubedns" name: "kubedns"
namespace: "{{ system_namespace }}" namespace: "{{ system_namespace }}"
kubectl: "{{bin_dir}}/kubectl" kubectl: "{{ bin_dir }}/kubectl"
resource: "deploy" resource: "deploy"
state: absent state: absent
when: when:
@ -38,16 +38,16 @@
- name: Kubernetes Apps | Lay Down KubeDNS Template - name: Kubernetes Apps | Lay Down KubeDNS Template
template: template:
src: "{{item.file}}" src: "{{ item.file }}.j2"
dest: "{{kube_config_dir}}/{{item.file}}" dest: "{{ kube_config_dir }}/{{ item.file }}"
with_items: with_items:
- {name: kube-dns, file: kubedns-sa.yml, type: sa} - { name: kube-dns, file: kubedns-sa.yml, type: sa }
- {name: kube-dns, file: kubedns-deploy.yml.j2, type: deployment} - { name: kube-dns, file: kubedns-deploy.yml, type: deployment }
- {name: kube-dns, file: kubedns-svc.yml, type: svc} - { 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-sa.yml, type: sa }
- {name: kubedns-autoscaler, file: kubedns-autoscaler-clusterrole.yml, type: clusterrole} - { 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-clusterrolebinding.yml, type: clusterrolebinding }
- {name: kubedns-autoscaler, file: kubedns-autoscaler.yml.j2, type: deployment} - { name: kubedns-autoscaler, file: kubedns-autoscaler.yml, type: deployment }
register: manifests register: manifests
when: when:
- dns_mode != 'none' and inventory_hostname == groups['kube-master'][0] - 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 # see https://github.com/kubernetes/kubernetes/issues/45084, only needed for "old" kube-dns
- name: Kubernetes Apps | Patch system:kube-dns ClusterRole - name: Kubernetes Apps | Patch system:kube-dns ClusterRole
command: > command: >
{{bin_dir}}/kubectl patch clusterrole system:kube-dns {{ bin_dir }}/kubectl patch clusterrole system:kube-dns
--patch='{ --patch='{
"rules": [ "rules": [
{ {
@ -76,11 +76,11 @@
- name: Kubernetes Apps | Start Resources - name: Kubernetes Apps | Start Resources
kube: kube:
name: "{{item.item.name}}" name: "{{ item.item.name }}"
namespace: "{{ system_namespace }}" namespace: "{{ system_namespace }}"
kubectl: "{{bin_dir}}/kubectl" kubectl: "{{ bin_dir }}/kubectl"
resource: "{{item.item.type}}" resource: "{{ item.item.type }}"
filename: "{{kube_config_dir}}/{{item.item.file}}" filename: "{{ kube_config_dir }}/{{ item.item.file }}"
state: "latest" state: "latest"
with_items: "{{ manifests.results }}" with_items: "{{ manifests.results }}"
when: when: