From b4dd8b4313f8519a1db4aa0db97fa302dc5f0062 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Mon, 22 Jan 2024 18:20:44 +0100
Subject: [PATCH] Hopefully final batches of ipaddr deprecation cleanup
(#10822)
---
inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml | 6 +++---
playbooks/ansible_version.yml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
index 118e1ff8f..68233b4c8 100644
--- a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
+++ b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
@@ -117,7 +117,7 @@ kube_pods_subnet_ipv6: fd85:ee78:d8a6:8607::1:0000/112
kube_network_node_prefix_ipv6: 120
# The port the API Server will be listening on.
-kube_apiserver_ip: "{{ kube_service_addresses | ipaddr('net') | ipaddr(1) | ipaddr('address') }}"
+kube_apiserver_ip: "{{ kube_service_addresses | ansible.utils.ipaddr('net') | ansible.utils.ipaddr(1) | ansible.utils.ipaddr('address') }}"
kube_apiserver_port: 6443 # (https)
# Kube-proxy proxyMode configuration.
@@ -219,8 +219,8 @@ resolvconf_mode: host_resolvconf
# Deploy netchecker app to verify DNS resolve as an HTTP service
deploy_netchecker: false
# Ip address of the kubernetes skydns service
-skydns_server: "{{ kube_service_addresses | ipaddr('net') | ipaddr(3) | ipaddr('address') }}"
-skydns_server_secondary: "{{ kube_service_addresses | ipaddr('net') | ipaddr(4) | ipaddr('address') }}"
+skydns_server: "{{ kube_service_addresses | ansible.utils.ipaddr('net') | ansible.utils.ipaddr(3) | ansible.utils.ipaddr('address') }}"
+skydns_server_secondary: "{{ kube_service_addresses | ansible.utils.ipaddr('net') | ansible.utils.ipaddr(4) | ansible.utils.ipaddr('address') }}"
dns_domain: "{{ cluster_name }}"
## Container runtime
diff --git a/playbooks/ansible_version.yml b/playbooks/ansible_version.yml
index f6cebdff7..1fea52356 100644
--- a/playbooks/ansible_version.yml
+++ b/playbooks/ansible_version.yml
@@ -21,7 +21,7 @@
- name: "Check that python netaddr is installed"
assert:
msg: "Python netaddr is not present"
- that: "'127.0.0.1' | ipaddr"
+ that: "'127.0.0.1' | ansible.utils.ipaddr"
tags:
- check
--
GitLab