epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-14 22:04:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup a deprecation warning (ipaddr filter) (#10518)

Browse Source
This commit is contained in:
Max Gautier
2023-10-17 09:45:11 +02:00
committed by GitHub
parent 8cce6df80a
commit 401ea552c2
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
galaxy.yml
View File

@@ -9,6 +9,8 @@ authors:
tags: tags:
- infrastructure - infrastructure
repository: https://github.com/kubernetes-sigs/kubespray repository: https://github.com/kubernetes-sigs/kubespray
dependencies:
ansible.utils: '>=2.5.0'
build_ignore: build_ignore:
- .github - .github
- '*.tar.gz' - '*.tar.gz'

2
roles/kubernetes/control-plane/tasks/kubeadm-setup.yml
View File

@@ -110,7 +110,7 @@
- name: Kubeadm | Check apiserver.crt SANs - name: Kubeadm | Check apiserver.crt SANs
vars: 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) }}" apiserver_hosts: "{{ apiserver_sans | difference(apiserver_ips) }}"
when: when:
- kubeadm_already_run.stat.exists - kubeadm_already_run.stat.exists

2
roles/kubernetes/preinstall/tasks/0020-set_facts.yml
View File

@@ -79,7 +79,7 @@
- name: Get currently configured nameservers - name: Get currently configured nameservers
set_fact: 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 when: resolvconf_slurp.content is defined
- name: Stop if /etc/resolv.conf not configured nameservers - name: Stop if /etc/resolv.conf not configured nameservers

8
roles/kubernetes/preinstall/tasks/0040-verify-settings.yml
View File

@@ -166,28 +166,28 @@
- name: "Check that kube_service_addresses is a network range" - name: "Check that kube_service_addresses is a network range"
assert: assert:
that: 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" msg: "kube_service_addresses = '{{ kube_service_addresses }}' is not a valid network range"
run_once: yes run_once: yes
- name: "Check that kube_pods_subnet is a network range" - name: "Check that kube_pods_subnet is a network range"
assert: assert:
that: 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" msg: "kube_pods_subnet = '{{ kube_pods_subnet }}' is not a valid network range"
run_once: yes run_once: yes
- name: "Check that kube_pods_subnet does not collide with kube_service_addresses" - name: "Check that kube_pods_subnet does not collide with kube_service_addresses"
assert: assert:
that: 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" msg: "kube_pods_subnet cannot be the same network segment as kube_service_addresses"
run_once: yes run_once: yes
- name: "Check that IP range is enough for the nodes" - name: "Check that IP range is enough for the nodes"
assert: assert:
that: 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." msg: "Not enough IPs are available for the desired node count."
when: kube_network_plugin != 'calico' when: kube_network_plugin != 'calico'
run_once: yes run_once: yes

4
roles/network_plugin/calico/tasks/install.yml
View File

@@ -87,7 +87,7 @@
- name: Calico | Ensure that calico_pool_cidr is within kube_pods_subnet when defined - name: Calico | Ensure that calico_pool_cidr is within kube_pods_subnet when defined
assert: 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 }}" msg: "{{ calico_pool_cidr }} is not within or equal to {{ kube_pods_subnet }}"
when: when:
- inventory_hostname == groups['kube_control_plane'][0] - 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 - name: Calico | Ensure that calico_pool_cidr_ipv6 is within kube_pods_subnet_ipv6 when defined
assert: 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 }}" msg: "{{ calico_pool_cidr_ipv6 }} is not within or equal to {{ kube_pods_subnet_ipv6 }}"
when: when:
- inventory_hostname == groups['kube_control_plane'][0] - inventory_hostname == groups['kube_control_plane'][0]