michael/IaC
1
0
Fork 0
Code Packages

resolve merge conflict

Browse Source
This commit is contained in:
michael 2023-01-05 17:46:06 +10:00
commit 5eb52e7adb
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/playbooks/05_k8s_deploy.yaml
View File

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

3
ansible/roles/k8s_cert_manager/tasks/main.yaml
View File

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

2
ansible/roles/k8s_ingress_controller/tasks/main.yaml
View File

@ -2,8 +2,10 @@
- name: download the ingress controller manifest - name: download the ingress controller manifest
ansible.builtin.uri: ansible.builtin.uri:
url: https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v{{ ingress_controller_version | string }}/deploy/static/provider/cloud/deploy.yaml 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" 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" creates: "{{ ansible_search_path[0] }}/files/ingress_controller_v{{ ingress_controller_version }}.yaml"
mode: 0664 mode: 0664
- name: install ingress controller manifest to cluster - name: install ingress controller manifest to cluster