External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-18 03:30:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ha_master' of https://github.com/ansibl8s/setup-kubernetes into ha

Browse Source
This commit is contained in:
ant31
2015-12-15 16:28:49 +01:00
parent f21f660cc5 43afd42f59
commit 693230ace9
8 changed files with 52 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
View File

@@ -15,7 +15,11 @@ spec:
{% if inventory_hostname in groups['kube-master'] %}
- --master=http://127.0.0.1:{{kube_apiserver_insecure_port}}
{% else %}
- --master=https://{{ groups['kube-master'][0] }}:{{kube_apiserver_port }}
{% if loadbalancer_apiserver.address is defined | default('') %}
- --master=https://{{ apiserver_loadbalancer_domain_name }}:{{ loadbalancer_apiserver.port }}
{% else %}
- --master=https://{{ groups['kube-master'][0] }}:{{ kube_apiserver_port }}
{% endif%}
- --kubeconfig=/etc/kubernetes/node-kubeconfig.yaml
{% endif %}
securityContext:

5
roles/kubernetes/node/templates/openssl.conf.j2
View File

@@ -10,12 +10,9 @@ subjectAltName = @alt_names
DNS.1 = kubernetes
DNS.2 = kubernetes.default
DNS.3 = kubernetes.default.svc.{{ dns_domain }}
DNS.4 = {{ apiserver_loadbalancer_domain_name }}
{% for host in groups['kube-master'] %}
IP.{{ loop.index }} = {{ hostvars[host]['ip'] | default(hostvars[host]['ansible_default_ipv4']['address']) }}
{% endfor %}
{% set idx = groups['kube-master'] | length | int + 1 %}
IP.{{ idx | string }} = {{ kube_apiserver_ip }}
{% if loadbalancer_address is defined | default('') %}
{% set idx = idx | int + 1 %}
IP.{{ idx | string }} = {{ loadbalancer_address }}
{% endif %}