diff --git a/ansible/roles/k8s_network/tasks/main.yaml b/ansible/roles/k8s_network/tasks/main.yaml index de4e3bc..fdff895 100644 --- a/ansible/roles/k8s_network/tasks/main.yaml +++ b/ansible/roles/k8s_network/tasks/main.yaml @@ -37,6 +37,15 @@ 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 + ansible.builtin.set_fact: + calico_default_installation.spec.calicoNetwork.ipPools[1]: + blockSize: "{{ k8s_v6_network_blocksize }}" + cidr: "{{ k8s_v6_pod_cidr }}" + encapsulation: "{{ k8s_network_encapsulation }}" + natOutgoing: "{{ k8s_network_nat }}" + nodeSelector: "all()" + - name: update calico installation settings to desired values ansible.utils.update_fact: updates: @@ -50,16 +59,6 @@ value: "{{ k8s_network_nat }}" - path: calico_default_installation.spec.calicoNetwork.ipPools[0].nodeSelector value: "all()" - - path: calico_default_installation.spec.calicoNetwork.ipPools[1].blockSize - value: "{{ k8s_v6_network_blocksize }}" - - path: calico_default_installation.spec.calicoNetwork.ipPools[1].cidr - value: "{{ k8s_v6_pod_cidr }}" - - path: calico_default_installation.spec.calicoNetwork.ipPools[1].encapsulation - value: "{{ k8s_network_encapsulation }}" - - path: calico_default_installation.spec.calicoNetwork.ipPools[1].natOutgoing - value: "{{ k8s_network_nat }}" - - path: calico_default_installation.spec.calicoNetwork.ipPools[1].nodeSelector - value: "all()" - path: calico_default_installation.spec.calicoNetwork.bgp value: "{{ k8s_network_bgp }}" - path: calico_default_installation.spec.calicoNetwork.linuxDataplane