From c60ae1c34343cfd26b49f4258a47937bb89640bb Mon Sep 17 00:00:00 2001
From: Adrien <adrien@reslinger.net>
Date: Wed, 31 Jul 2019 19:06:46 +0200
Subject: [PATCH] Fix bug on lb_kubemaster

---
 tasks/install_server.yml                      | 44 ++++++++++---------
 .../etc/firewalld/services/kubernetes.xml.j2  |  8 ++--
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/tasks/install_server.yml b/tasks/install_server.yml
index a993f39..985a5b1 100644
--- a/tasks/install_server.yml
+++ b/tasks/install_server.yml
@@ -90,24 +90,6 @@
     - kubeadm_version_major.stdout | int == 1
     - kubeadm_version_minor.stdout | int >= 15
 
-# Because next command will fail
-- name: Make /root/.kube directory
-  file:
-    path: "/root/.kube"
-    owner: root
-    group: root
-    mode: 0700
-    state: directory
-
-- name: Copy certificat file on
-  copy:
-    src: /etc/kubernetes/admin.conf
-    dest: /root/.kube/config
-    remote_src: yes
-    owner: root
-    group: root
-    mode: 0600
-
 - name: Add {{ ansible_hostname }} to KubernetesMasterConfigured group
   group_by:
     key: KubernetesMasterConfigured
@@ -115,8 +97,13 @@
     - groups['KubernetesMasterConfigured'] is not defined
     - groups['KubernetesMasters'][0] == ansible_hostname
 
+- set_fact:
+    lb_kubemaster: "groups['KubernetesMasterConfigured'][0]"
+  when:
+    - groups['KubernetesMasters'] | length > 1
+
 - name: Test if server node already included
-  command: kubectl get nodes {{ ansible_hostname | lower }}
+  command: kubectl --kubeconfig=/etc/kubernetes/admin.conf get nodes {{ ansible_hostname | lower }}
   delegate_to: "{{ lb_kubemaster }}"
   register: server_enrolled
   changed_when: False
@@ -195,7 +182,22 @@
 #
 
 - name: Make /root/.kube directory
-  file: path="/root/.kube" owner=root group=root mode=0700 state=directory
+  file:
+    path: "/root/.kube"
+    owner: root
+    group: root
+    mode: 0700
+    state: directory
+  when:
+    - kubernetes_master == true
 
 - name: Copy certificat file on
-  copy: src=/etc/kubernetes/admin.conf dest=/root/.kube/config remote_src=yes owner=root group=root mode=0600
+  copy:
+    src: /etc/kubernetes/admin.conf
+    dest: /root/.kube/config
+    remote_src: yes
+    owner: root
+    group: root
+    mode: 0600
+  when:
+    - kubernetes_master == true
diff --git a/templates/etc/firewalld/services/kubernetes.xml.j2 b/templates/etc/firewalld/services/kubernetes.xml.j2
index b7a7f7a..cf477eb 100644
--- a/templates/etc/firewalld/services/kubernetes.xml.j2
+++ b/templates/etc/firewalld/services/kubernetes.xml.j2
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <service>
+  <short>Kubernetes</short>
+  <description>Open needed Kubernetes ports.</description>
 {% if kubernetes_master == true %}
-  <short>Kubernetes master</short>
-  <description>Open Kubernetes master ports.</description>
   <port protocol="tcp" port="6443"/>
   <port protocol="tcp" port="2379"/>
   <port protocol="tcp" port="2380"/>
@@ -11,9 +11,9 @@
   <port protocol="tcp" port="10252"/>
   <port protocol="tcp" port="10255"/>
 {% else %}
-  <short>Kubernetes node</short>
-  <description>Open Kubernetes node ports.</description>
+{% if kubernetes_master == true %}
   <port protocol="tcp" port="10250"/>
+{% endif %}
   <port protocol="tcp" port="80"/>
   <port protocol="tcp" port="443"/>
 {% endif %}