--wip-- [skip ci]

templates/generate_configs.sh

@@ -2,38 +2,37 @@
 set -euo pipefail
 CONFIGS={{ root }}/configs
 
+TALOSCONFIG=${CONFIGS}/talosconfig
+rm -f ${CONFIGS}
+
 # Generate the configuration for each node
-{% for node in nodes -%}
-talosctl gen config {{ node.cluster.name }} https://{{ node.cluster.controlPlaneIp }}:6443 -f \
-	--with-secrets {{ node.cluster.secretsFile }} \
-	--talos-version v{{ node.talosVersion }} \
-	--kubernetes-version v{{ node.kubernetesVersion }} \
+{% for cluster in clusters %}
+{% for node in cluster.nodes -%}
+talosctl gen config {{ cluster.name }} https://{{ cluster.controlPlaneIp }}:6443 -f \
+	--with-secrets {{ cluster.secretsFile }} \
+	--talos-version v{{ cluster.version.talos }} \
+	--kubernetes-version v{{ cluster.version.kubernetes }} \
 	--output-types {{ node.type }} \
-	--install-image factory.talos.dev/metal-installer/{{ node.schematicId }}:v{{ node.talosVersion }} \
-	{% for patch in node.patches -%}
+	--install-image factory.talos.dev/metal-installer/{{ node.schematic }}:v{{ cluster.version.talos }} \
+	{% for patch in node.patches.all -%}
 		{# The double call to tojson is needed to properly escape the patch (object -> json -> string) -#}
-			--config-patch {{ helper.model_dump_json(patch)|tojson }} \
+		--config-patch {{ patch|tojson|tojson }} \
 	{% endfor -%}
-	{% for patch in node.patchesControlPlane -%}
-	--config-patch-control-plane {{ helper.model_dump_json(patch)|tojson }} \
+	{% for patch in node.patches.controlPlane -%}
+		--config-patch-control-plane {{ patch|tojson|tojson }} \
 	{% endfor -%}
 	--with-docs=false \
 	--with-examples=false \
-	-o ${CONFIGS}/{{ node.filename }}.yaml
+	-o ${CONFIGS}/{{ cluster.name }}/{{ node.hostname }}.yaml
 {% endfor %}
 
 # Generate the talosconfig file for each cluster
-{% for cluster in clusters -%}
 talosctl gen config {{ cluster.name }} https://{{ cluster.controlPlaneIp }}:6443 -f \
 	--with-secrets {{ cluster.secretsFile }} \
 	--output-types talosconfig \
 	-o ${CONFIGS}/{{ cluster.name }}/talosconfig
-{% endfor %}
 
 # Create merged talosconfig
-TALOSCONFIG=${CONFIGS}/talosconfig
-rm -f ${TALOSCONFIG}
-{% for cluster in clusters -%}
 talosctl config --talosconfig=${CONFIGS}/{{ cluster.name }}/talosconfig endpoint {{ cluster.controlPlaneIp }}
 talosctl config --talosconfig=${TALOSCONFIG} merge ${CONFIGS}/{{ cluster.name }}/talosconfig
 {% endfor %}