Fix bug on lb_kubemaster
This commit is contained in:
parent
b2e96c59da
commit
c60ae1c343
2 changed files with 27 additions and 25 deletions
|
|
@ -90,24 +90,6 @@
|
||||||
- kubeadm_version_major.stdout | int == 1
|
- kubeadm_version_major.stdout | int == 1
|
||||||
- kubeadm_version_minor.stdout | int >= 15
|
- kubeadm_version_minor.stdout | int >= 15
|
||||||
|
|
||||||
# Because next command will fail
|
|
||||||
- name: Make /root/.kube directory
|
|
||||||
file:
|
|
||||||
path: "/root/.kube"
|
|
||||||
owner: root
|
|
||||||
group: root
|
|
||||||
mode: 0700
|
|
||||||
state: directory
|
|
||||||
|
|
||||||
- name: Copy certificat file on
|
|
||||||
copy:
|
|
||||||
src: /etc/kubernetes/admin.conf
|
|
||||||
dest: /root/.kube/config
|
|
||||||
remote_src: yes
|
|
||||||
owner: root
|
|
||||||
group: root
|
|
||||||
mode: 0600
|
|
||||||
|
|
||||||
- name: Add {{ ansible_hostname }} to KubernetesMasterConfigured group
|
- name: Add {{ ansible_hostname }} to KubernetesMasterConfigured group
|
||||||
group_by:
|
group_by:
|
||||||
key: KubernetesMasterConfigured
|
key: KubernetesMasterConfigured
|
||||||
|
|
@ -115,8 +97,13 @@
|
||||||
- groups['KubernetesMasterConfigured'] is not defined
|
- groups['KubernetesMasterConfigured'] is not defined
|
||||||
- groups['KubernetesMasters'][0] == ansible_hostname
|
- groups['KubernetesMasters'][0] == ansible_hostname
|
||||||
|
|
||||||
|
- set_fact:
|
||||||
|
lb_kubemaster: "groups['KubernetesMasterConfigured'][0]"
|
||||||
|
when:
|
||||||
|
- groups['KubernetesMasters'] | length > 1
|
||||||
|
|
||||||
- name: Test if server node already included
|
- name: Test if server node already included
|
||||||
command: kubectl get nodes {{ ansible_hostname | lower }}
|
command: kubectl --kubeconfig=/etc/kubernetes/admin.conf get nodes {{ ansible_hostname | lower }}
|
||||||
delegate_to: "{{ lb_kubemaster }}"
|
delegate_to: "{{ lb_kubemaster }}"
|
||||||
register: server_enrolled
|
register: server_enrolled
|
||||||
changed_when: False
|
changed_when: False
|
||||||
|
|
@ -195,7 +182,22 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
- name: Make /root/.kube directory
|
- name: Make /root/.kube directory
|
||||||
file: path="/root/.kube" owner=root group=root mode=0700 state=directory
|
file:
|
||||||
|
path: "/root/.kube"
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: 0700
|
||||||
|
state: directory
|
||||||
|
when:
|
||||||
|
- kubernetes_master == true
|
||||||
|
|
||||||
- name: Copy certificat file on
|
- name: Copy certificat file on
|
||||||
copy: src=/etc/kubernetes/admin.conf dest=/root/.kube/config remote_src=yes owner=root group=root mode=0600
|
copy:
|
||||||
|
src: /etc/kubernetes/admin.conf
|
||||||
|
dest: /root/.kube/config
|
||||||
|
remote_src: yes
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: 0600
|
||||||
|
when:
|
||||||
|
- kubernetes_master == true
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<service>
|
<service>
|
||||||
|
<short>Kubernetes</short>
|
||||||
|
<description>Open needed Kubernetes ports.</description>
|
||||||
{% if kubernetes_master == true %}
|
{% if kubernetes_master == true %}
|
||||||
<short>Kubernetes master</short>
|
|
||||||
<description>Open Kubernetes master ports.</description>
|
|
||||||
<port protocol="tcp" port="6443"/>
|
<port protocol="tcp" port="6443"/>
|
||||||
<port protocol="tcp" port="2379"/>
|
<port protocol="tcp" port="2379"/>
|
||||||
<port protocol="tcp" port="2380"/>
|
<port protocol="tcp" port="2380"/>
|
||||||
|
|
@ -11,9 +11,9 @@
|
||||||
<port protocol="tcp" port="10252"/>
|
<port protocol="tcp" port="10252"/>
|
||||||
<port protocol="tcp" port="10255"/>
|
<port protocol="tcp" port="10255"/>
|
||||||
{% else %}
|
{% else %}
|
||||||
<short>Kubernetes node</short>
|
{% if kubernetes_master == true %}
|
||||||
<description>Open Kubernetes node ports.</description>
|
|
||||||
<port protocol="tcp" port="10250"/>
|
<port protocol="tcp" port="10250"/>
|
||||||
|
{% endif %}
|
||||||
<port protocol="tcp" port="80"/>
|
<port protocol="tcp" port="80"/>
|
||||||
<port protocol="tcp" port="443"/>
|
<port protocol="tcp" port="443"/>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue