feat: distribution is a dict and nodes and cluster are top level (#1288)

* feat: distribution is a dict and nodes and cluster are top level

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

* chore: housekeeping

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

---------

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

bootstrap/templates/kubernetes/flux/.mjfilter.py

@@ -1 +1 @@
-main = lambda data: data.get("flux").get("enabled") == True
+main = lambda data: data.get("flux", {}).get("enabled", False) == True

bootstrap/templates/kubernetes/flux/repositories/helm/kustomization.yaml.j2

@@ -12,10 +12,10 @@ resources:
   - ./jetstack.yaml
   - ./metrics-server.yaml
   - ./openebs.yaml
-  {% if distribution in ['talos'] %}
+  {% if distribution.type in ["talos"] %}
   - ./postfinance.yaml
   {% endif %}
   - ./stakater.yaml
-  {% if distribution in ['k0s', 'talos'] %}
+  {% if distribution.type in ["k0s", "talos"] %}
   - ./xenitab.yaml
   {% endif %}

bootstrap/templates/kubernetes/flux/repositories/helm/postfinance.yaml.j2

@@ -1,4 +1,4 @@
-{% if distribution in ['talos'] %}
+{% if distribution.type in ["talos"] %}
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository

bootstrap/templates/kubernetes/flux/repositories/helm/xenitab.yaml.j2

@@ -1,4 +1,4 @@
-{% if distribution in ['k0s', 'talos'] %}
+{% if distribution.type in ["k0s", "talos"] %}
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository

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

@@ -7,7 +7,7 @@ metadata:
 data:
   TIMEZONE: "{{ timezone }}"
   CLUSTER_CIDR: "{{ cluster.pod_network.split(',')[0] }}"
-  NODE_CIDR: "{{ cluster.nodes.host_network }}"
+  NODE_CIDR: "{{ nodes.host_network }}"
   {% if feature_gates.dual_stack_ipv4_first %}
   CLUSTER_CIDR_V6: "{{ cluster.pod_network.split(',')[1] }}"
   {% endif %}