Avoid KCP rollouts if only timeouts are changed

Signed-off-by: Stefan Büringer [email protected]

Author: sbueringer

controlplane/kubeadm/internal/filters.go

@@ -316,6 +316,12 @@ func matchInitOrJoinConfiguration(machineConfig *bootstrapv1.KubeadmConfig, kcp
 	}
 	machineConfig = machineConfig.DeepCopy()
 
+	// Cleanup Timeouts, 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
+	machineConfig.Spec.InitConfiguration.Timeouts = bootstrapv1.Timeouts{}
+	machineConfig.Spec.JoinConfiguration.Timeouts = bootstrapv1.Timeouts{}
+
 	// takes the KubeadmConfigSpec from KCP and applies the transformations required
 	// to allow a comparison with the KubeadmConfig referenced from the machine.
 	kcpConfig := getAdjustedKcpConfig(kcp, machineConfig)
@@ -344,6 +350,9 @@ func matchInitOrJoinConfiguration(machineConfig *bootstrapv1.KubeadmConfig, kcp
 func getAdjustedKcpConfig(kcp *controlplanev1.KubeadmControlPlane, machineConfig *bootstrapv1.KubeadmConfig) *bootstrapv1.KubeadmConfigSpec {
 	kcpConfig := kcp.Spec.KubeadmConfigSpec.DeepCopy()
 
+	kcpConfig.InitConfiguration.Timeouts = bootstrapv1.Timeouts{}
+	kcpConfig.JoinConfiguration.Timeouts = bootstrapv1.Timeouts{}
+
 	// if Machine's JoinConfiguration is set, this is a joining control plane machine, so empty out the InitConfiguration;
 	// otherwise empty out the JoinConfiguration.
 	// Note: a KubeadmConfig for a joining control plane must have at least joinConfiguration.controlPlane and joinConfiguration.discovery to be set for joining;

test/e2e/clusterctl_upgrade_test.go

@@ -275,7 +275,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>cur
 })
 
 // Note: This test should be changed during "prepare main branch", it should test n-1 => current.
-var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.10=>current) [ClusterClass]", Label("ClusterClass"), func() {
+var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.10=>current) [ClusterClass]", Label("ClusterClass", "PR-Blocking"), func() {
 	// Get n-1 latest stable release
 	version := "1.10"
 	stableRelease, err := GetStableReleaseOfMinor(ctx, version)
@@ -310,7 +310,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.10=>cu
 })
 
 // Note: This test should be changed during "prepare main branch", it should test n-1 => current.
-var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.10=>current) on K8S latest ci mgmt cluster [ClusterClass]", Label("ClusterClass"), func() {
+var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.10=>current) on K8S latest ci mgmt cluster [ClusterClass]", Label("ClusterClass", "PR-Blocking"), func() {
 	// Get n-1 latest stable release
 	version := "1.10"
 	stableRelease, err := GetStableReleaseOfMinor(ctx, version)

test/e2e/data/infrastructure-docker/v1.10/clusterclass-quick-start.yaml

@@ -554,6 +554,7 @@ spec:
           apiServer:
             extraArgs:
               v: "0"
+            timeoutForControlPlane: 4m
             # host.docker.internal is required by kubetest when running on MacOS because of the way ports are proxied.
             certSANs: [localhost, host.docker.internal, "::", "::1", "127.0.0.1", "0.0.0.0"]
         initConfiguration: