1 files changed, 31 insertions, 77 deletions
diff --git a/roles/kubernetes/kubeadm/master/tasks/main.yml b/roles/kubernetes/kubeadm/master/tasks/main.yml
index 7cc6fe94..9af041b2 100644
--- a/roles/kubernetes/kubeadm/master/tasks/main.yml
+++ b/roles/kubernetes/kubeadm/master/tasks/main.yml
@@ -1,67 +1,25 @@
 ---
-- name: check if kubeconfig admin.conf already exists
-  stat:
-    path: /etc/kubernetes/admin.conf
-  register: kubeconfig_admin_stats
+# - name: create direcotry for encryption config
+#   file:
+#     name: /etc/kubernetes/encryption
+#     state: directory
+#     mode: 0700
 
-### cluster not yet initialized
+# - name: install encryption config
+#   template:
+#     src: encryption-config.j2
+#     dest: /etc/kubernetes/encryption/config
+#     mode: 0600
 
-- name: create new cluster
-  when: kubeconfig_admin_stats.stat.exists == False
-  block:
 
-  - name: generate bootstrap token for new cluster
-    command: kubeadm token generate
-    changed_when: False
-    check_mode: no
-    register: kubeadm_token_generate
+- name: install primary master
+  include_tasks: primary-master.yml
+  when: "'_kubernetes_primary_master_' in group_names"
 
-  - name: create kubernetes config directory
-    file:
-      path: /etc/kubernetes
-      state: directory
+- name: install secondary masters
+  include_tasks: secondary-masters.yml
+  when: "'_kubernetes_primary_master_' not in group_names"
 
-    ## TODO test whether the generated cluster configs really works - since it has never been used...
-  - name: install cluster config for kubeadm
-    template:
-      src: kubeadm-cluster.config.j2
-      dest: /etc/kubernetes/kubeadm-cluster.config
-
-  - name: set up kubernetes master
-    command: "kubeadm init --config '/etc/kubernetes/kubeadm-cluster.config' --token '{{ kubeadm_token_generate.stdout }}' --token-ttl 42m --skip-token-print"
-    args:
-      creates: /etc/kubernetes/pki/ca.crt
-    register: kubeadm_init
-
-  - name: dump output of kubeadm init to log file
-    when: kubeadm_init.changed
-    copy:
-      content: "{{ kubeadm_init.stdout }}\n"
-      dest: /etc/kubernetes/kubeadm-init.log
-
-### cluster is already initialized
-
-- name: prepare cluster for new nodes
-  when: kubeconfig_admin_stats.stat.exists == True
-  block:
-
-  - name: fetch list of current nodes
-    command: kubectl get nodes -o name
-    changed_when: False
-    check_mode: no
-    register: kubectl_node_list
-
-  - name: save list of current nodes
-    set_fact:
-      kubernetes_current_nodes: "{{ kubectl_node_list.stdout_lines | map('replace', 'node/', '') | list }}"
-
-  - name: create bootstrap token for existing cluster
-    when: kubernetes_nodes | difference(kubernetes_current_nodes) | length > 0
-    command: kubeadm token create --ttl 42m
-    check_mode: no
-    register: kubeadm_token_create
-
-##
 
 - name: check if master is tainted (1/2)
   command: "kubectl --kubeconfig /etc/kubernetes/admin.conf get node {{ inventory_hostname }} -o json"
@@ -74,28 +32,13 @@
     kube_node_taints: "{% set node_info = kubectl_get_node.stdout | from_json %}{%if node_info.spec.taints is defined %}{{ node_info.spec.taints | map(attribute='key') | list }}{% endif %}"
 
 - name: remove taint from master node
-  when: "kubernetes.dedicated_master == False and 'node-role.kubernetes.io/master' in kube_node_taints"
-  command: kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes --all node-role.kubernetes.io/master-
+  when: not kubernetes.dedicated_master and 'node-role.kubernetes.io/master' in kube_node_taints
+  command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ inventory_hostname }} node-role.kubernetes.io/master-"
 
 - name: add taint for master node
-  when: "kubernetes.dedicated_master == True and 'node-role.kubernetes.io/master' not in kube_node_taints"
-  command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ ansible_nodename }} node-role.kubernetes.io/master='':NoSchedule"
-
-- name: install openssl
-  apt:
-    name: openssl
-    state: present
+  when: kubernetes.dedicated_master and 'node-role.kubernetes.io/master' not in kube_node_taints
+  command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ inventory_hostname }} node-role.kubernetes.io/master='':NoSchedule"
 
-- name: get ca certificate digest
-  shell: "openssl x509 -pubkey -in /etc/kubernetes/pki/ca.crt | openssl rsa -pubin -outform der 2>/dev/null | openssl dgst -sha256 -hex | sed 's/^.* //'"
-  check_mode: no
-  register: kube_ca_openssl
-  changed_when: False
-
-- name: set variables needed by kubernetes/nodes to join the cluster
-  set_fact:
-    kube_bootstrap_token: "{% if kubeadm_token_generate.stdout is defined %}{{ kubeadm_token_generate.stdout }}{% elif kubeadm_token_create.stdout is defined %}{{ kubeadm_token_create.stdout }}{% endif %}"
-    kube_bootstrap_ca_cert_hash: "sha256:{{ kube_ca_openssl.stdout }}"
 
 - name: prepare kubectl (1/2)
   file:
@@ -107,3 +50,14 @@
     dest: /root/.kube/config
     src: /etc/kubernetes/admin.conf
     state: link
+
+- name: add kubectl completion config for shells
+  with_items:
+    - zsh
+    - bash
+  blockinfile:
+    path: "/root/.{{ item }}rc"
+    create: yes
+    marker: "### {mark} ANSIBLE MANAGED BLOCK for kubectl ###"
+    content: |
+      source <(kubectl completion {{ item }})