epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add support for ipv6 only cluster via "enable_ipv6only_stack_networks…" (#11941)

Browse Source 
This reverts commit 76c0a3aa75.
This commit is contained in:
Antoine Legrand
2025-02-03 16:06:58 +01:00
committed by GitHub
parent 59e1638ae1
commit 4373c1be1d
37 changed files with 104 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/preinstall/tasks/0080-system-configurations.yml
View File

@@ -84,7 +84,7 @@
value: "1"
state: present
reload: true
when: (enable_dual_stack_networks or enable_ipv6only_stack_networks) | bool
when: enable_dual_stack_networks | bool
- name: Check if we need to set fs.may_detach_mounts
stat:

7
roles/kubernetes/preinstall/tasks/0090-etchosts.yml
View File

@@ -3,15 +3,10 @@
set_fact:
etc_hosts_inventory_block: |-
{% for item in (groups['k8s_cluster'] + groups['etcd'] | default([]) + groups['calico_rr'] | default([])) | unique -%}
{% if 'access_ip' in hostvars[item] or 'ip' in hostvars[item] or hostvars[item]['ansible_default_ipv4'] -%}
{% if 'access_ip' in hostvars[item] or 'ip' in hostvars[item] or 'ansible_default_ipv4' in hostvars[item] -%}
{{ hostvars[item]['access_ip'] | default(hostvars[item]['ip'] | default(hostvars[item]['ansible_default_ipv4']['address'])) }}
{%- if ('ansible_hostname' in hostvars[item] and item != hostvars[item]['ansible_hostname']) %} {{ hostvars[item]['ansible_hostname'] }}.{{ dns_domain }} {{ hostvars[item]['ansible_hostname'] }} {% else %} {{ item }}.{{ dns_domain }} {{ item }} {% endif %}
{% endif %}
{% if ('access_ip6' in hostvars[item] or 'ip6' in hostvars[item] or hostvars[item]['ansible_default_ipv6']) and (enable_ipv6only_stack_networks or enable_dual_stack_networks) -%}
{{ hostvars[item]['access_ip6'] | default(hostvars[item]['ip6'] | default(hostvars[item]['ansible_default_ipv6']['address'])) }}
{%- if ('ansible_hostname' in hostvars[item] and item != hostvars[item]['ansible_hostname']) %} {{ hostvars[item]['ansible_hostname'] }}.{{ dns_domain }} {{ hostvars[item]['ansible_hostname'] }} {% else %} {{ item }}.{{ dns_domain }} {{ item }} {% endif %}
{% endif %}
{% endfor %}
delegate_to: localhost