Skip to content

Commit ff4fa8e

Browse files
committed
Some Fedora/single master fixes
1 parent 0cd6d72 commit ff4fa8e

File tree

5 files changed

+64
-11
lines changed

5 files changed

+64
-11
lines changed

tasks/init_cluster.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
- set_fact:
99
kubernetes_init: "{% if kubernetes_init_host is defined and kubernetes_init_host == inventory_hostname %}yes{% else %}no{% endif %}"
1010

11+
- set_fact:
12+
kubernetes_api_port: "{% if setup_vip %}{{ kubernetes_api_ha_port }}{% else %}{{ kubernetes_api_default_port }}{% endif %}"
13+
14+
- set_fact:
15+
kubernetes_ip_address: "{{ item }}"
16+
when: "item | ipaddr( kubernetes_subnet )"
17+
with_items: "{{ ansible_all_ipv4_addresses | difference([kubernetes_vip_ip]) }}"
18+
1119
- block:
12-
- set_fact:
13-
kubernetes_api_port: "{% if setup_vip %}{{ kubernetes_api_ha_port }}{% else %}{{ kubernetes_api_default_port }}{% endif %}"
14-
15-
- set_fact:
16-
kubernetes_ip_address: "{{ item }}"
17-
when: "item | ipaddr( kubernetes_subnet )"
18-
with_items: "{{ ansible_all_ipv4_addresses | difference([kubernetes_vip_ip]) }}"
1920

2021
- set_fact:
2122
kubernetes_iface: "{{ hostvars[inventory_hostname]['ansible_' + item ]['device'] }}"

tasks/install_cri.yml

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,57 @@
3434
notify:
3535
- reload containerd
3636

37-
- name: reload containerd
37+
- name: start and enable containerd
3838
ansible.builtin.systemd:
3939
name: containerd
4040
state: started
4141
enabled: yes
4242

4343
when: kubernetes_cri == 'containerd'
4444

45+
# Fedora hack
46+
- name: Check if /opt/cni/bin directory exist
47+
ansible.builtin.stat:
48+
path: /opt/cni/bin
49+
register: cni_bin_dir
50+
51+
- block:
52+
- name: Install containernetworking-plugins
53+
ansible.builtin.package:
54+
name: containernetworking-plugins
55+
state: present
56+
57+
- name: stop containerd
58+
ansible.builtin.systemd:
59+
name: containerd
60+
state: stopped
61+
62+
- name: Create /opt/cni/ directory
63+
ansible.builtin.file:
64+
name: /opt/cni/
65+
state: directory
66+
67+
- name: Remove /opt/cni/bin directory if exist
68+
ansible.builtin.file:
69+
name: /opt/cni/bin
70+
state: removed
71+
72+
- name: Create symlink from /usr/libexec/cni to /opt/cni/bin
73+
ansible.builtin.file:
74+
src: /usr/libexec/cni
75+
dest: /opt/cni/bin
76+
state: link
77+
78+
- name: start containerd
79+
ansible.builtin.systemd:
80+
name: containerd
81+
state: started
82+
when:
83+
- ansible_distribution == 'Fedora'
84+
- kubernetes_cri == 'containerd'
85+
- cni_bin_dir.stat.islnk is defined
86+
- not cni_bin_dir.stat.islnk
87+
# END Fedora hack
88+
4589
- name: Force all notified handlers to run now
4690
meta: flush_handlers

tasks/join_cluster.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
register: kubelet_dir
77

88
- set_fact:
9-
api_server_endpoint: "{% if groups['kubemaster'] | length > 1 %}{{ kubernetes_vip_ip }}{% else %}{{ hostvars[groups['kubemaster'][0]]['ansible_default_ipv4']['address'] }}{% endif %}"
9+
api_server_endpoint: "{% if groups['kubemaster'] | length > 1 %}{{ kubernetes_vip_ip }}{% else %}{{ hostvars[groups['kubemaster'][0]]['kubernetes_ip_address'] }}{% endif %}"
1010
kubernetes_api_port: "{% if setup_vip %}{{ kubernetes_api_ha_port }}{% else %}{{ kubernetes_api_default_port }}{% endif %}"
1111

1212
- name: "wait for kubeapi server"

tasks/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
- "setup_repo_{{ ansible_os_family }}.yml"
2525
tags: repo
2626

27+
- setup:
28+
2729
- include_tasks:
2830
file: preflight.yml
2931
apply:

tasks/preflight.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
when: ansible_os_family == 'Debian'
1111

1212
- block:
13-
- name: Install required system packages
13+
- name: Install iptables-legacy
1414
ansible.builtin.dnf:
1515
name:
1616
- iptables-legacy
1717
state: present
1818

19-
- name: Install required system packages
19+
- name: Remove zram-generator-defaults
2020
ansible.builtin.dnf:
2121
name:
2222
- zram-generator-defaults
@@ -39,6 +39,12 @@
3939
state: disabled
4040
when: ansible_os_family == 'RedHat'
4141

42+
- name: Install openssl
43+
ansible.builtin.package:
44+
name:
45+
- openssl
46+
state: present
47+
4248
- name: load overlay kernel module
4349
ansible.builtin.command: modprobe overlay
4450

0 commit comments

Comments
 (0)