From 8bbd3fa11cf84cb34094bed3d278a269cbeb7cc2 Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Sun, 7 Feb 2021 01:36:50 +0100
Subject: [PATCH] Fix deployment on multiple kubernetes clusters

---
 tasks/cluster_kubeadm.yml        | 9 +--------
 templates/kubeadm-config.yaml.j2 | 6 +++---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/tasks/cluster_kubeadm.yml b/tasks/cluster_kubeadm.yml
index d3afe88..c6fad27 100644
--- a/tasks/cluster_kubeadm.yml
+++ b/tasks/cluster_kubeadm.yml
@@ -228,7 +228,7 @@
 
   when:
     - groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
-    - groups['KubernetesMasters'][0] == ansible_hostname
+    - groups['KubernetesMasters_' ~ kubernetes_cluster_name][0] == ansible_hostname
 
 # End of first controler
 
@@ -238,8 +238,6 @@
   register: server_enrolled
   changed_when: False
   ignore_errors: yes
-  when:
-    - groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
 
 #- name: Deploy kubeadm config
 #  template:
@@ -257,7 +255,6 @@
   register: kubernetes_certificateKey
   delegate_to: "{{ lb_kubemaster }}"
   when:
-    - groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
     - server_enrolled.rc == 1
     - kubernetes_master|bool
 
@@ -266,7 +263,6 @@
   register: kubetoken
   delegate_to: "{{ lb_kubemaster }}"
   when:
-    - groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
     - server_enrolled.rc == 1
 
 - name: Retreive hash certificat
@@ -279,7 +275,6 @@
   register: cacerthash
   delegate_to: "{{ lb_kubemaster }}"
   when:
-    - groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
     - server_enrolled.rc == 1
 
 - name: Deploy kubeadm config
@@ -290,11 +285,9 @@
     group: root
     mode: 0600
   when:
-    - groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
     - server_enrolled.rc == 1
 
 - name: Join '{{ ansible_hostname }}' to Kubernetes cluster
   command: kubeadm join --config=/root/kubeadm-config.yaml
   when:
-    - groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
     - server_enrolled.rc == 1
diff --git a/templates/kubeadm-config.yaml.j2 b/templates/kubeadm-config.yaml.j2
index 9a95c08..bb99625 100644
--- a/templates/kubeadm-config.yaml.j2
+++ b/templates/kubeadm-config.yaml.j2
@@ -42,7 +42,7 @@ nodeRegistration:
 localAPIEndpoint:
   advertiseAddress: "{{ ansible_default_ipv4.address }}"
   bindPort: 6443
-{% if kubernetes_master|bool and groups['KubernetesMasterConfigured'] is defined %}
+{% if kubernetes_master|bool and groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is defined %}
 certificateKey: "{{ kubernetes_certificateKey.stdout }}"
 {% endif %}
 ---
@@ -53,14 +53,14 @@ controlPlane:
   localAPIEndpoint:
     advertiseAddress: "{{ ansible_default_ipv4.address }}"
     bindPort: 6443
-{% if groups['KubernetesMasterConfigured'] is defined %}
+{% if groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is defined %}
   certificateKey: "{{ kubernetes_certificateKey.stdout }}"
 {% endif %}
 {% endif %}
 discovery:
   bootstrapToken:
     apiServerEndpoint: "{{ lb_kubemaster }}:6443"
-{% if groups['KubernetesMasterConfigured'] is defined %}
+{% if groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is defined %}
     caCertHashes:
     - sha256:{{ cacerthash.stdout }} 
     token: "{{ kubetoken.stdout }}"