epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-04 08:48:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12872 from VannTen/fix/defaut_lb_address

Browse Source 
Use loadbalancer IP as default apiserver endpoint if no LB hostname is used
This commit is contained in:
Kubernetes Prow Robot
2026-01-19 21:45:50 +05:30
committed by GitHub
parent a277cfdee7 6b5cc5bdfb
commit 62e90b3122
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/etcd/templates/openssl.conf.j2
View File

@@ -32,9 +32,6 @@ DNS.{{ counter["dns"] }} = {{ hostvars[host]['etcd_access_address'] }}{{ increme
{# This will always expand to inventory_hostname, which can be a completely arbitrary name, that etcd will not know or care about, hence this line is (probably) redundant. #} {# This will always expand to inventory_hostname, which can be a completely arbitrary name, that etcd will not know or care about, hence this line is (probably) redundant. #}
DNS.{{ counter["dns"] }} = {{ host }}{{ increment(counter, 'dns') }} DNS.{{ counter["dns"] }} = {{ host }}{{ increment(counter, 'dns') }}
{% endfor %} {% endfor %}
{% if apiserver_loadbalancer_domain_name is defined %}
DNS.{{ counter["dns"] }} = {{ apiserver_loadbalancer_domain_name }}{{ increment(counter, 'dns') }}
{% endif %}
{% for etcd_alt_name in etcd_cert_alt_names %} {% for etcd_alt_name in etcd_cert_alt_names %}
DNS.{{ counter["dns"] }} = {{ etcd_alt_name }}{{ increment(counter, 'dns') }} DNS.{{ counter["dns"] }} = {{ etcd_alt_name }}{{ increment(counter, 'dns') }}
{% endfor %} {% endfor %}

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

@@ -90,7 +90,7 @@
# Nginx LB(default), If kubeadm_config_api_fqdn is defined, use other LB by kubeadm controlPlaneEndpoint. # Nginx LB(default), If kubeadm_config_api_fqdn is defined, use other LB by kubeadm controlPlaneEndpoint.
- name: Set kubeadm_config_api_fqdn define - name: Set kubeadm_config_api_fqdn define
set_fact: set_fact:
kubeadm_config_api_fqdn: "{{ apiserver_loadbalancer_domain_name | default('lb-apiserver.kubernetes.local') }}" kubeadm_config_api_fqdn: "{{ apiserver_loadbalancer_domain_name }}"
when: loadbalancer_apiserver is defined when: loadbalancer_apiserver is defined
- name: Kubeadm | Create kubeadm config - name: Kubeadm | Create kubeadm config

6
roles/kubespray_defaults/defaults/main/main.yml
View File

@@ -643,10 +643,10 @@ first_kube_control_plane_address: "{{ hostvars[groups['kube_control_plane'][0]][
loadbalancer_apiserver_localhost: "{{ loadbalancer_apiserver is not defined }}" loadbalancer_apiserver_localhost: "{{ loadbalancer_apiserver is not defined }}"
loadbalancer_apiserver_type: "nginx" loadbalancer_apiserver_type: "nginx"
# applied if only external loadbalancer_apiserver is defined, otherwise ignored # applied if only external loadbalancer_apiserver is defined, otherwise ignored
apiserver_loadbalancer_domain_name: "lb-apiserver.kubernetes.local" apiserver_loadbalancer_domain_name: "{{ 'localhost' if loadbalancer_apiserver_localhost else (loadbalancer_apiserver.address | d(undef())) }}"
kube_apiserver_global_endpoint: |- kube_apiserver_global_endpoint: |-
{% if loadbalancer_apiserver is defined -%} {% if loadbalancer_apiserver is defined -%}
https://{{ apiserver_loadbalancer_domain_name }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }} https://{{ apiserver_loadbalancer_domain_name | ansible.utils.ipwrap }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }}
{%- elif loadbalancer_apiserver_localhost -%} {%- elif loadbalancer_apiserver_localhost -%}
https://localhost:{{ loadbalancer_apiserver_port | default(kube_apiserver_port) }} https://localhost:{{ loadbalancer_apiserver_port | default(kube_apiserver_port) }}
{%- else -%} {%- else -%}
@@ -654,7 +654,7 @@ kube_apiserver_global_endpoint: |-
{%- endif %} {%- endif %}
kube_apiserver_endpoint: |- kube_apiserver_endpoint: |-
{% if loadbalancer_apiserver is defined -%} {% if loadbalancer_apiserver is defined -%}
https://{{ apiserver_loadbalancer_domain_name }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }} https://{{ apiserver_loadbalancer_domain_name | ansible.utils.ipwrap }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }}
{%- elif ('kube_control_plane' not in group_names) and loadbalancer_apiserver_localhost -%} {%- elif ('kube_control_plane' not in group_names) and loadbalancer_apiserver_localhost -%}
https://localhost:{{ loadbalancer_apiserver_port | default(kube_apiserver_port) }} https://localhost:{{ loadbalancer_apiserver_port | default(kube_apiserver_port) }}
{%- elif 'kube_control_plane' in group_names -%} {%- elif 'kube_control_plane' in group_names -%}

4
roles/network_facts/tasks/no_proxy.yml
View File

@@ -4,7 +4,7 @@
# noqa: jinja[spacing] # noqa: jinja[spacing]
no_proxy_prepare: >- no_proxy_prepare: >-
{%- if loadbalancer_apiserver is defined -%} {%- if loadbalancer_apiserver is defined -%}
{{ apiserver_loadbalancer_domain_name | default('') }}, {{ apiserver_loadbalancer_domain_name }},
{{ loadbalancer_apiserver.address | default('') }}, {{ loadbalancer_apiserver.address | default('') }},
{%- endif -%} {%- endif -%}
{%- if no_proxy_exclude_workers | default(false) -%} {%- if no_proxy_exclude_workers | default(false) -%}
@@ -32,7 +32,7 @@
- name: Populates no_proxy to all hosts - name: Populates no_proxy to all hosts
set_fact: set_fact:
no_proxy: "{{ hostvars.localhost.no_proxy_prepare }}" no_proxy: "{{ hostvars.localhost.no_proxy_prepare | select }}"
# noqa: jinja[spacing] # noqa: jinja[spacing]
proxy_env: "{{ proxy_env | combine({ proxy_env: "{{ proxy_env | combine({
'no_proxy': hostvars.localhost.no_proxy_prepare, 'no_proxy': hostvars.localhost.no_proxy_prepare,