fix(kebernetes): Apply fixes listed in issues #109

Merged
jon_nfc merged 25 commits from fixes into development 2024-07-08 02:02:30 +00:00
2 changed files with 36 additions and 7 deletions

View File

@ -552,6 +552,14 @@
# ipv6: true
- name: Set IP6Tables to legacy mode
ansible.builtin.command:
cmd: update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
changed_when: false
when: >
not nfc_role_kubernetes_cluster_upgraded | default(false) | bool
- name: Set IPTables to legacy mode
ansible.builtin.command:
cmd: update-alternatives --set iptables /usr/sbin/iptables-legacy

View File

@ -9,9 +9,10 @@
{%- if
nfc_role_kubernetes_master
or
kubernetes_config.cluster.prime.name | default(inventory_hostname) == inventory_hostname
nfc_role_kubernetes_prime | default(true) | bool
and
not nfc_role_kubernetes_worker
-%}
{%
set kube_apiserver_arg = [
@ -197,13 +198,28 @@
}) -%}
{%- elif
kubernetes_config.cluster.prime.name != inventory_hostname
nfc_role_kubernetes_prime | default(true) | bool
and
not node_k3s.installed
and
not nfc_role_kubernetes_worker
-%}
{%- set ns = namespace(prime_name) -%}
{%- for hostname, values in hostvars.iteritems() -%}
{%- if values.nfc_role_kubernetes_node_prime ==true -%}
{%- set ns.prime_name = hostname -%}
{%- endif -%}
{%- endfor -%}
{%- set server = (server | default([])) + [
"https://" + hostvars[kubernetes_config.cluster.prime.name].ansible_host + ":6443"
"https://" + ns.prime_name.ansible_host + ":6443"
] -%}
{%- set all_nodes_config = all_nodes_config | combine({
@ -235,13 +251,18 @@
{%- endif -%}
{# EoF All Nodes #}
{%- if
(
nfc_role_kubernetes_master
or
kubernetes_config.cluster.prime.name | default(inventory_hostname) == inventory_hostname
nfc_role_kubernetes_prime | default(true) | bool
)
and
not nfc_role_kubernetes_worker
-%}
{%- set servers_config = servers_config | combine( all_nodes_config ) -%}