Browse Source

Add a variable that defaults to kube_apiserver_port that defines

the which port the local nginx proxy should listen on for HA
local balancer configurations.
pull/904/head
Greg Althaus 7 years ago
parent
commit
6905edbeb6
3 changed files with 4 additions and 2 deletions
  1. 2
      inventory/group_vars/all.yml
  2. 2
      roles/kubernetes/node/templates/nginx.conf.j2
  3. 2
      roles/kubernetes/preinstall/tasks/set_facts.yml

2
inventory/group_vars/all.yml

@ -127,6 +127,8 @@ peer_with_router: false
kube_apiserver_ip: "{{ kube_service_addresses|ipaddr('net')|ipaddr(1)|ipaddr('address') }}"
kube_apiserver_port: 443 # (https)
kube_apiserver_insecure_port: 8080 # (http)
# local loadbalancer should use this port instead - default to kube_apiserver_port
nginx_kube_apiserver_port: "{{ kube_apiserver_port }}"
# Internal DNS configuration.
# Kubernetes can create and mainatain its own DNS server to resolve service names

2
roles/kubernetes/node/templates/nginx.conf.j2

@ -16,7 +16,7 @@ stream {
}
server {
listen 127.0.0.1:{{ kube_apiserver_port }};
listen 127.0.0.1:{{ nginx_kube_apiserver_port }};
proxy_pass kube_apiserver;
proxy_timeout 10m;
proxy_connect_timeout 1s;

2
roles/kubernetes/preinstall/tasks/set_facts.yml

@ -10,7 +10,7 @@
- set_fact:
kube_apiserver_endpoint: |-
{% if not is_kube_master and loadbalancer_apiserver_localhost -%}
https://localhost:{{ kube_apiserver_port }}
https://localhost:{{ nginx_kube_apiserver_port }}
{%- elif is_kube_master and loadbalancer_apiserver is not defined -%}
http://127.0.0.1:{{ kube_apiserver_insecure_port }}
{%- else -%}

Loading…
Cancel
Save