chore: update talos packages

Update talos to v1.12.0-beta.0

Signed-off-by: Mateusz Urbanek <[email protected]>

Author: shanduur

Makefile

@@ -9,10 +9,10 @@ NAME := cluster-api-talos-controller
 ARTIFACTS := _out
 TEST_RUN ?= ./...
 
-TOOLS ?= ghcr.io/siderolabs/tools:v1.11.0
-PKGS ?= v1.11.0
-TALOS_VERSION ?= v1.11.0
-K8S_VERSION ?= 1.34.0
+TOOLS ?= ghcr.io/siderolabs/tools:v1.12.0
+PKGS ?= v1.12.0
+TALOS_VERSION ?= v1.12.0-beta.0
+K8S_VERSION ?= 1.34.2
 
 KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
 
@@ -143,20 +143,18 @@ talosctl:
 	chmod +x ./talosctl
 
 env-up: talosctl  ## Start development environment.
-	./talosctl cluster create \
-		--talosconfig=talosconfig \
-		--name=cabpt-env \
+	./talosctl cluster create docker \
+    	--name=cabpt-env \
+		--talosconfig-destination=talosconfig \
 		--kubernetes-version=$(K8S_VERSION) \
-		--mtu=1450 \
-		--skip-kubeconfig
+		--mtu=1450
 	./talosctl kubeconfig kubeconfig \
 		--talosconfig=talosconfig \
 		--nodes=10.5.0.2 \
 		--force
 
 env-down: talosctl ## Stop development environment.
 	./talosctl cluster destroy \
-		--talosconfig=talosconfig \
 		--name=cabpt-env
 	rm -f talosconfig kubeconfig
 

README.md

@@ -61,10 +61,10 @@ This provider's versions are able to install and manage the following versions o
 
 This provider's versions are compatible with the following versions of Talos:
 
-|                  | v1.0  | v1.1  | v1.2  | v1.3  | v1.4  | v1.5  | v1.6  | v1.7  | v1.8  | v1.9  | v1.10 | v1.11 |
-| ---------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
-| CABPT (v0.5.x)   | ✓     | ✓     | ✓     | ✓     |       |       |       |       |       |       |       |       |
-| CABPT (v0.6.x)   |       |       | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |
+|                  | v1.0  | v1.1  | v1.2  | v1.3  | v1.4  | v1.5  | v1.6  | v1.7  | v1.8  | v1.9  | v1.10 | v1.11 | v1.12 |
+| ---------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
+| CABPT (v0.5.x)   | ✓     | ✓     | ✓     | ✓     |       |       |       |       |       |       |       |       |       |
+| CABPT (v0.6.x)   |       |       | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |
 
 CABPT generates machine configuration compatible with Talos Linux version specified in the `talosVersion:` field (see below).
 
