diff --git a/nodes/_defaults.yaml b/nodes/_defaults.yaml index 587826e..91302db 100644 --- a/nodes/_defaults.yaml +++ b/nodes/_defaults.yaml @@ -1,7 +1,7 @@ schematicId: !schematic default arch: amd64 -talosVersion: v1.11.3 -kubernesVersion: v1.34.1 +talosVersion: 1.11.3 +kubernetesVersion: 1.34.1 kernelArgs: - talos.platform=metal - console=tty0 diff --git a/templates/boot.ipxe b/templates/boot.ipxe index 504ee81..48d1263 100644 --- a/templates/boot.ipxe +++ b/templates/boot.ipxe @@ -17,8 +17,8 @@ goto node_${serial} || exit {% do kernelArgs.append("talos.config=" ~ config.server.httpUrl ~ "/configs/" ~ node.filename ~ ".yaml") %} {% endif %} imgfree -kernel https://pxe.factory.talos.dev/image/{{ node.schematicId }}/{{ node.talosVersion }}/kernel-{{ node.arch }} {{ kernelArgs|join(" ") }} -initrd https://pxe.factory.talos.dev/image/{{ node.schematicId }}/{{ node.talosVersion }}/initramfs-{{ node.arch }}.xz +kernel https://pxe.factory.talos.dev/image/{{ node.schematicId }}/v{{ node.talosVersion }}/kernel-{{ node.arch }} {{ kernelArgs|join(" ") }} +initrd https://pxe.factory.talos.dev/image/{{ node.schematicId }}/v{{ node.talosVersion }}/initramfs-{{ node.arch }}.xz boot {% endif %} {% endfor %} diff --git a/templates/generate_configs.sh b/templates/generate_configs.sh index 021b554..945a22e 100644 --- a/templates/generate_configs.sh +++ b/templates/generate_configs.sh @@ -6,10 +6,10 @@ CONFIGS={{ root }}/configs {% for node in nodes -%} talosctl gen config {{ node.cluster.name }} https://{{ node.cluster.controlPlaneIp }}:6443 -f \ --with-secrets {{ node.cluster.secretsFile }} \ - --talos-version {{ node.talosVersion }} \ - --kubernetes-version {{ node.kubernesVersion }} \ + --talos-version v{{ node.talosVersion }} \ + --kubernetes-version v{{ node.kubernetesVersion }} \ --output-types {{ node.type }} \ - --install-image factory.talos.dev/metal-installer/{{ node.schematicId }}:{{ node.talosVersion }} \ + --install-image factory.talos.dev/metal-installer/{{ node.schematicId }}:v{{ node.talosVersion }} \ {% for patch in node.patches -%} {# The double call to tojson is needed to properly escape the patch (object -> json -> string) -#} --config-patch {{ patch|tojson|tojson }} \