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/apps/kube-system/kubelet-csr-approver/.mjfilter.py

@@ -1 +1 @@
-main = lambda data: data.get("distribution") in ['talos']
+main = lambda data: data.get("distribution", {}).get("type", "k3s") in ["talos"]

bootstrap/templates/kubernetes/apps/kube-system/kustomization.yaml.j2

@@ -4,11 +4,11 @@ kind: Kustomization
 resources:
   - ./namespace.yaml
   - ./cilium/ks.yaml
-  {% if distribution in ['talos'] %}
+  {% if distribution.type in ["talos"] %}
   - ./kubelet-csr-approver/ks.yaml
   {% endif %}
   - ./metrics-server/ks.yaml
-  {% if distribution in ['k0s', 'talos'] %}
+  {% if distribution.type in ["k0s", "talos"] %}
   - ./spegel/ks.yaml
   {% endif %}
   - ./reloader/ks.yaml

bootstrap/templates/kubernetes/apps/kube-system/spegel/.mjfilter.py

@@ -1 +1 @@
-main = lambda data: data.get("distribution") in ['k0s', 'talos']
+main = lambda data: data.get("distribution", {}).get("type", "k3s") in ["k0s", "talos"]

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

@@ -24,10 +24,10 @@ spec:
     keepHistory: false
   values:
     spegel:
-      {% if distribution in ['k0s'] %}
+      {% if distribution.type in ["k0s"] %}
       containerdSock: /run/k0s/containerd.sock
       containerdRegistryConfigPath: /var/lib/k0s/containerd/certs.d
-      {% elif distribution in ['talos'] %}
+      {% elif distribution.type in ["talos"] %}
       containerdSock: /run/containerd/containerd.sock
       containerdRegistryConfigPath: /etc/cri/conf.d/hosts
       {% endif %}