Little fix for nodes

This commit is contained in:
Adrien Reslinger 2020-05-23 03:00:02 +02:00
parent 56bb742890
commit 5b9b446709
2 changed files with 23 additions and 23 deletions

View file

@ -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