From 18cb160be665edd8718d90f9c7c379c0d3283d78 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Fri, 10 Feb 2017 11:23:19 +0100 Subject: [PATCH] Align LB defaults with the HA docs Signed-off-by: Bogdan Dobrelya --- docs/ha-mode.md | 9 ++++----- docs/vars.md | 5 +++-- roles/kubernetes/node/tasks/main.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/ha-mode.md b/docs/ha-mode.md index c465479c2..5e5397939 100644 --- a/docs/ha-mode.md +++ b/docs/ha-mode.md @@ -15,8 +15,7 @@ The `etcd_access_endpoint` fact provides an access pattern for clients. And the `etcd_multiaccess` (defaults to `True`) group var controlls that behavior. It makes deployed components to access the etcd cluster members directly: `http://ip1:2379, http://ip2:2379,...`. This mode assumes the clients -do a loadbalancing and handle HA for connections. Note, a pod definition of a -flannel networking plugin always uses a single `--etcd-server` endpoint! +do a loadbalancing and handle HA for connections. Kube-apiserver @@ -28,7 +27,7 @@ non-master Kubernetes node. This is referred to as localhost loadbalancing. It is less efficient than a dedicated load balancer because it creates extra health checks on the Kubernetes apiserver, but is more practical for scenarios where an external LB or virtual IP management is inconvenient. This option is -configured by the variable `loadbalancer_apiserver_localhost` (defaults to `False`). +configured by the variable `loadbalancer_apiserver_localhost` (defaults to `True`). You may also define the port the local internal loadbalancer users by changing, `nginx_kube_apiserver_port`. This defaults to the value of `kube_apiserver_port`. It is also import to note that Kargo will only configure kubelet and kube-proxy @@ -89,9 +88,9 @@ Access endpoints are evaluated automagically, as the following: | Endpoint type | kube-master | non-master | |------------------------------|---------------|---------------------| -| Local LB | http://lc:p | https://lc:nsp | +| Local LB (default) | http://lc:p | https://lc:nsp | | External LB, no internal | https://lb:lp | https://lb:lp | -| No ext/int LB (default) | http://lc:p | https://m[0].aip:sp | +| No ext/int LB | http://lc:p | https://m[0].aip:sp | Where: * `m[0]` - the first node in the `kube-master` group; diff --git a/docs/vars.md b/docs/vars.md index 2e59f859c..b763f6a34 100644 --- a/docs/vars.md +++ b/docs/vars.md @@ -41,8 +41,9 @@ Some variables of note include: address instead of localhost for kube-masters and kube-master[0] for kube-nodes. See more details in the [HA guide](https://github.com/kubernetes-incubator/kargo/blob/master/docs/ha-mode.md). -* *loadbalancer_apiserver_localhost* - If enabled, all hosts will connect to - the apiserver internally load balanced endpoint. See more details in the +* *loadbalancer_apiserver_localhost* - makes all hosts to connect to + the apiserver internally load balanced endpoint. Mutual exclusive to the + `loadbalancer_apiserver`. See more details in the [HA guide](https://github.com/kubernetes-incubator/kargo/blob/master/docs/ha-mode.md). #### Cluster variables diff --git a/roles/kubernetes/node/tasks/main.yml b/roles/kubernetes/node/tasks/main.yml index 2c18937c9..cf20d16fb 100644 --- a/roles/kubernetes/node/tasks/main.yml +++ b/roles/kubernetes/node/tasks/main.yml @@ -8,7 +8,7 @@ tags: kubelet - include: nginx-proxy.yml - when: is_kube_master == false and loadbalancer_apiserver_localhost|default(false) + when: is_kube_master == false and loadbalancer_apiserver_localhost|default(true) tags: nginx - name: Write kubelet config file