From 5b9b446709d76e025052c3cc62035327b26fc054 Mon Sep 17 00:00:00 2001
From: Adrien <adrien@reslinger.net>
Date: Sat, 23 May 2020 03:00:02 +0200
Subject: [PATCH] Little fix for nodes

---
 tasks/install_server.yml         | 36 ++++++++++++++++----------------
 templates/kubeadm-config.yaml.j2 | 10 ++++-----
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/tasks/install_server.yml b/tasks/install_server.yml
index 42f7b07..9047a18 100644
--- a/tasks/install_server.yml
+++ b/tasks/install_server.yml
@@ -148,26 +148,26 @@
   changed_when: False
   ignore_errors: yes
 
-- name: Deploy kubeadm config
-  template:
-    src: kubeadm-config.yaml.j2
-    dest: /root/kubeadm-config.yaml
-    owner: root
-    group: root
-    mode: 600
-  when:
-    - not groups['KubernetesMasters'][0] == ansible_hostname
-    - kubeadm_version_major.stdout | int == 1
-    - kubeadm_version_minor.stdout | int >= 15
-    - server_enrolled.rc == 1
+#- name: Deploy kubeadm config
+#  template:
+#    src: kubeadm-config.yaml.j2
+#    dest: /root/kubeadm-config.yaml
+#    owner: root
+#    group: root
+#    mode: 600
+#  when:
+#    - not groups['KubernetesMasters'][0] == ansible_hostname
+#    - kubeadm_version_major.stdout | int == 1
+#    - kubeadm_version_minor.stdout | int >= 15
+#    - server_enrolled.rc == 1
 
 - name: Retreive certificats key on {{ lb_kubemaster }}
   shell: kubeadm init phase upload-certs --upload-certs | grep -v upload-certs
-  register: kubecertskey
+  register: kubernetes_certificateKey
   delegate_to: "{{ lb_kubemaster }}"
   when:
     - server_enrolled.rc == 1
-    - kubernetes_master == true
+    - kubernetes_master|bool
     - kubeadm_version_major.stdout | int == 1
     - kubeadm_version_minor.stdout | int >= 15
 
@@ -180,7 +180,7 @@
 
 - name: Retreive hash certificat
   shell: openssl x509 -pubkey -in /etc/kubernetes/pki/ca.crt | openssl rsa -pubin -outform der 2>/dev/null | openssl dgst -sha256 -hex | sed 's/^.* //'
-  register: hashcert
+  register: cacerthash
   delegate_to: "{{ lb_kubemaster }}"
   when:
     - server_enrolled.rc == 1
@@ -203,14 +203,14 @@
     - server_enrolled.rc == 1
 
 - name: Check if a node is still tainted
-  command: kubectl --kubeconfig=/etc/kubernetes/admin.conf get nodes '{{ ansible_host | lower }}' -o jsonpath='{.spec.taints}'
+  command: kubectl --kubeconfig=/etc/kubernetes/admin.conf get nodes '{{ ansible_hostname | lower }}' -o jsonpath='{.spec.taints}'
   when: kubernetes_master_taint
   register: current_taint
 
 - name: taint the machine if needed
 #  command: kubectl --kubeconfig=/etc/kubernetes/admin.conf taint nodes --all node-role.kubernetes.io/master-
-  command: kubectl --kubeconfig=/etc/kubernetes/admin.conf taint nodes '{{ ansible_host | lower }}' node-role.kubernetes.io/master-
-  when: kubernetes_master_taint == true and current_taint.stdout
+  command: kubectl --kubeconfig=/etc/kubernetes/admin.conf taint nodes '{{ ansible_hostname | lower }}' node-role.kubernetes.io/master-
+  when: kubernetes_master_taint|bool and current_taint.stdout
       
 #
 # At this point, we have a kubernetes up and running, but ready for it
diff --git a/templates/kubeadm-config.yaml.j2 b/templates/kubeadm-config.yaml.j2
index e4923d1..690ded3 100644
--- a/templates/kubeadm-config.yaml.j2
+++ b/templates/kubeadm-config.yaml.j2
@@ -1,6 +1,6 @@
 apiVersion: kubeadm.k8s.io/v1beta2
 kind: InitConfiguration
-{% if kubetoken is defined %} %}
+{% if kubetoken is defined %}
 bootstrapTokens:
 - token: "{{ kubetoken.stdout }}"
   description: "kubeadm bootstrap token"
@@ -40,18 +40,19 @@ nodeRegistration:
 localAPIEndpoint:
   advertiseAddress: "{{ ansible_default_ipv4.address }}"
   bindPort: 6443
-{% if kubernetes_certificateKey is defined %}
+{% if kubernetes_master|bool %}
 certificateKey: "{{ kubernetes_certificateKey.stdout }}"
 {% endif %}
-{% if kubecertskey is defined %}
 ---
 apiVersion: kubeadm.k8s.io/v1beta2
 kind: JoinConfiguration
+{% if kubernetes_master|bool %}
 controlPlane:
   localAPIEndpoint:
     advertiseAddress: "{{ ansible_default_ipv4.address }}"
     bindPort: 6443
-  certificateKey: "{{ kubecertskey.stdout }}"
+  certificateKey: "{{ kubernetes_certificateKey.stdout }}"
+{% endif %}
 discovery:
   bootstrapToken:
     apiServerEndpoint: "{{ lb_kubemaster }}:6443"
@@ -64,7 +65,6 @@ nodeRegistration:
     read-only-port: "10255"
   ignorePreflightErrors:
   - SystemVerification
-{% endif %}
 ---
 apiVersion: kubeadm.k8s.io/v1beta1
 kind: ClusterConfiguration