Avoid KCP rollouts if only timeouts are changed

Author: sbueringer

controlplane/kubeadm/internal/filters.go

@@ -341,6 +341,14 @@ func PrepareKubeadmConfigsForDiff(desiredKubeadmConfig, currentKubeadmConfig *bo
 	desiredKubeadmConfig.Spec.JoinConfiguration.Discovery = bootstrapv1.Discovery{}
 	currentKubeadmConfig.Spec.JoinConfiguration.Discovery = bootstrapv1.Discovery{}
 
+	// Cleanup Timeouts from desiredKubeadmConfig and currentKubeadmConfig, because those info are relevant only for
+	// the join process and not for comparing the configuration of the machine.
+	// Note: Changes to Timeouts will apply for the next join, but they will not lead to a rollout.
+	desiredKubeadmConfig.Spec.JoinConfiguration.Timeouts = bootstrapv1.Timeouts{}
+	currentKubeadmConfig.Spec.JoinConfiguration.Timeouts = bootstrapv1.Timeouts{}
+	desiredKubeadmConfig.Spec.InitConfiguration.Timeouts = bootstrapv1.Timeouts{}
+	currentKubeadmConfig.Spec.InitConfiguration.Timeouts = bootstrapv1.Timeouts{}
+
 	// If KCP JoinConfiguration.ControlPlane is nil and the Machine JoinConfiguration.ControlPlane is empty,
 	// set Machine JoinConfiguration.ControlPlane to nil.
 	// NOTE: This is required because CABPK applies an empty JoinConfiguration.ControlPlane in case it is nil.

controlplane/kubeadm/internal/filters_test.go

@@ -338,9 +338,13 @@ func TestMatchesKubeadmConfig(t *testing.T) {
 				KubeadmConfigSpec: bootstrapv1.KubeadmConfigSpec{
 					ClusterConfiguration: bootstrapv1.ClusterConfiguration{},
 					JoinConfiguration: bootstrapv1.JoinConfiguration{
-						Timeouts: bootstrapv1.Timeouts{
-							ControlPlaneComponentHealthCheckSeconds: ptr.To[int32](5),
-							KubernetesAPICallSeconds:                ptr.To[int32](7),
+						Timeouts: bootstrapv1.Timeouts{ // Timeouts are different, but they are ignored for the diff
+							ControlPlaneComponentHealthCheckSeconds: ptr.To[int32](1),
+							KubeletHealthCheckSeconds:               ptr.To[int32](2),
+							KubernetesAPICallSeconds:                ptr.To[int32](3),
+							EtcdAPICallSeconds:                      ptr.To[int32](4),
+							TLSBootstrapSeconds:                     ptr.To[int32](5),
+							DiscoverySeconds:                        ptr.To[int32](6),
 						},
 						Patches: bootstrapv1.Patches{
 							Directory: "/test/patches",
@@ -391,9 +395,13 @@ func TestMatchesKubeadmConfig(t *testing.T) {
 				Spec: bootstrapv1.KubeadmConfigSpec{
 					// InitConfiguration will be converted to JoinConfiguration and then compared against the JoinConfiguration from KCP.
 					InitConfiguration: bootstrapv1.InitConfiguration{
-						Timeouts: bootstrapv1.Timeouts{
-							ControlPlaneComponentHealthCheckSeconds: ptr.To[int32](5),
-							KubernetesAPICallSeconds:                ptr.To[int32](7),
+						Timeouts: bootstrapv1.Timeouts{ // Timeouts are different, but they are ignored for the diff
+							ControlPlaneComponentHealthCheckSeconds: ptr.To[int32](11),
+							KubeletHealthCheckSeconds:               ptr.To[int32](12),
+							KubernetesAPICallSeconds:                ptr.To[int32](13),
+							EtcdAPICallSeconds:                      ptr.To[int32](14),
+							TLSBootstrapSeconds:                     ptr.To[int32](15),
+							DiscoverySeconds:                        ptr.To[int32](16),
 						},
 						Patches: bootstrapv1.Patches{
 							Directory: "/test/patches",
@@ -612,7 +620,7 @@ func TestMatchesKubeadmConfig(t *testing.T) {
 		g.Expect(match).To(BeTrue())
 		g.Expect(reason).To(BeEmpty())
 	})
-	t.Run("returns true if JoinConfiguration is equal apart from discovery", func(t *testing.T) {
+	t.Run("returns true if JoinConfiguration is equal apart from Discovery and Timeouts", func(t *testing.T) {
 		g := NewWithT(t)
 		kcp := &controlplanev1.KubeadmControlPlane{
 			Spec: controlplanev1.KubeadmControlPlaneSpec{
@@ -625,6 +633,14 @@ func TestMatchesKubeadmConfig(t *testing.T) {
 						},
 						// Discovery gets removed because Discovery is not relevant for the rollout decision.
 						Discovery: bootstrapv1.Discovery{TLSBootstrapToken: "aaa"},
+						Timeouts: bootstrapv1.Timeouts{
+							ControlPlaneComponentHealthCheckSeconds: ptr.To[int32](1),
+							KubeletHealthCheckSeconds:               ptr.To[int32](2),
+							KubernetesAPICallSeconds:                ptr.To[int32](3),
+							EtcdAPICallSeconds:                      ptr.To[int32](4),
+							TLSBootstrapSeconds:                     ptr.To[int32](5),
+							DiscoverySeconds:                        ptr.To[int32](6),
+						},
 					},
 				},
 				Version: "v1.30.0",
@@ -658,6 +674,14 @@ func TestMatchesKubeadmConfig(t *testing.T) {
 						},
 						// Discovery gets removed because Discovery is not relevant for the rollout decision.
 						Discovery: bootstrapv1.Discovery{TLSBootstrapToken: "bbb"},
+						Timeouts: bootstrapv1.Timeouts{
+							ControlPlaneComponentHealthCheckSeconds: ptr.To[int32](11),
+							KubeletHealthCheckSeconds:               ptr.To[int32](12),
+							KubernetesAPICallSeconds:                ptr.To[int32](13),
+							EtcdAPICallSeconds:                      ptr.To[int32](14),
+							TLSBootstrapSeconds:                     ptr.To[int32](15),
+							DiscoverySeconds:                        ptr.To[int32](16),
+						},
 					},
 				},
 			},