refactor: image var update for calico

!35

defaults/main.yml

@@ -6,10 +6,10 @@
 calico_image_tag: v3.25.0 # Depreciated
 # EoF Depreciated
 # SoF New Variables
-nfc_kubernetes_calico_version: v3.27.0
+nfc_role_kubernetes_calico_version: v3.27.0
-nfc_kubernetes_tigera_operator_registry: quay.io
+# nfc_kubernetes_tigera_operator_registry: quay.io
-nfc_kubernetes_tigera_operator_image: tigera/operator
+# nfc_kubernetes_tigera_operator_image: tigera/operator
-nfc_kubernetes_tigera_operator_tag: v1.32.3               # Calico v3.27.0
+# nfc_kubernetes_tigera_operator_tag: v1.32.3               # Calico v3.27.0
 # EoF New Variables, EEoF Depreciated
 
 
@@ -25,6 +25,12 @@ nfc_role_kubernetes_container_images:
     image: kubevirt/virt-operator
     tag: v1.2.0
 
+  tigera_operator:
+    name: Tigera Operator
+    registry: quay.io
+    image: tigera/operator
+    tag: v1.32.3    # Calico v3.27.0
+
 
 nfc_role_kubernetes_cluster_domain: cluster.local
 

docs/projects/ansible/roles/kubernetes/release_notes.md

@@ -11,6 +11,12 @@ This document details any changes that have occured that may impact users of thi
 
 ## Changes with an impact
 
+- _**13 Mar 2024**_ Container Images now a dictionary. This role has two images `kubevirt_operator` and `tigera_operator`.
+
+    - All Images are stored in dictionary `nfc_role_kubernetes_container_images` with each image using its own dictionary with mandatory keys `registry`, `image` and `tag`. This change has been made to cater for those whom store their images within their inventory as a dict of dict. For instance to use your inventory image declare variable `nfc_role_kubernetes_container_images.kubevirt_operator: my_images.my_kubevirt_dict` as an example.
+
+    - A lot of variables have been updated. To view what has changed, please see `defaults/main.yaml` in [MR !35](https://gitlab.com/nofusscomputing/projects/ansible/kubernetes/-/merge_requests/35)
+
 - _**31 Jan 2024**_ Calico CNI deployment has been migrated to use the calico operator. 
 
     - All new cluster installations will be deployed with the operator

tasks/k3s/migrate_to_operator.yaml

@@ -96,7 +96,7 @@
     - name: Fetch Calico Kubectl Plugin
       ansible.builtin.uri:
         url: |-
-          https://github.com/projectcalico/calico/releases/download/{{ nfc_kubernetes_calico_version }}/calicoctl-linux-
+          https://github.com/projectcalico/calico/releases/download/{{ nfc_role_kubernetes_calico_version }}/calicoctl-linux-
           {%- if cpu_arch.key == 'aarch64' -%}
             arm64
           {%- else -%}

templates/Deployment-manifest-Calico_Operator.yaml.j2

@@ -25272,7 +25272,10 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: tigera-operator
-          image: {{ nfc_kubernetes_tigera_operator_registry }}/{{ nfc_kubernetes_tigera_operator_image}}:{{ nfc_kubernetes_tigera_operator_tag }}
+          image: {{ 
+            nfc_role_kubernetes_container_images.tigera_operator.registry }}/{{ 
+              nfc_role_kubernetes_container_images.tigera_operator.image}}:{{ 
+                nfc_role_kubernetes_container_images.tigera_operator.tag }}
           imagePullPolicy: IfNotPresent
           command:
             - operator
@@ -25290,7 +25293,7 @@ spec:
             - name: OPERATOR_NAME
               value: "tigera-operator"
             - name: TIGERA_OPERATOR_INIT_IMAGE_VERSION
-              value: {{ nfc_kubernetes_tigera_operator_tag }}
+              value: {{ nfc_role_kubernetes_container_images.tigera_operator.tag }}
           envFrom:
             - configMapRef:
                 name: kubernetes-services-endpoint