From c41e12544b4eff2ce9e62e2209c5b402f7b5a71f Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Sat, 18 Nov 2023 03:48:47 +0930
Subject: [PATCH] fix(k3s_multi_master): adjusted config so multi-master
 install works

!9 nofusscomputing/infrastructure/configuration-management/project-production!4
---
 defaults/main.yml            |  2 +-
 tasks/k3s/install.yaml       |  2 +-
 templates/k3s-config.yaml.j2 | 12 +++---------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index d307c5f..b4d79b9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -43,7 +43,7 @@ k3s:
         kind: Policy
         rules:
         - level: Request
-      when: "{{ kubernetes_config.cluster.prime.name == inventory_hostname }}"
+      when: "{{ Kubernetes_Master | default(false) }}"
 
     - name: 90-kubelet.conf
       path: /etc/sysctl.d
diff --git a/tasks/k3s/install.yaml b/tasks/k3s/install.yaml
index 96828d6..336815e 100644
--- a/tasks/k3s/install.yaml
+++ b/tasks/k3s/install.yaml
@@ -327,12 +327,12 @@
 - name: Install K3s (master nodes)
   ansible.builtin.shell:
     cmd: |
-      set -o pipefail
       INSTALL_K3S_EXEC="server" \
       INSTALL_K3S_SKIP_DOWNLOAD=true \
       INSTALL_K3S_VERSION="v{{ KubernetesVersion }}{{ KubernetesVersion_k3s_prefix }}" \
       K3S_TOKEN="{{ k3s_join_token }}" \
       /tmp/install.sh
+    executable: /bin/bash
   changed_when: false
   when: >
     Kubernetes_Master | default(false) | bool
diff --git a/templates/k3s-config.yaml.j2 b/templates/k3s-config.yaml.j2
index e290e69..3eb351a 100644
--- a/templates/k3s-config.yaml.j2
+++ b/templates/k3s-config.yaml.j2
@@ -6,8 +6,7 @@
 # Dont edit this file directly as it will be overwritten.
 #
 
-{% if Kubernetes_Prime | default(false) | bool -%}
-cluster-cidr: "{{ KubernetesPodSubnet }}"
+{% if Kubernetes_Master | default(false) -%}cluster-cidr: "{{ KubernetesPodSubnet }}"
 
 {% if 
           kubernetes_config.cluster.domain_name is defined
@@ -17,9 +16,7 @@ cluster-cidr: "{{ KubernetesPodSubnet }}"
         cluster-domain: {{ kubernetes_config.cluster.domain_name }}
     {%- endif %}
 
-{%- endif %}
-
-{% if Kubernetes_Master | default(false) -%}cluster-init: true
+cluster-init: true
 disable-network-policy: true
 disable:
   - traefik
@@ -59,10 +56,7 @@ node-label: {%- for node_label in kubernetes_config.hosts[inventory_hostname].la
 server: https://{{ hostvars[kubernetes_config.cluster.prime.name].ansible_host }}:6443
 {%- endif %}
 
-{% if kubernetes_config.cluster.prime.name == inventory_hostname -%}
-servicelb-namespace: {{ kubernetes_config.cluster.networking.service_load_balancer_namespace | default('kube-system') }}
-{% endif %}
-
 {% if Kubernetes_Master | default(false) | bool -%}
+servicelb-namespace: {{ kubernetes_config.cluster.networking.service_load_balancer_namespace | default('kube-system') }}
 service-cidr: "{{ KubernetesServiceSubnet }}"
 {% endif %}