Merge branch 'fix-k3s-config' into 'development'

fix: k3s config

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

templates/FelixConfiguration-manifest-Calico_Cluster.yaml

@@ -5,9 +5,9 @@ kind: FelixConfiguration
 metadata:
   name: default
 spec:
-  bpfConnectTimeLoadBalancing: TCP
+  # bpfConnectTimeLoadBalancing: TCP
-  bpfExternalServiceMode: DSR
+  # bpfExternalServiceMode: DSR
-  bpfHostNetworkedNATWithoutCTLB: Enabled
+  # bpfHostNetworkedNATWithoutCTLB: Enabled
   bpfLogLevel: ""
   floatingIPs: Disabled
   healthPort: 9099

templates/Installation-manifest-Calico_Cluster.yaml.j2

@@ -42,4 +42,12 @@ spec:
   nonPrivileged: Disabled
   serviceCIDRs:
     - {{ kubernetes_config.cluster.networking.ServiceSubnet }}
+  typhaDeployment:
+    spec:
+      template:
+        spec:
+          tolerations:
+            - effect: NoExecute
+              key: CriticalAddonsOnly
+              value: "true"
   variant: Calico

templates/k3s-config.yaml.j2

@@ -124,7 +124,6 @@
       ",ephemeral-storage=" + kubelet_arg_system_reserved_storage
     ],
     "node-name": inventory_hostname,
-    "node-ip": ansible_default_ipv4.address
   }
 
 -%}
@@ -201,9 +200,16 @@
 -%}
   
   {%- set all_nodes_config = all_nodes_config | combine({
-    "node-external-ip": host_external_ip,
+    "node-external-ip": host_external_ip
    }) -%}
 
+{%- else -%}
+
+  {%- set all_nodes_config = all_nodes_config | combine({
+    "node-ip": ansible_default_ipv4.address
+   }) -%}
+  
+
 {%- endif -%}
 
 {# EoF All Nodes #}