From 7dbf0cae4e1a8d77e79b8aafd5bb08780977481f Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 11 Jan 2020 04:38:08 +0100
Subject: kubernetes: kubeadm/master node some more cleanup (WIP)

---
 roles/kubernetes/kubeadm/master/tasks/main.yml     | 22 +++++++++++-----------
 .../kubeadm/master/tasks/secondary-masters.yml     |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'roles/kubernetes/kubeadm/master/tasks')

diff --git a/roles/kubernetes/kubeadm/master/tasks/main.yml b/roles/kubernetes/kubeadm/master/tasks/main.yml
index 9ffdbeee..7f96ff6a 100644
--- a/roles/kubernetes/kubeadm/master/tasks/main.yml
+++ b/roles/kubernetes/kubeadm/master/tasks/main.yml
@@ -1,15 +1,15 @@
 ---
-- name: create direcotry for encryption config
-  file:
-    name: /etc/kubernetes/encryption
-    state: directory
-    mode: 0700
-
-- name: install encryption config
-  template:
-    src: encryption-config.j2
-    dest: /etc/kubernetes/encryption/config
-    mode: 0600
+# - name: create direcotry for encryption config
+#   file:
+#     name: /etc/kubernetes/encryption
+#     state: directory
+#     mode: 0700
+
+# - name: install encryption config
+#   template:
+#     src: encryption-config.j2
+#     dest: /etc/kubernetes/encryption/config
+#     mode: 0600
 
 
 - name: install primary master
diff --git a/roles/kubernetes/kubeadm/master/tasks/secondary-masters.yml b/roles/kubernetes/kubeadm/master/tasks/secondary-masters.yml
index f7e25fb4..fc85a37d 100644
--- a/roles/kubernetes/kubeadm/master/tasks/secondary-masters.yml
+++ b/roles/kubernetes/kubeadm/master/tasks/secondary-masters.yml
@@ -16,7 +16,7 @@
 
   - name: upload certs
     when: "groups['_kubernetes_masters_'] | map('extract', hostvars) | map(attribute='host_name') | difference(kubernetes_current_nodes) | length > 0"
-    command: kubeadm init phase upload-certs --experimental-upload-certs
+    command: kubeadm init phase upload-certs --upload-certs
     check_mode: no
     register: kubeadm_upload_certs
 
@@ -26,7 +26,7 @@
     kubeadm_upload_certs_key: "{% if kubeadm_upload_certs.stdout is defined %}{{ kubeadm_upload_certs.stdout_lines | last }}{% endif %}"
 
 - name: join kubernetes secondary master node
-  command: "kubeadm join 127.0.0.1:{{ kubernetes_api_lb_port | default('6443') }} --apiserver-bind-port 6442{% if kubernetes_cri_socket is defined %} --cri-socket {{ kubernetes_cri_socket }}{% endif %} --token '{{ kube_bootstrap_token }}' --discovery-token-ca-cert-hash '{{ kube_bootstrap_ca_cert_hash }}' --experimental-control-plane --certificate-key {{ kubeadm_upload_certs_key }}"
+  command: "kubeadm join {{ host_vars[groups['_kubernetes_primary_master_']].kubernetes_kubelet_node_ip }}:6443{% if kubernetes_cri_socket is defined %} --cri-socket {{ kubernetes_cri_socket }}{% endif %} --token '{{ kube_bootstrap_token }}' --discovery-token-ca-cert-hash '{{ kube_bootstrap_ca_cert_hash }}' --control-plane --certificate-key {{ kubeadm_upload_certs_key }}"
   args:
     creates: /etc/kubernetes/kubelet.conf
   register: kubeadm_join
-- 
cgit v1.2.3