diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2018-01-20 19:29:19 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2018-01-20 19:29:19 +0100 |
| commit | 196c5df5795c88379da30a522288233da77fb53c (patch) | |
| tree | f4de2ae7dad8b2548c82fdebcf8a25eb3bed5334 | |
| parent | initial version of the kubernetes master role (diff) | |
master taint handling works now
| -rw-r--r-- | roles/kubernetes-master/tasks/main.yml | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/roles/kubernetes-master/tasks/main.yml b/roles/kubernetes-master/tasks/main.yml index c0841585..64634781 100644 --- a/roles/kubernetes-master/tasks/main.yml +++ b/roles/kubernetes-master/tasks/main.yml @@ -10,25 +10,34 @@ kube_bootstrap_token: "{{ kubeadm_token_generate.stdout }}" - name: set up kubernetes master - command: "kubeadm init --pod-network-cidr {{ kubernetes.pod_ip_range }} --service-cidr {{ kubernetes.service_ip_range }} {% if kubernetes.api_extra_sans | length > 0 %}--apiserver-cert-extra-sans {{ kubernetes.api_extra_sans | join(',') }}{% endif %} --token '{{ kube_bootstrap_token }}' --token-ttl 42m" + command: "kubeadm init --pod-network-cidr {{ kubernetes.pod_ip_range }} --service-cidr {{ kubernetes.service_ip_range }} {% if kubernetes.api_extra_sans | length > 0 %}--apiserver-cert-extra-sans {{ kubernetes.api_extra_sans | join(',') }}{% endif %} --token '{{ kube_bootstrap_token }}' --token-ttl 42m --skip-token-print" args: creates: /etc/kubernetes/pki/ca.crt register: kubeadm_init -- name: print result of kubeadm init +- name: dump output of kubeadm init to log file when: kubeadm_init.changed - debug: - var: kubeadm_init.stdout + copy: + content: "{{ kubeadm_init.stdout }}\n" + dest: /etc/kubernetes/kubeadm-init.log -## TODO: check if the taint is set or not before taking any action +- name: check if master is tainted (1/2) + command: "kubectl --kubeconfig /etc/kubernetes/admin.conf get node {{ inventory_hostname }} -o json" + check_mode: no + register: kubectl_get_node + changed_when: False -# - name: remove taint from master node -# when: kubernetes.dedicated_master == False -# command: kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes --all node-role.kubernetes.io/master- +- name: check if master is tainted (2/2) + set_fact: + 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: add taint for master node -# when: kubernetes.dedicated_master == True -# command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ ansible_nodename }} node-role.kubernetes.io/master='':NoSchedule" +- 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- + +- 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: @@ -38,6 +47,7 @@ - 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/^.* //'" register: kube_ca_openssl + changed_when: False - name: set ca digest fact set_fact: |