*** Wartungsfenster jeden ersten Mittwoch vormittag im Monat ***

Skip to content
Snippets Groups Projects
Commit d808216d authored by Weber, Thomas's avatar Weber, Thomas
Browse files

fix: recursive combine

parent 6f3e39e9
No related branches found
No related tags found
1 merge request!1Restore main as the default branch
......@@ -44,7 +44,7 @@ registry_mirrors: {}
# tls: --SEE_ABOVE--
manifests: {} # used to override default_manifests
manifests_config: "{{ default_manifests | combine(manifests) }}"
manifests_config: '{{ {} | combine(default_manifests, manifests, recursive=True) }}'
default_manifests:
config-rke2-coredns:
enabled: false
......@@ -58,10 +58,11 @@ default_manifests:
config-rke2-cilium:
enabled: false
hubble:
enabled: false
user: ""
password: ""
ui:
enabled: false
enabled: "{{ manifests.config-rke2-cilium.hubble.enabled | default(false) }}"
ingress:
enabled: true
annotations:
......
......@@ -5,7 +5,7 @@
template:
src: 'manifests/{{ item.key }}.j2'
dest: '/var/lib/rancher/rke2/server/manifests/{{ item.key }}.yaml'
with_dict: "{{ default_manifests | combine(manifests) }}"
with_dict: "{{ manifests_config }}"
when: item.value.enabled
notify:
- restart rke2
......@@ -14,6 +14,6 @@
ansible.builtin.file:
path: '/var/lib/rancher/rke2/server/manifests/{{ item.key }}.yaml'
state: absent
with_dict: "{{ default_manifests | combine(manifests) }}"
with_dict: "{{ manifests_config }}"
when: not item.value.enabled
ignore_errors: yes
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment