Merge pull request #2249 from hswong3i/kubedns-deploy.yml.j2

KubeDNS template should not suffix with .yml.j2
pull/2213/merge
Antoine Legrand 2018-02-06 11:24:19 +01:00 committed by GitHub
commit 9f3081580a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 16 deletions

View File

@ -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]