Browse Source

Improving PR 6473 (#7259)

pull/7290/head
stress-t 3 years ago
committed by GitHub
parent
commit
796d3fb975
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
  1. 5
      inventory/sample/group_vars/all/all.yml
  2. 2
      roles/kubespray-defaults/defaults/main.yaml

5
inventory/sample/group_vars/all/all.yml

@ -27,6 +27,11 @@ bin_dir: /usr/local/bin
# valid options are "nginx" or "haproxy" # valid options are "nginx" or "haproxy"
# loadbalancer_apiserver_type: nginx # valid values "nginx" or "haproxy" # loadbalancer_apiserver_type: nginx # valid values "nginx" or "haproxy"
## If the cilium is going to be used in strict mode, we can use the
## localhost connection and not use the external LB. If this parameter is
## not specified, the first node to connect to kubeapi will be used.
# use_localhost_as_kubeapi_loadbalancer: true
## Local loadbalancer should use this port ## Local loadbalancer should use this port
## And must be set port 6443 ## And must be set port 6443
loadbalancer_apiserver_port: 6443 loadbalancer_apiserver_port: 6443

2
roles/kubespray-defaults/defaults/main.yaml

@ -464,6 +464,8 @@ apiserver_loadbalancer_domain_name: "lb-apiserver.kubernetes.local"
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 }}:{{ loadbalancer_apiserver.port|default(kube_apiserver_port) }}
{%- elif use_localhost_as_kubeapi_loadbalancer is defined -%}
https://127.0.0.1:{{ kube_apiserver_port }}
{%- else -%} {%- else -%}
https://{{ first_kube_master }}:{{ kube_apiserver_port }} https://{{ first_kube_master }}:{{ kube_apiserver_port }}
{%- endif %} {%- endif %}

Loading…
Cancel
Save