Browse Source

Hopefully final batches of ipaddr deprecation cleanup (#10822)

pull/10830/head
Max Gautier 10 months ago
committed by GitHub
parent
commit
b4dd8b4313
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
  1. 6
      inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
  2. 2
      playbooks/ansible_version.yml

6
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

2
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

Loading…
Cancel
Save