feat: trigger rollout on controlPlaneConfig changes

This change automatically rolls out new Machines when
the controlPlaneConfig has been changed.

Signed-off-by: Ströger Florian <[email protected]>
Signed-off-by: Artem Chernyshev <[email protected]>

Author: Preisschild

controllers/controllers_test.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	. "github.com/onsi/gomega"
+	bootstrapv1alpha3 "github.com/siderolabs/cluster-api-bootstrap-provider-talos/api/v1alpha3"
 	"github.com/siderolabs/talos/pkg/machinery/api/common"
 	"github.com/siderolabs/talos/pkg/machinery/api/machine"
 	"github.com/siderolabs/talos/pkg/machinery/config/types/v1alpha1/generate"
@@ -568,6 +569,31 @@ func (suite *ControllersSuite) TestRollingUpdate() {
 		}
 	}, time.Minute).Should(Succeed())
 
+	for _, machine := range getMachines() {
+		talosconfig := &bootstrapv1alpha3.TalosConfig{}
+
+		fakeClient.Get(suite.ctx, client.ObjectKey{Name: machine.Spec.Bootstrap.ConfigRef.Name, Namespace: machine.Spec.Bootstrap.ConfigRef.Namespace}, talosconfig)
+
+		patchHelper, err := patch.NewHelper(talosconfig, fakeClient)
+		talosconfig.Spec.TalosVersion = "v1.5.0"
+
+		g.Expect(err).To(BeNil())
+		g.Expect(patchHelper.Patch(suite.ctx, talosconfig)).To(Succeed())
+	}
+
+	g.Eventually(func(g Gomega) {
+		_, err = r.Reconcile(suite.ctx, ctrl.Request{NamespacedName: util.ObjectKey(tcp)})
+		g.Expect(err).NotTo(HaveOccurred())
+		g.Expect(r.APIReader.Get(suite.ctx, client.ObjectKey{Name: tcp.Name, Namespace: tcp.Namespace}, tcp)).To(Succeed())
+		g.Expect(tcp.Status.ReadyReplicas).To(BeEquivalentTo(2))
+
+		machines := getMachines()
+		for _, machine := range machines {
+			g.Expect(machine.Spec.Version).ToNot(BeNil())
+			g.Expect(*machine.Spec.Version).To(BeEquivalentTo(tcp.Spec.Version))
+		}
+	}, time.Minute).Should(Succeed())
+
 	cancel()
 	g.Expect(eg.Wait()).To(Succeed())
 }

controllers/controlplane.go

@@ -6,6 +6,9 @@ package controllers
 
 import (
 	"context"
+	"reflect"
+
+	cabptv1 "github.com/siderolabs/cluster-api-bootstrap-provider-talos/api/v1alpha3"
 
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
@@ -30,6 +33,7 @@ type ControlPlane struct {
 	Machines collections.Machines
 
 	infraObjects map[string]*unstructured.Unstructured
+	talosConfigs map[string]*cabptv1.TalosConfig
 }
 
 // newControlPlane returns an instantiated ControlPlane.
@@ -39,11 +43,17 @@ func newControlPlane(ctx context.Context, client client.Client, cluster *cluster
 		return nil, err
 	}
 
+	talosConfigs, err := getTalosConfigs(ctx, client, machines)
+	if err != nil {
+		return nil, err
+	}
+
 	return &ControlPlane{
 		TCP:          tcp,
 		Cluster:      cluster,
 		Machines:     machines,
 		infraObjects: infraObjects,
+		talosConfigs: talosConfigs,
 	}, nil
 }
 
@@ -76,6 +86,7 @@ func (c *ControlPlane) MachinesNeedingRollout() collections.Machines {
 			collections.And(
 				collections.MatchesKubernetesVersion(c.TCP.Spec.Version),
 				MatchesTemplateClonedFrom(c.infraObjects, c.TCP),
+				MatchesControlPlaneConfig(c.talosConfigs, c.TCP),
 			),
 		),
 	)
@@ -97,6 +108,35 @@ func getInfraResources(ctx context.Context, cl client.Client, machines collectio
 	return result, nil
 }
 
+// getTalosConfigs fetches the TalosConfigs for each machine in the collection and returns a map of machine.Name -> TalosConfig.
+func getTalosConfigs(ctx context.Context, cl client.Client, machines collections.Machines) (map[string]*cabptv1.TalosConfig, error) {
+	result := map[string]*cabptv1.TalosConfig{}
+
+	for _, m := range machines {
+		bootstrapRef := m.Spec.Bootstrap.ConfigRef
+		if bootstrapRef == nil {
+			continue
+		}
+
+		talosconfig := &cabptv1.TalosConfig{}
+
+		err := cl.Get(ctx, client.ObjectKey{
+			Namespace: m.Namespace,
+			Name:      bootstrapRef.Name,
+		}, talosconfig)
+		if err != nil {
+			if apierrors.IsNotFound(errors.Cause(err)) {
+				continue
+			}
+			return nil, errors.Wrapf(err, "failed to retrieve talosconfig obj for machine %q", m.Name)
+		}
+
+		result[m.Name] = talosconfig
+	}
+
+	return result, nil
+}
+
 // MatchesTemplateClonedFrom returns a filter to find all machines that match a given TCP infra template.
 func MatchesTemplateClonedFrom(infraConfigs map[string]*unstructured.Unstructured, tcp *controlplanev1.TalosControlPlane) collections.Func {
 	return func(machine *clusterv1.Machine) bool {
@@ -127,3 +167,20 @@ func MatchesTemplateClonedFrom(infraConfigs map[string]*unstructured.Unstructure
 		return true
 	}
 }
+
+// MatchesControlPlaneConfig returns a filter to find all machines that match a given controlPaneConfig.
+func MatchesControlPlaneConfig(talosConfigs map[string]*cabptv1.TalosConfig, tcp *controlplanev1.TalosControlPlane) collections.Func {
+	return func(machine *clusterv1.Machine) bool {
+		if machine == nil {
+			return false
+		}
+
+		talosConfig, found := talosConfigs[machine.Name]
+		if !found {
+			// Return true here because failing to get talosconfig should not be considered as unmatching.
+			return true
+		}
+
+		return reflect.DeepEqual(tcp.Spec.ControlPlaneConfig.ControlPlaneConfig, talosConfig.Spec)
+	}
+}