Merge branch 'feat-vxlan' into 'development'

fix(calico): bgp not not configured

See merge request nofusscomputing/projects/ansible/kubernetes!16

handlers/main.yml

@@ -33,7 +33,7 @@
       nfc_kubernetes_no_restart
         or
       (
-        inventory_hostname in kubernetes_master
+        inventory_hostname in groups['kubernetes_master']
           and
         nfc_kubernetes_no_restart_master
       )

tasks/k3s/install.yaml

@@ -204,23 +204,6 @@
   #   kubernetes_config.cluster.prime.name == inventory_hostname
 
 
-- name: Fetch Join Token
-  ansible.builtin.slurp:
-    src: /var/lib/rancher/k3s/server/token
-  delegate_to: "{{ kubernetes_config.cluster.prime.name }}"
-  run_once: true
-  register: k3s_join_token
-  no_log: true # Value is sensitive
-
-
-- name: Create Token fact
-  ansible.builtin.set_fact:
-    k3s_join_token: "{{ k3s_join_token.content | b64decode | replace('\n', '') }}"
-  delegate_to: "{{ kubernetes_config.cluster.prime.name }}"
-  run_once: true
-  no_log: true # Value is sensitive
-
-
 - name: Copy Intial required templates
   ansible.builtin.template:
     src: "{{ item.src }}"
@@ -230,6 +213,7 @@
     force: true
   notify: "{{ item.notify | default(omit) }}"
   loop: "{{ templates_to_apply }}"
+  diff: true
   when: >
     item.when | default(true) | bool
   vars:
@@ -310,7 +294,7 @@
   when: >
     kubernetes_config.cluster.prime.name == inventory_hostname
       and
-    kubernetes_olm_install | default(true) | bool
+    kubernetes_olm_install | default(false) | bool
 
 - name: Enable Cluster Encryption
   ansible.builtin.command:
@@ -322,6 +306,23 @@
     kubernetes_config.cluster.networking.encrypt | default(false) | bool
 
 
+- name: Fetch Join Token
+  ansible.builtin.slurp:
+    src: /var/lib/rancher/k3s/server/token
+  delegate_to: "{{ kubernetes_config.cluster.prime.name }}"
+  run_once: true
+  register: k3s_join_token
+  no_log: true # Value is sensitive
+
+
+- name: Create Token fact
+  ansible.builtin.set_fact:
+    k3s_join_token: "{{ k3s_join_token.content | b64decode | replace('\n', '') }}"
+  delegate_to: "{{ kubernetes_config.cluster.prime.name }}"
+  run_once: true
+  no_log: true # Value is sensitive
+
+
 - name: Install K3s (master nodes)
   ansible.builtin.shell:
     cmd: |

templates/calico.yaml.j2

@@ -4833,7 +4833,7 @@ spec:
               command:
               - /bin/calico-node
               - -felix-live
-              - -bird-live
+              #- -bird-live
             periodSeconds: 10
             initialDelaySeconds: 10
             failureThreshold: 6
@@ -4843,7 +4843,7 @@ spec:
               command:
               - /bin/calico-node
               - -felix-ready
-              - -bird-ready
+              #- -bird-ready
             periodSeconds: 10
             timeoutSeconds: 10
           volumeMounts:

templates/k3s-config.yaml.j2

@@ -20,7 +20,7 @@ cluster-init: true
 disable-network-policy: true
 disable:
   - traefik
-  - metrics-server
+#  - metrics-server
 etcd-snapshot-retention: {{ kubernetes_etcd_snapshot_retention | int }}
 etcd-snapshot-schedule-cron: "{{ kubernetes_etcd_snapshot_cron_schedule }}"
 flannel-backend: none