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

README.md

@@ -35,6 +35,7 @@ Edit the inventory according to the number of servers
 [etcd]
 10.115.99.31
 10.115.99.32
+10.115.99.33
 
 [kube-node]
 10.115.99.32
@@ -82,6 +83,7 @@ In node-mesh mode the nodes peers with all the nodes in order to exchange routes
 
 [etcd]
 10.99.0.26
+10.99.0.4
 10.99.0.59
 
 [kube-node]

environments/test/group_vars/all.yml

@@ -69,3 +69,18 @@ dns_domain: "{{ cluster_name }}"
 #
 # # Ip address of the kubernetes dns service
 dns_server: "{{ kube_service_addresses|ipaddr('net')|ipaddr(253)|ipaddr('address') }}"
+
+# For multi masters architecture:
+# kube-proxy doesn't support multiple apiservers for the time being so you'll need to configure your own loadbalancer
+# This domain name will be inserted into the /etc/hosts file of all servers
+# configurationexample with haproxy :
+# lissten kubernetes-apiserver-https
+#   bind 10.99.0.21:8383
+#    option ssl-hello-chk
+#    mode tcp
+#    timeout client 3h
+#    timeout server 3h
+#    server master1 10.99.0.26:443
+#    server master2 10.99.0.27:443
+#    balance roundrobin
+apiserver_loadbalancer_domain_name: "lb-apiserver.kubernetes.local"

environments/test/group_vars/new-york.yml

@@ -0,0 +1,10 @@
+---
+peers:
+  -router_id: "10.99.0.34"
+   as: "65xxx"
+  - router_id: "10.99.0.35"
+   as: "65xxx"
+
+loadbalancer_apiserver:
+  address: "10.99.0.44"
+  port: "8383"

environments/test/group_vars/paris.yml

@@ -0,0 +1,10 @@
+---
+peers:
+  -router_id: "10.99.0.2"
+   as: "65xxx"
+  - router_id: "10.99.0.3"
+   as: "65xxx"
+
+loadbalancer_apiserver:
+  address: "10.99.0.21"
+  port: "8383"

environments/test/inventory.example

@@ -17,18 +17,10 @@
 10.99.0.4 local_as=xxxxxxxx
 10.99.0.5 local_as=xxxxxxxx
 
-[usa]
+[new-york]
 10.99.0.36 local_as=xxxxxxxx
 10.99.0.37 local_as=xxxxxxxx
 
 [k8s-cluster:children]
 kube-node
 kube-master
-
-[paris:vars]
-peers=[{"router_id": "10.99.0.2", "as": "65xxx"}, {"router_id": "10.99.0.3", "as": "65xxx"}]
-loadbalancer_address="10.99.0.24"
-
-[usa:vars]
-peers=[{"router_id": "10.99.0.34", "as": "65xxx"}, {"router_id": "10.99.0.35", "as": "65xxx"}]
-loadbalancer_address="10.99.0.44"

roles/dnsmasq/tasks/main.yml

@@ -8,6 +8,14 @@
   when: hostvars[item].ansible_default_ipv4.address is defined
   with_items: groups['all']
 
+- name: populate kubernetes loadbalancer address into hosts file
+  lineinfile:
+    dest: /etc/hosts
+    regexp: ".*{{ apiserver_loadbalancer_domain_name }}$"
+    line: "{{ loadbalancer_apiserver.address }} lb-apiserver.kubernetes.local"
+    state: present
+  when: loadbalancer_apiserver is defined
+
 - name: clean hosts file
   lineinfile:
     dest: /etc/hosts

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

@@ -14,8 +14,12 @@ spec:
     - --v={{ kube_log_level | default('2') }}
 {% if inventory_hostname in groups['kube-master'] %}
     - --master=http://127.0.0.1:{{kube_apiserver_insecure_port}}
+{% else %}
+{%   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:

roles/kubernetes/node/templates/openssl.conf.j2

@@ -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 %}