Improved how the cluster is defined

nodes/_defaults.yaml

@@ -25,5 +25,5 @@ patches:
     - !patch install-disk
     - !patch network
     - !patch vip
-patchesControlplane:
-    - !patch allow-controlplane-workloads
+patchesControlPlane:
+    - !patch allow-control-plane-workloads

nodes/hellas/_defaults.yaml

@@ -1,5 +1,6 @@
 netmask: 255.255.252.0
 gateway: 10.0.0.1
-clusterName: hellas
-controlplaneIp: 10.0.2.1
 installDisk: /dev/sda
+cluster:
+    name: hellas
+    controlPlaneIp: 10.0.2.1

nodes/testing/_defaults.yaml

@@ -1,5 +1,6 @@
 netmask: 255.255.255.0
 gateway: 192.168.1.1
-clusterName: testing
-controlplaneIp: 192.168.1.100
 installDisk: /dev/vda
+cluster:
+    name: testing
+    controlPlaneIp: 192.168.1.100

patches/vip.yaml

@@ -3,4 +3,4 @@ machine:
         interfaces:
             - interface: {{interface}}
               vip:
-                  ip: {{controlplaneIp}}
+                  ip: {{cluster.controlPlaneIp}}

templates/generate_configs.sh

@@ -5,7 +5,7 @@ CONFIGS=${ROOT}/configs
 
 # Generate the configuration for each node
 {% for node in nodes -%}
-talosctl gen config {{ node.clusterName }} https://{{ node.controlplaneIp }}:6443 -f \
+talosctl gen config {{ node.cluster.name }} https://{{ node.cluster.controlPlaneIp }}:6443 -f \
 	--with-secrets ${ROOT}/secrets.yaml \
 	--talos-version {{ node.talosVersion }} \
 	--kubernetes-version {{ node.kubernesVersion }} \
@@ -15,7 +15,7 @@ talosctl gen config {{ node.clusterName }} https://{{ node.controlplaneIp }}:644
 		{# The double call to tojson is needed to properly escape the patch (object -> json -> string) -#}
 		--config-patch {{ patch|tojson|tojson }} \
 	{% endfor -%}
-	{% for patch in node.patchesControlplane -%}
+	{% for patch in node.patchesControlPlane -%}
 		--config-patch-control-plane {{ patch|tojson|tojson }} \
 	{% endfor -%}
 	--with-docs=false \
@@ -24,9 +24,8 @@ talosctl gen config {{ node.clusterName }} https://{{ node.controlplaneIp }}:644
 {% endfor %}
 
 # Generate the talosconfig file for each cluster
-{# NOTE: This assumes that each node in a cluster specifies the same controlplane IP -#}
 {% for cluster in clusters -%}
-talosctl gen config {{ cluster.name }} https://{{ cluster.controlplaneIp }}:6443 -f \
+talosctl gen config {{ cluster.name }} https://{{ cluster.controlPlaneIp }}:6443 -f \
 	--with-secrets ${ROOT}/secrets.yaml \
 	--output-types talosconfig \
 	-o ${CONFIGS}/{{ cluster.name }}/talosconfig

templates/source.sh

@@ -1,6 +1,6 @@
 export TALOSCONFIG={{ root }}/configs/talosconfig
 {% set paths = [] %}
-{%- for cluster_name in nodes|map(attribute="clusterName")|unique -%}
-	{%- do paths.append(root ~ "/configs/" ~ cluster_name ~ "/kubeconfig") -%}
+{%- for cluster in clusters -%}
+	{%- do paths.append(root ~ "/configs/" ~ cluster.name ~ "/kubeconfig") -%}
 {% endfor -%}
 export KUBECONFIG={{ paths|join(":") }}

tools/render

@@ -135,15 +135,11 @@ def main():
         )
     )
 
-    # Get all clusterName & controlplaneIp pairs
-    clusters = map(
-        lambda node: {
-            "name": node["clusterName"],
-            "controlplaneIp": node["controlplaneIp"],
-        },
-        nodes,
-    )
-    clusters = [dict(s) for s in set(frozenset(d.items()) for d in clusters)]
+    # Get all clusters
+    # NOTE: This assumes that all nodes in the cluster use the same definition for the cluster
+    clusters = [
+        dict(s) for s in set(frozenset(node["cluster"].items()) for node in nodes)
+    ]
 
     with open(ROOT.joinpath("config.yaml")) as fyaml:
         config = yaml.safe_load(fyaml)