Fix bugs, Update for EL8
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing

This commit is contained in:
Adrien Reslinger 2021-01-18 22:53:35 +01:00
parent a4b0c9fc81
commit cecb684e05
Signed by: adrien
GPG key ID: DA7B27055C66D6DE
6 changed files with 37 additions and 49 deletions

View file

@ -30,7 +30,7 @@
when:
- kubernetes_kubeproxy_mode == "ipvs"
- name: Load IPVS kernel module
- name: Load IPVS kernel module for EL7
modprobe:
name: "{{ item }}"
state: present
@ -43,6 +43,23 @@
- nf_conntrack_ipv6
when:
- kubernetes_kubeproxy_mode == "ipvs"
- ansible_os_family == "RedHat"
- ansible_distribution_major_version == '7'
- name: Load IPVS kernel module for EL8
modprobe:
name: "{{ item }}"
state: present
with_items:
- ip_vs
- ip_vs_rr
- ip_vs_wrr
- ip_vs_sh
- nf_conntrack
when:
- kubernetes_kubeproxy_mode == "ipvs"
- ansible_os_family == "RedHat"
- ansible_distribution_major_version == '8'
- name: Create thin volumes for kubernetes
lvol:
@ -182,16 +199,12 @@
when:
- groups['KubernetesMasterConfigured'] is not defined
- groups['KubernetesMasters'][0] == ansible_hostname
- kubeadm_version_major.stdout | int == 1
- kubeadm_version_minor.stdout | int >= 15
- name: Init Kubernetes on {{ groups['KubernetesMasters'][0] }}
command: kubeadm init --config=/root/kubeadm-config.yaml
when:
- groups['KubernetesMasterConfigured'] is not defined
- groups['KubernetesMasters'][0] == ansible_hostname
- kubeadm_version_major.stdout | int == 1
- kubeadm_version_minor.stdout | int >= 15
- name: Add {{ ansible_hostname }} to KubernetesMasterConfigured group
group_by:
@ -208,6 +221,8 @@
register: server_enrolled
changed_when: False
ignore_errors: yes
when:
- groups['KubernetesMasterConfigured'] is not defined
#- name: Deploy kubeadm config
# template:
@ -218,8 +233,6 @@
# 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 }}
@ -227,16 +240,16 @@
register: kubernetes_certificateKey
delegate_to: "{{ lb_kubemaster }}"
when:
- groups['KubernetesMasterConfigured'] is not defined
- server_enrolled.rc == 1
- kubernetes_master|bool
- kubeadm_version_major.stdout | int == 1
- kubeadm_version_minor.stdout | int >= 15
- name: Retreive token on "{{ lb_kubemaster }}"
command: kubeadm token create
register: kubetoken
delegate_to: "{{ lb_kubemaster }}"
when:
- groups['KubernetesMasterConfigured'] is not defined
- server_enrolled.rc == 1
- name: Retreive hash certificat
@ -249,6 +262,7 @@
register: cacerthash
delegate_to: "{{ lb_kubemaster }}"
when:
- groups['KubernetesMasterConfigured'] is not defined
- server_enrolled.rc == 1
- name: Deploy kubeadm config
@ -259,11 +273,11 @@
group: root
mode: 0600
when:
- groups['KubernetesMasterConfigured'] is not defined
- server_enrolled.rc == 1
- name: Join '{{ ansible_hostname }}' to Kubernetes cluster
command: kubeadm join --config=/root/kubeadm-config.yaml
when:
- kubeadm_version_major.stdout | int == 1
- kubeadm_version_minor.stdout | int >= 15
- groups['KubernetesMasterConfigured'] is not defined
- server_enrolled.rc == 1