Revert "Add HA/LB endpoints for kube-apiserver"

This reverts commit a70c3b661e.
This commit is contained in:
Matthew Mosesohn
2016-07-22 13:54:38 +03:00
parent 296eccd238
commit 7f212ca9cb
8 changed files with 37 additions and 104 deletions

View File

@@ -1,38 +1,4 @@
---
- set_fact: kube_apiserver_count="{{ groups['kube-master'] | length }}"
- set_fact: kube_apiserver_address="{{ ip | default(ansible_default_ipv4['address']) }}"
- set_fact: kube_apiserver_access_address="{{ access_ip | default(kube_apiserver_address) }}"
- set_fact:
kube_apiserver_insecure_bind_address: |-
{% if loadbalancer_apiserver_localhost %}
{{ kube_apiserver_address }}{% else %}127.0.0.1{% endif %}
- set_fact:
apiserver_access_port: |-
{% if loadbalancer_apiserver is defined and loadbalancer_apiserver.port is defined %}
{{ loadbalancer_apiserver.port }}{% else %}{{ kube_apiserver_port }}{% endif %}
- set_fact:
kube_apiserver_endpoint: |-
{% if loadbalancer_apiserver_localhost %}
https://127.0.0.1:{{ apiserver_access_port }}
{% else -%}
https://{{ apiserver_loadbalancer_domain_name|default(kube_apiserver_access_address) }}:{{ apiserver_access_port }}
{%- endif %}
- set_fact: kube_apiserver_insecure_endpoint="http://{{ kube_apiserver_insecure_bind_address }}:{{ kube_apiserver_insecure_port }}"
- set_fact:
kube_apiserver_access_endpoint: |-
{% if kube_apiserver_multiaccess %}
{% for host in groups['kube-master'] -%}
https://{{ hostvars[host].kube_apiserver_access_address }}:{{ kube_apiserver_port }}{% if not loop.last %},{% endif %}
{%- endfor %}
{% else %}{{ kube_apiserver_endpoint }}{% endif %}
- set_fact:
kube_apiserver_insecure_access_endpoint: |-
{% if kube_apiserver_multiaccess %}
{% for host in groups['kube-master'] -%}
https://{{ hostvars[host].kube_apiserver_insecure_bind_address }}:{{ kube_apiserver_insecure_port }}{% if not loop.last %},{% endif %}
{%- endfor %}
{% else %}{{ kube_apiserver_insecure_endpoint }}{% endif %}
- set_fact: etcd_address="{{ ip | default(ansible_default_ipv4['address']) }}"
- set_fact: etcd_access_address="{{ access_ip | default(etcd_address) }}"
- set_fact: etcd_peer_url="http://{{ etcd_access_address }}:2380"