Fix deployment on multiple kubernetes clusters
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
2ce6678959
commit
8bbd3fa11c
2 changed files with 4 additions and 11 deletions
|
|
@ -228,7 +228,7 @@
|
||||||
|
|
||||||
when:
|
when:
|
||||||
- groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
|
- groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
|
||||||
- groups['KubernetesMasters'][0] == ansible_hostname
|
- groups['KubernetesMasters_' ~ kubernetes_cluster_name][0] == ansible_hostname
|
||||||
|
|
||||||
# End of first controler
|
# End of first controler
|
||||||
|
|
||||||
|
|
@ -238,8 +238,6 @@
|
||||||
register: server_enrolled
|
register: server_enrolled
|
||||||
changed_when: False
|
changed_when: False
|
||||||
ignore_errors: yes
|
ignore_errors: yes
|
||||||
when:
|
|
||||||
- groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
|
|
||||||
|
|
||||||
#- name: Deploy kubeadm config
|
#- name: Deploy kubeadm config
|
||||||
# template:
|
# template:
|
||||||
|
|
@ -257,7 +255,6 @@
|
||||||
register: kubernetes_certificateKey
|
register: kubernetes_certificateKey
|
||||||
delegate_to: "{{ lb_kubemaster }}"
|
delegate_to: "{{ lb_kubemaster }}"
|
||||||
when:
|
when:
|
||||||
- groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
|
|
||||||
- server_enrolled.rc == 1
|
- server_enrolled.rc == 1
|
||||||
- kubernetes_master|bool
|
- kubernetes_master|bool
|
||||||
|
|
||||||
|
|
@ -266,7 +263,6 @@
|
||||||
register: kubetoken
|
register: kubetoken
|
||||||
delegate_to: "{{ lb_kubemaster }}"
|
delegate_to: "{{ lb_kubemaster }}"
|
||||||
when:
|
when:
|
||||||
- groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
|
|
||||||
- server_enrolled.rc == 1
|
- server_enrolled.rc == 1
|
||||||
|
|
||||||
- name: Retreive hash certificat
|
- name: Retreive hash certificat
|
||||||
|
|
@ -279,7 +275,6 @@
|
||||||
register: cacerthash
|
register: cacerthash
|
||||||
delegate_to: "{{ lb_kubemaster }}"
|
delegate_to: "{{ lb_kubemaster }}"
|
||||||
when:
|
when:
|
||||||
- groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
|
|
||||||
- server_enrolled.rc == 1
|
- server_enrolled.rc == 1
|
||||||
|
|
||||||
- name: Deploy kubeadm config
|
- name: Deploy kubeadm config
|
||||||
|
|
@ -290,11 +285,9 @@
|
||||||
group: root
|
group: root
|
||||||
mode: 0600
|
mode: 0600
|
||||||
when:
|
when:
|
||||||
- groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
|
|
||||||
- server_enrolled.rc == 1
|
- server_enrolled.rc == 1
|
||||||
|
|
||||||
- name: Join '{{ ansible_hostname }}' to Kubernetes cluster
|
- name: Join '{{ ansible_hostname }}' to Kubernetes cluster
|
||||||
command: kubeadm join --config=/root/kubeadm-config.yaml
|
command: kubeadm join --config=/root/kubeadm-config.yaml
|
||||||
when:
|
when:
|
||||||
- groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined
|
|
||||||
- server_enrolled.rc == 1
|
- server_enrolled.rc == 1
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ nodeRegistration:
|
||||||
localAPIEndpoint:
|
localAPIEndpoint:
|
||||||
advertiseAddress: "{{ ansible_default_ipv4.address }}"
|
advertiseAddress: "{{ ansible_default_ipv4.address }}"
|
||||||
bindPort: 6443
|
bindPort: 6443
|
||||||
{% if kubernetes_master|bool and groups['KubernetesMasterConfigured'] is defined %}
|
{% if kubernetes_master|bool and groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is defined %}
|
||||||
certificateKey: "{{ kubernetes_certificateKey.stdout }}"
|
certificateKey: "{{ kubernetes_certificateKey.stdout }}"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
---
|
---
|
||||||
|
|
@ -53,14 +53,14 @@ controlPlane:
|
||||||
localAPIEndpoint:
|
localAPIEndpoint:
|
||||||
advertiseAddress: "{{ ansible_default_ipv4.address }}"
|
advertiseAddress: "{{ ansible_default_ipv4.address }}"
|
||||||
bindPort: 6443
|
bindPort: 6443
|
||||||
{% if groups['KubernetesMasterConfigured'] is defined %}
|
{% if groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is defined %}
|
||||||
certificateKey: "{{ kubernetes_certificateKey.stdout }}"
|
certificateKey: "{{ kubernetes_certificateKey.stdout }}"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
discovery:
|
discovery:
|
||||||
bootstrapToken:
|
bootstrapToken:
|
||||||
apiServerEndpoint: "{{ lb_kubemaster }}:6443"
|
apiServerEndpoint: "{{ lb_kubemaster }}:6443"
|
||||||
{% if groups['KubernetesMasterConfigured'] is defined %}
|
{% if groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is defined %}
|
||||||
caCertHashes:
|
caCertHashes:
|
||||||
- sha256:{{ cacerthash.stdout }}
|
- sha256:{{ cacerthash.stdout }}
|
||||||
token: "{{ kubetoken.stdout }}"
|
token: "{{ kubetoken.stdout }}"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue