From 970576cbb991827bef904f055375a6242903593c Mon Sep 17 00:00:00 2001 From: michael Date: Tue, 6 Dec 2022 02:49:23 +1300 Subject: [PATCH] fact merging --- ansible/roles/k8s_network/tasks/main.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ansible/roles/k8s_network/tasks/main.yaml b/ansible/roles/k8s_network/tasks/main.yaml index fdff895..099687a 100644 --- a/ansible/roles/k8s_network/tasks/main.yaml +++ b/ansible/roles/k8s_network/tasks/main.yaml @@ -37,9 +37,9 @@ calico_default_installation: "{{ (calico_file_raw['content'] | b64decode).split(\"---\")[0] | from_yaml }}" calico_default_apiserver: "{{ (calico_file_raw['content'] | b64decode).split(\"---\")[1] | from_yaml }}" -- name: add ipv6 settings to calico config +- name: create ipv6 settings for calico config ansible.builtin.set_fact: - calico_default_installation.spec.calicoNetwork.ipPools[1]: + calico_ipv6: blockSize: "{{ k8s_v6_network_blocksize }}" cidr: "{{ k8s_v6_pod_cidr }}" encapsulation: "{{ k8s_network_encapsulation }}" @@ -59,6 +59,8 @@ value: "{{ k8s_network_nat }}" - path: calico_default_installation.spec.calicoNetwork.ipPools[0].nodeSelector value: "all()" + - path: calico_default_installation.spec.calicoNetwork.ipPools + value: "{{ calico_default_installation.spec.calicoNetwork.ipPools + [ calico_ipv6 ] }}" - path: calico_default_installation.spec.calicoNetwork.bgp value: "{{ k8s_network_bgp }}" - path: calico_default_installation.spec.calicoNetwork.linuxDataplane