From b6b0f3f05a19336f5910b9f72ef75f48104b5f35 Mon Sep 17 00:00:00 2001
From: Adrien <adrien@reslinger.net>
Date: Tue, 16 Jul 2019 19:32:00 +0200
Subject: [PATCH] fix test and prepare for add server

---
 tasks/install_server.yml | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/tasks/install_server.yml b/tasks/install_server.yml
index 69e5aea..87255b2 100644
--- a/tasks/install_server.yml
+++ b/tasks/install_server.yml
@@ -77,16 +77,16 @@
   when:
     - groups['KubernetesMasterConfigured'] is not defined
     - groups['KubernetesMasters'][0] == ansible_hostname
-    - kubeadm_version_major.rc == 1
-    - kubeadm_version_minor.rc > 15
+    - kubeadm_version_major.stdout | int == 1
+    - kubeadm_version_minor.stdout | int >= 15
 
 - name: Init Kubernetes on {{ groups['KubernetesMasters'][0] }}
   command: kubeadm init --config=kubeadm-config.yaml --upload-certs --apiserver-advertise-address={{ ansible_host }} --ignore-preflight-errors=SystemVerification
   when:
     - groups['KubernetesMasterConfigured'] is not defined
     - groups['KubernetesMasters'][0] == ansible_hostname
-    - kubeadm_version_major.rc == 1
-    - kubeadm_version_minor.rc > 15
+    - kubeadm_version_major.stdout | int == 1
+    - kubeadm_version_minor.stdout | int >= 15
 
 - name: Create KubernetesMasterConfigured group
   group_by: key=KubernetesMasterConfigured
@@ -101,28 +101,42 @@
   changed_when: False
   ignore_errors: yes
 
+# kubeadm init phase upload-certs --upload-certs
+
 - name: Deploy kubeadm config
   template:
-    src: kubeadmin-config.yaml.j2
-    dest: /root/kubeadmin-config.yaml
+    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.rc == 1
-    - kubeadm_version_minor.rc > 15
+    - kubeadm_version_major.stdout | int == 1
+    - kubeadm_version_minor.stdout | int >= 15
     - server_enrolled.rc == 1
 
-# Retreive token and hash to join from master
+- name: Retreive token on "{{ groups['KubernetesMasterConfigured'][0] }}"
+  command: kubeadm token create
+  register: kubetoken
+  delegate_to: "{{ groups['KubernetesMasterConfigured'][0] }}"
+  when:
+    - server_enrolled.rc == 1
+
+- 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
+  delegate_to: "{{ groups['KubernetesMasterConfigured'][0] }}"
+  when:
+    - server_enrolled.rc == 1
 
 - name: Join '{{ ansible_hostname }}' to Kubernetes cluster
-  command: kubeadm init --config=kubeadm-config.yaml
+  command: kubeadm join --config=kubeadm-config.yaml --token {{ kubetoken.stdout }} --discovery-token-ca-cert-hash sha256:{{ hashcert.stdout }} --ignore-preflight-errors=SystemVerification
   when:
     - groups['KubernetesMasterConfigured'] is not defined
     - groups['KubernetesMasters'][0] == ansible_hostname
-    - kubeadm_version_major.rc == 1
-    - kubeadm_version_minor.rc > 15
+    - kubeadm_version_major.stdout | int == 1
+    - kubeadm_version_minor.stdout | int >= 15
     - server_enrolled.rc == 1
 
 #- name: Extend Master services on unconfigured hosts