@@ -151,7 +151,9 @@ There are two [patch formats](https://www.talos.dev/latest/talos-guides/configur
 
 See Talos Linux documentation for more information on patching.
 
-> Note: JSON patches are not compatible with multi-document Talos Linux machine configuration.
+> [!IMPORTANT]
+> JSON patches are not compatible with multi-document Talos Linux machine configuration.
+> JSON patches are not compatible with Talos Linux >= 1.12.
 
 JSON 6902 patch:
 

controllers/talosconfig_controller.go

@@ -5,26 +5,32 @@
 package controllers
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"net"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/Masterminds/semver/v3"
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/go-logr/logr"
+	"github.com/siderolabs/go-pointer"
 	"github.com/siderolabs/talos/pkg/machinery/config"
 	"github.com/siderolabs/talos/pkg/machinery/config/configloader"
 	"github.com/siderolabs/talos/pkg/machinery/config/configpatcher"
 	"github.com/siderolabs/talos/pkg/machinery/config/encoder"
 	"github.com/siderolabs/talos/pkg/machinery/config/generate"
 	"github.com/siderolabs/talos/pkg/machinery/config/generate/secrets"
 	"github.com/siderolabs/talos/pkg/machinery/config/machine"
+	"github.com/siderolabs/talos/pkg/machinery/config/types/network"
 	"github.com/siderolabs/talos/pkg/machinery/config/types/v1alpha1"
 	"github.com/siderolabs/talos/pkg/machinery/constants"
+	"github.com/siderolabs/talos/pkg/machinery/nethelpers"
 	"gopkg.in/yaml.v2"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -277,6 +283,8 @@ func (r *TalosConfigReconciler) reconcileGenerate(ctx context.Context, tcScope *
 
 	machineType, _ := machine.ParseType(config.Spec.GenerateType) //nolint:errcheck // handle errors later
 
+	multiConfigPatches := []string{}
+
 	switch {
 	// Slurp and use user-supplied configs
 	case config.Spec.GenerateType == "none":
@@ -291,7 +299,7 @@ func (r *TalosConfigReconciler) reconcileGenerate(ctx context.Context, tcScope *
 
 	// Generate configs on the fly
 	case machineType != machine.TypeUnknown:
-		retData, err = r.genConfigs(ctx, tcScope)
+		retData, multiConfigPatches, err = r.genConfigs(ctx, tcScope)
 		if err != nil {
 			return err
 		}
@@ -322,10 +330,10 @@ func (r *TalosConfigReconciler) reconcileGenerate(ctx context.Context, tcScope *
 	}
 
 	// Handle strategic merge patches.
-	if len(config.Spec.StrategicPatches) > 0 {
-		patches := make([]configpatcher.Patch, 0, len(config.Spec.StrategicPatches))
+	if strategicPatches := slices.AppendSeq(config.Spec.StrategicPatches, slices.Values(multiConfigPatches)); len(strategicPatches) > 0 {
+		patches := make([]configpatcher.Patch, 0, len(strategicPatches))
 
-		for _, strategicPatch := range config.Spec.StrategicPatches {
+		for _, strategicPatch := range strategicPatches {
 			patch, err := configpatcher.LoadPatch([]byte(strategicPatch))
 			if err != nil {
 				return fmt.Errorf("failure loading StrategicPatch: %w", err)
@@ -447,7 +455,7 @@ func (r *TalosConfigReconciler) userConfigs(ctx context.Context, scope *TalosCon
 }
 
 // genConfigs will generate a bootstrap config and a talosconfig to return
-func (r *TalosConfigReconciler) genConfigs(ctx context.Context, scope *TalosConfigScope) (*TalosConfigBundle, error) {
+func (r *TalosConfigReconciler) genConfigs(ctx context.Context, scope *TalosConfigScope) (*TalosConfigBundle, []string, error) {
 	retBundle := &TalosConfigBundle{}
 
 	// Determine what type of node this is
@@ -456,22 +464,24 @@ func (r *TalosConfigReconciler) genConfigs(ctx context.Context, scope *TalosConf
 		machineType = machine.TypeWorker
 	}
 
+	patches := []string{}
+
 	// Allow user to override default kube version.
 	// This also handles version being formatted like "vX.Y.Z" instead of without leading 'v'
 	// TrimPrefix returns the string unchanged if the prefix isn't present.
 	k8sVersion := constants.DefaultKubernetesVersion
 	if scope.ConfigOwner.IsMachinePool() {
 		mp := &expv1.MachinePool{}
 		if err := runtime.DefaultUnstructuredConverter.FromUnstructured(scope.ConfigOwner.Object, mp); err != nil {
-			return retBundle, err
+			return retBundle, patches, err
 		}
 		if mp.Spec.Template.Spec.Version != nil {
 			k8sVersion = strings.TrimPrefix(*mp.Spec.Template.Spec.Version, "v")
 		}
 	} else {
 		machine := &capiv1.Machine{}
 		if err := runtime.DefaultUnstructuredConverter.FromUnstructured(scope.ConfigOwner.Object, machine); err != nil {
-			return retBundle, err
+			return retBundle, patches, err
 		}
 		if machine.Spec.Version != nil {
 			k8sVersion = strings.TrimPrefix(*machine.Spec.Version, "v")
@@ -491,15 +501,15 @@ func (r *TalosConfigReconciler) genConfigs(ctx context.Context, scope *TalosConf
 		var err error
 		versionContract, err = config.ParseContractFromVersion(scope.Config.Spec.TalosVersion)
 		if err != nil {
-			return retBundle, fmt.Errorf("invalid talos-version: %w", err)
+			return retBundle, patches, fmt.Errorf("invalid talos-version: %w", err)
 		}
 	}
 
 	genOptions = append(genOptions, generate.WithVersionContract(versionContract))
 
 	secretBundle, err := r.getSecretsBundle(ctx, scope, true, versionContract)
 	if err != nil {
-		return retBundle, err
+		return retBundle, patches, err
 	}
 
 	genOptions = append(genOptions, generate.WithSecretsBundle(secretBundle))
@@ -518,24 +528,24 @@ func (r *TalosConfigReconciler) genConfigs(ctx context.Context, scope *TalosConf
 		genOptions...,
 	)
 	if err != nil {
-		return retBundle, err
+		return retBundle, patches, err
 	}
 
 	// Create the secret with kubernetes certs so a kubeconfig can be generated
 	if err = r.writeK8sCASecret(ctx, scope, secretBundle.Certs.K8s); err != nil {
-		return retBundle, err
+		return retBundle, patches, err
 	}
 
 	tcString, err := genTalosConfigFile(input.ClusterName, secretBundle, nil)
 	if err != nil {
-		return retBundle, err
+		return retBundle, patches, err
 	}
 
 	retBundle.TalosConfig = tcString
 
 	data, err := input.Config(machineType)
 	if err != nil {
-		return retBundle, err
+		return retBundle, patches, err
 	}
 
 	if scope.Cluster.Spec.ClusterNetwork != nil && scope.Cluster.Spec.ClusterNetwork.Pods != nil {
@@ -550,27 +560,48 @@ func (r *TalosConfigReconciler) genConfigs(ctx context.Context, scope *TalosConf
 			data.RawV1Alpha1().MachineConfig.MachineNetwork = &v1alpha1.NetworkConfig{}
 		}
 
+		talosVersion, parseErr := semver.NewVersion(strings.TrimLeft(scope.Config.Spec.TalosVersion, "v"))
+
 		if scope.Config.Spec.Hostname.Source == v1alpha3.HostnameSourceMachineName {
-			data.RawV1Alpha1().MachineConfig.MachineNetwork.NetworkHostname = scope.ConfigOwner.GetName()
+			if parseErr == nil && talosVersion.GreaterThanEqual(semver.MustParse("1.12.0-beta.0")) {
+				hostnameCfg, err := newHostnameConfig(scope.ConfigOwner.GetName())
+				if err != nil {
+					return retBundle, patches, err
+				}
+
+				patches = append(patches, hostnameCfg)
+			} else {
+				data.RawV1Alpha1().MachineConfig.MachineNetwork.NetworkHostname = scope.ConfigOwner.GetName()
+			}
 		}
 
 		if scope.Config.Spec.Hostname.Source == v1alpha3.HostnameSourceInfrastructureName {
 			machine := &capiv1.Machine{}
 			if err := runtime.DefaultUnstructuredConverter.FromUnstructured(scope.ConfigOwner.Object, machine); err != nil {
-				return retBundle, err
+				return retBundle, patches, err
+			}
+
+			if parseErr == nil && talosVersion.GreaterThanEqual(semver.MustParse("1.12.0-beta.0")) {
+				hostnameCfg, err := newHostnameConfig(machine.Spec.InfrastructureRef.Name)
+				if err != nil {
+					return retBundle, patches, err
+				}
+
+				patches = append(patches, hostnameCfg)
+			} else {
+				data.RawV1Alpha1().MachineConfig.MachineNetwork.NetworkHostname = machine.Spec.InfrastructureRef.Name
 			}
-			data.RawV1Alpha1().MachineConfig.MachineNetwork.NetworkHostname = machine.Spec.InfrastructureRef.Name
 		}
 	}
 
 	dataOut, err := data.EncodeString(encoder.WithComments(encoder.CommentsDisabled))
 	if err != nil {
-		return retBundle, err
+		return retBundle, patches, err
 	}
 
 	retBundle.BootstrapData = dataOut
 
-	return retBundle, nil
+	return retBundle, patches, nil
 }
 
 // MachineToBootstrapMapFunc is a handler.ToRequestsFunc to be used to enqueue
@@ -653,3 +684,15 @@ func (r *TalosConfigReconciler) ClusterToTalosConfigs(ctx context.Context, o cli
 
 	return result
 }
+
+func newHostnameConfig(hostname string) (string, error) {
+	hostnameConfig := network.NewHostnameConfigV1Alpha1()
+	hostnameConfig.ConfigAuto = pointer.To(nethelpers.AutoHostnameKindOff)
+	hostnameConfig.ConfigHostname = hostname
+
+	buf := new(bytes.Buffer)
+
+	err := yaml.NewEncoder(buf).Encode(hostnameConfig)
+
+	return buf.String(), err
+}