feat: re-introduce flux vars for cluster network settings

Signed-off-by: Devin Buhl <devin@buhl.casa>

bootstrap/templates/kubernetes/apps/kube-system/cilium/app/cilium-l2.yaml.j2

@@ -19,4 +19,4 @@ metadata:
   name: pool
 spec:
   cidrs:
-    - cidr: "{{ bootstrap_node_cidr }}"
+    - cidr: "${NODE_CIDR}"

bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2

@@ -76,27 +76,26 @@ spec:
                 - *host
     ipam:
       mode: kubernetes
-    ipv4NativeRoutingCIDR: "{{ bootstrap_cluster_cidr.split(',')[0] }}"
+    ipv4NativeRoutingCIDR: "${CLUSTER_CIDR}"
     {% if bootstrap_ipv6_enabled | default(false) %}
-    ipv6NativeRoutingCIDR: "{{ bootstrap_cluster_cidr.split(',')[1] }}"
+    ipv6NativeRoutingCIDR: "${CLUSTER_CIDR_V6}"
     ipv6:
       enabled: true
     {% endif %}
-    k8sServiceHost: "{{ bootstrap_kube_vip_addr }}"
+    k8sServiceHost: "${KUBE_VIP_ADDR}"
     k8sServicePort: 6443
     kubeProxyReplacement: strict
     kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256
-    {% if bootstrap_ipv6_enabled | default(false) %}
     l2announcements:
+      {% if bootstrap_ipv6_enabled | default(false) %}
       enabled: false
-    {% else %}
-    # https://github.com/cilium/cilium/issues/26586
-    l2announcements:
+      {% else %}
       enabled: true
+      # https://github.com/cilium/cilium/issues/26586
       leaseDuration: 120s
       leaseRenewDeadline: 60s
       leaseRetryPeriod: 1s
-    {% endif %}
+      {% endif %}
     loadBalancer:
       algorithm: maglev
       mode: dsr

bootstrap/templates/kubernetes/apps/kube-system/coredns/app/helmrelease.yaml.j2

@@ -32,7 +32,7 @@ spec:
     k8sAppLabelOverride: kube-dns
     service:
       name: kube-dns
-      clusterIP: "{{ bootstrap_coredns_addr }}"
+      clusterIP: "${COREDNS_ADDR}"
     serviceAccount:
       create: true
     deployment:

bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2

@@ -1,3 +1,4 @@
+#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -6,3 +7,12 @@ metadata:
   namespace: flux-system
 data:
   TIMEZONE: "{{ bootstrap_timezone }}"
+  COREDNS_ADDR: "{{ bootstrap_service_cidr.split(',')[0] | ansible.utils.nthhost(10) }}"
+  KUBE_VIP_ADDR: "{{ bootstrap_kube_vip_addr }}"
+  CLUSTER_CIDR: "{{ bootstrap_cluster_cidr.split(',')[0] }}"
+  SERVICE_CIDR: "{{ bootstrap_service_cidr.split(',')[0] }}"
+  NODE_CIDR: "{{ bootstrap_node_cidr }}"
+  {% if bootstrap_ipv6_enabled | default(false) %}
+  CLUSTER_CIDR_V6: "{{ bootstrap_cluster_cidr.split(',')[1] }}"
+  SERVICE_CIDR_V6: "{{ bootstrap_service_cidr.split(',')[1] }}"
+  {% endif %}