diff --git a/galaxy.yml b/galaxy.yml index 497ac44b94bd1fa49b8c7c9be58809b591b216bd..a0df3882c4d20b861aa66843e15c5db3f8003849 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -9,6 +9,8 @@ authors: tags: - infrastructure repository: https://github.com/kubernetes-sigs/kubespray +dependencies: + ansible.utils: '>=2.5.0' build_ignore: - .github - '*.tar.gz' diff --git a/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml b/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml index fade43c2632464f978e252d1e37ed2bdb2598361..93a8fda6667e466c3ab456134a5dbf661fa06928 100644 --- a/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml +++ b/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml @@ -110,7 +110,7 @@ - name: Kubeadm | Check apiserver.crt SANs vars: - apiserver_ips: "{{ apiserver_sans | map('ipaddr') | reject('equalto', False) | list }}" + apiserver_ips: "{{ apiserver_sans | map('ansible.utils.ipaddr') | reject('equalto', False) | list }}" apiserver_hosts: "{{ apiserver_sans | difference(apiserver_ips) }}" when: - kubeadm_already_run.stat.exists diff --git a/roles/kubernetes/preinstall/tasks/0020-set_facts.yml b/roles/kubernetes/preinstall/tasks/0020-set_facts.yml index 5bd4181c47ae8ac28f4f956e1d9425a0e9e07866..3d41050f5b5196cb6a3cfbb42a720885a43f9388 100644 --- a/roles/kubernetes/preinstall/tasks/0020-set_facts.yml +++ b/roles/kubernetes/preinstall/tasks/0020-set_facts.yml @@ -79,7 +79,7 @@ - name: Get currently configured nameservers set_fact: - configured_nameservers: "{{ resolvconf_slurp.content | b64decode | regex_findall('^nameserver\\s*(\\S*)', multiline=True) | ipaddr }}" + configured_nameservers: "{{ resolvconf_slurp.content | b64decode | regex_findall('^nameserver\\s*(\\S*)', multiline=True) | ansible.utils.ipaddr }}" when: resolvconf_slurp.content is defined - name: Stop if /etc/resolv.conf not configured nameservers diff --git a/roles/kubernetes/preinstall/tasks/0040-verify-settings.yml b/roles/kubernetes/preinstall/tasks/0040-verify-settings.yml index 8cc11b6d51a8f68f12178cd140b947a60aae0adb..178becf3ee26dc84f24647cdfe109044122e2420 100644 --- a/roles/kubernetes/preinstall/tasks/0040-verify-settings.yml +++ b/roles/kubernetes/preinstall/tasks/0040-verify-settings.yml @@ -166,28 +166,28 @@ - name: "Check that kube_service_addresses is a network range" assert: that: - - kube_service_addresses | ipaddr('net') + - kube_service_addresses | ansible.utils.ipaddr('net') msg: "kube_service_addresses = '{{ kube_service_addresses }}' is not a valid network range" run_once: yes - name: "Check that kube_pods_subnet is a network range" assert: that: - - kube_pods_subnet | ipaddr('net') + - kube_pods_subnet | ansible.utils.ipaddr('net') msg: "kube_pods_subnet = '{{ kube_pods_subnet }}' is not a valid network range" run_once: yes - name: "Check that kube_pods_subnet does not collide with kube_service_addresses" assert: that: - - kube_pods_subnet | ipaddr(kube_service_addresses) | string == 'None' + - kube_pods_subnet | ansible.utils.ipaddr(kube_service_addresses) | string == 'None' msg: "kube_pods_subnet cannot be the same network segment as kube_service_addresses" run_once: yes - name: "Check that IP range is enough for the nodes" assert: that: - - 2 ** (kube_network_node_prefix - kube_pods_subnet | ipaddr('prefix')) >= groups['k8s_cluster'] | length + - 2 ** (kube_network_node_prefix - kube_pods_subnet | ansible.utils.ipaddr('prefix')) >= groups['k8s_cluster'] | length msg: "Not enough IPs are available for the desired node count." when: kube_network_plugin != 'calico' run_once: yes diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml index d371440a3a29d9b8887558da42688b38cdcc6999..7944295dd8dcf4b6857bb61440bd2c02935fc86f 100644 --- a/roles/network_plugin/calico/tasks/install.yml +++ b/roles/network_plugin/calico/tasks/install.yml @@ -87,7 +87,7 @@ - name: Calico | Ensure that calico_pool_cidr is within kube_pods_subnet when defined assert: - that: "[calico_pool_cidr] | ipaddr(kube_pods_subnet) | length == 1" + that: "[calico_pool_cidr] | ansible.utils.ipaddr(kube_pods_subnet) | length == 1" msg: "{{ calico_pool_cidr }} is not within or equal to {{ kube_pods_subnet }}" when: - inventory_hostname == groups['kube_control_plane'][0] @@ -111,7 +111,7 @@ - name: Calico | Ensure that calico_pool_cidr_ipv6 is within kube_pods_subnet_ipv6 when defined assert: - that: "[calico_pool_cidr_ipv6] | ipaddr(kube_pods_subnet_ipv6) | length == 1" + that: "[calico_pool_cidr_ipv6] | ansible.utils.ipaddr(kube_pods_subnet_ipv6) | length == 1" msg: "{{ calico_pool_cidr_ipv6 }} is not within or equal to {{ kube_pods_subnet_ipv6 }}" when: - inventory_hostname == groups['kube_control_plane'][0]