resolve merge conflict

2023-01-05 17:46:06 +10:00
parent a86cb26010 a985895225
commit 5eb52e7adb
3 changed files with 6 additions and 1 deletions
--- a/ansible/roles/k8s_ingress_controller/tasks/main.yaml
+++ b/ansible/roles/k8s_ingress_controller/tasks/main.yaml
@ -2,8 +2,10 @@
 - name: download the ingress controller manifest
  ansible.builtin.uri:
    url: https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v{{ ingress_controller_version | string }}/deploy/static/provider/cloud/deploy.yaml
+
    dest: "{{ ansible_search_path[0] }}/files/ingress_controller_v{{ ingress_controller_version }}.yaml"
    creates: "{{ ansible_search_path[0] }}/files/ingress_controller_v{{ ingress_controller_version }}.yaml"
+
    mode: 0664

 - name: install ingress controller manifest to cluster