roles/nfc_kubernetes/defaults/main.yml

@@ -38,6 +38,8 @@ nfc_role_kubernetes_configure_firewall: true
 
 nfc_role_kubernetes_etcd_enabled: false
 
+nfc_role_kubernetes_install_cni: false
+
 nfc_role_kubernetes_install_olm: false
 
 nfc_role_kubernetes_install_helm: true

roles/nfc_kubernetes/tasks/k3s/install.yaml

@@ -17,6 +17,8 @@
   register: file_calico_yaml_metadata
   when: >
     nfc_role_kubernetes_prime | bool
+      and
+    nfc_role_kubernetes_install_cni | default(false) | bool
 
 
 - name: Check for calico Operator deployment manifest
@@ -25,6 +27,8 @@
   register: file_calico_operator_yaml_metadata
   when: >
     nfc_role_kubernetes_prime | bool
+      and
+    nfc_role_kubernetes_install_cni | default(false) | bool
 
 
 - name: Install dependent packages
@@ -523,6 +527,8 @@
           {{
             nfc_role_kubernetes_prime | bool
               and
+            nfc_role_kubernetes_install_cni | default(false) | bool
+              and
             (
               (
                 not file_calico_operator_yaml_metadata.stat.exists
@@ -605,6 +611,8 @@
     nfc_role_kubernetes_prime | bool
       and
     not nfc_role_kubernetes_cluster_upgraded | default(false) | bool
+      and
+    nfc_role_kubernetes_install_cni | default(false) | bool
 
 
 - name: Install MetalLB Operator
@@ -724,6 +732,8 @@
   when: >
     nfc_role_kubernetes_prime | bool
       and
+    nfc_role_kubernetes_install_cni | default(false) | bool
+      and
     kubernetes_config.cluster.networking.encrypt | default(false) | bool
       and
     not nfc_role_kubernetes_cluster_upgraded | default(false) | bool

roles/nfc_kubernetes/templates/k3s-config.yaml.j2

@@ -100,8 +100,7 @@
         })
       -%}
 
-
+    {%- endif -%}
-    {%- endif -%} 
 
     {%- if (
       not nfc_kubernetes_enable_metallb | default(false)
@@ -116,6 +115,20 @@
     {%- endif -%}
 
 
+    {%- if (
+      nfc_role_kubernetes_install_helm | default(false)
+    ) -%}
+
+      {%- set disable = servers_config.disable + [ "helm-controller" ] -%}
+
+      {%
+      set servers_config = servers_config | combine({
+          "disable": disable 
+        })
+      -%}
+
+
+    {%- endif -%} 
 {# Combine Remaining Server Objects #}
 
 {%