fix test and prepare for add server
This commit is contained in:
parent
2019ac846d
commit
b6b0f3f05a
1 changed files with 26 additions and 12 deletions
|
|
@ -77,16 +77,16 @@
|
||||||
when:
|
when:
|
||||||
- groups['KubernetesMasterConfigured'] is not defined
|
- groups['KubernetesMasterConfigured'] is not defined
|
||||||
- groups['KubernetesMasters'][0] == ansible_hostname
|
- groups['KubernetesMasters'][0] == ansible_hostname
|
||||||
- kubeadm_version_major.rc == 1
|
- kubeadm_version_major.stdout | int == 1
|
||||||
- kubeadm_version_minor.rc > 15
|
- kubeadm_version_minor.stdout | int >= 15
|
||||||
|
|
||||||
- name: Init Kubernetes on {{ groups['KubernetesMasters'][0] }}
|
- 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
|
command: kubeadm init --config=kubeadm-config.yaml --upload-certs --apiserver-advertise-address={{ ansible_host }} --ignore-preflight-errors=SystemVerification
|
||||||
when:
|
when:
|
||||||
- groups['KubernetesMasterConfigured'] is not defined
|
- groups['KubernetesMasterConfigured'] is not defined
|
||||||
- groups['KubernetesMasters'][0] == ansible_hostname
|
- groups['KubernetesMasters'][0] == ansible_hostname
|
||||||
- kubeadm_version_major.rc == 1
|
- kubeadm_version_major.stdout | int == 1
|
||||||
- kubeadm_version_minor.rc > 15
|
- kubeadm_version_minor.stdout | int >= 15
|
||||||
|
|
||||||
- name: Create KubernetesMasterConfigured group
|
- name: Create KubernetesMasterConfigured group
|
||||||
group_by: key=KubernetesMasterConfigured
|
group_by: key=KubernetesMasterConfigured
|
||||||
|
|
@ -101,28 +101,42 @@
|
||||||
changed_when: False
|
changed_when: False
|
||||||
ignore_errors: yes
|
ignore_errors: yes
|
||||||
|
|
||||||
|
# kubeadm init phase upload-certs --upload-certs
|
||||||
|
|
||||||
- name: Deploy kubeadm config
|
- name: Deploy kubeadm config
|
||||||
template:
|
template:
|
||||||
src: kubeadmin-config.yaml.j2
|
src: kubeadm-config.yaml.j2
|
||||||
dest: /root/kubeadmin-config.yaml
|
dest: /root/kubeadm-config.yaml
|
||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
mode: 600
|
mode: 600
|
||||||
when:
|
when:
|
||||||
- not groups['KubernetesMasters'][0] == ansible_hostname
|
- not groups['KubernetesMasters'][0] == ansible_hostname
|
||||||
- kubeadm_version_major.rc == 1
|
- kubeadm_version_major.stdout | int == 1
|
||||||
- kubeadm_version_minor.rc > 15
|
- kubeadm_version_minor.stdout | int >= 15
|
||||||
- server_enrolled.rc == 1
|
- 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
|
- 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:
|
when:
|
||||||
- groups['KubernetesMasterConfigured'] is not defined
|
- groups['KubernetesMasterConfigured'] is not defined
|
||||||
- groups['KubernetesMasters'][0] == ansible_hostname
|
- groups['KubernetesMasters'][0] == ansible_hostname
|
||||||
- kubeadm_version_major.rc == 1
|
- kubeadm_version_major.stdout | int == 1
|
||||||
- kubeadm_version_minor.rc > 15
|
- kubeadm_version_minor.stdout | int >= 15
|
||||||
- server_enrolled.rc == 1
|
- server_enrolled.rc == 1
|
||||||
|
|
||||||
#- name: Extend Master services on unconfigured hosts
|
#- name: Extend Master services on unconfigured hosts
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue