Browse Source

Merge pull request #3095 from mirwan/dnsmasq_template_rendering_filename

Dnsmasq manifests should not have j2 extension but templates should
pull/3048/merge
k8s-ci-robot 7 years ago
committed by GitHub
parent
commit
881b46f458
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 3 deletions
  1. 6
      roles/dnsmasq/tasks/main.yml
  2. 0
      roles/dnsmasq/templates/dnsmasq-clusterrolebinding.yml.j2
  3. 0
      roles/dnsmasq/templates/dnsmasq-deploy.yml.j2
  4. 0
      roles/dnsmasq/templates/dnsmasq-serviceaccount.yml.j2
  5. 0
      roles/dnsmasq/templates/dnsmasq-svc.yml.j2

6
roles/dnsmasq/tasks/main.yml

@ -54,7 +54,7 @@
- name: Create dnsmasq RBAC manifests
template:
src: "{{ item }}"
src: "{{ item }}.j2"
dest: "{{ kube_config_dir }}/{{ item }}"
with_items:
- "dnsmasq-clusterrolebinding.yml"
@ -72,12 +72,12 @@
- name: Create dnsmasq manifests
template:
src: "{{item.file}}"
src: "{{item.file}}.j2"
dest: "{{kube_config_dir}}/{{item.file}}"
with_items:
- {name: dnsmasq, file: dnsmasq-deploy.yml, type: deployment}
- {name: dnsmasq, file: dnsmasq-svc.yml, type: svc}
- {name: dnsmasq-autoscaler, file: dnsmasq-autoscaler.yml.j2, type: deployment}
- {name: dnsmasq-autoscaler, file: dnsmasq-autoscaler.yml, type: deployment}
register: manifests
delegate_to: "{{ groups['kube-master'][0] }}"
run_once: true

roles/dnsmasq/templates/dnsmasq-clusterrolebinding.yml → roles/dnsmasq/templates/dnsmasq-clusterrolebinding.yml.j2

roles/dnsmasq/templates/dnsmasq-deploy.yml → roles/dnsmasq/templates/dnsmasq-deploy.yml.j2

roles/dnsmasq/templates/dnsmasq-serviceaccount.yml → roles/dnsmasq/templates/dnsmasq-serviceaccount.yml.j2

roles/dnsmasq/templates/dnsmasq-svc.yml → roles/dnsmasq/templates/dnsmasq-svc.yml.j2

Loading…
Cancel
Save