resolve merge conflict

ansible/playbooks/05_k8s_deploy.yaml

@@ -41,6 +41,7 @@
 #   roles:
 #     - k8s_ingress_controller
 
+
 # - name: configure cert manager
 #   hosts: localhost
 #   gather_facts: false
@@ -48,3 +49,4 @@
 #   roles:
 #     - k8s_cert_manager
 
+

ansible/roles/k8s_cert_manager/tasks/main.yaml

@@ -34,3 +34,4 @@
     src: "{{ ansible_search_path[0] }}/files/cert-manager-issuer-acme-{{ item.provider }}-{{ item.environment }}.yaml"
   with_items:
     "{{ cert_manager_acme_providers }}"
+

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