Avoid unnecessary status updates in v1beta1 dual-write

Compare existing Deprecated.V1Beta1.Conditions with the new conditions
before writing. Skip the SetV1Beta1Conditions call if Type, Status,
Reason, and Message all match for every condition. This prevents
unnecessary resourceVersion bumps on stable objects, which was causing
the apiversion-upgrade e2e test's resource version stability check to
fail.

Author: willie-yao

azure/scope/cluster.go

@@ -942,7 +942,7 @@ func (s *ClusterScope) PatchObject(ctx context.Context) error {
 	}
 
 	// Populate deprecated v1beta1 conditions from v1beta2 conditions for backward compat.
-	setV1Beta1ConditionsFromV1Beta2(s.AzureCluster, s.AzureCluster.GetConditions())
+	setV1Beta1ConditionsFromV1Beta2(s.AzureCluster, s.AzureCluster, s.AzureCluster.GetConditions())
 
 	// v1beta1 owned conditions for backward compat patch conflict resolution.
 	ownedV1Beta1Conditions := []clusterv1.ConditionType{ //nolint:staticcheck // intentional use of deprecated type for v1beta1 backward compat

azure/scope/deprecated_conditions.go

@@ -26,12 +26,20 @@ import (
 // to v1beta1 format (clusterv1.Conditions) and stores them via the setter.
 // This populates Deprecated.V1Beta1.Conditions so that v1beta1 clients see conditions
 // when the v1beta2→v1beta1 conversion webhook runs.
+// To avoid unnecessary status updates (which bump resourceVersion), we only write
+// when the number of conditions changes or when a condition type/status/reason differs.
 //
 //nolint:staticcheck // intentional use of deprecated types for v1beta1 backward compat
-func setV1Beta1ConditionsFromV1Beta2(setter interface{ SetV1Beta1Conditions(clusterv1.Conditions) }, v1beta2Conditions []metav1.Condition) {
+func setV1Beta1ConditionsFromV1Beta2(
+	getter interface{ GetV1Beta1Conditions() clusterv1.Conditions },
+	setter interface{ SetV1Beta1Conditions(clusterv1.Conditions) },
+	v1beta2Conditions []metav1.Condition,
+) {
 	if len(v1beta2Conditions) == 0 {
 		return
 	}
+
+	// Build the new v1beta1 conditions from v1beta2.
 	v1beta1Conds := make(clusterv1.Conditions, 0, len(v1beta2Conditions))
 	for _, c := range v1beta2Conditions {
 		v1beta1Conds = append(v1beta1Conds, clusterv1.Condition{
@@ -42,5 +50,25 @@ func setV1Beta1ConditionsFromV1Beta2(setter interface{ SetV1Beta1Conditions(clus
 			Message:            c.Message,
 		})
 	}
+
+	// Skip the write if the existing v1beta1 conditions already match.
+	// This prevents unnecessary resourceVersion bumps on stable objects.
+	existing := getter.GetV1Beta1Conditions()
+	if len(existing) == len(v1beta1Conds) {
+		changed := false
+		for i := range v1beta1Conds {
+			if existing[i].Type != v1beta1Conds[i].Type ||
+				existing[i].Status != v1beta1Conds[i].Status ||
+				existing[i].Reason != v1beta1Conds[i].Reason ||
+				existing[i].Message != v1beta1Conds[i].Message {
+				changed = true
+				break
+			}
+		}
+		if !changed {
+			return
+		}
+	}
+
 	setter.SetV1Beta1Conditions(v1beta1Conds)
 }

azure/scope/machine.go

@@ -679,7 +679,7 @@ func (m *MachineScope) PatchObject(ctx context.Context) error {
 	}
 
 	// Populate deprecated v1beta1 conditions from v1beta2 conditions for backward compat.
-	setV1Beta1ConditionsFromV1Beta2(m.AzureMachine, m.AzureMachine.GetConditions())
+	setV1Beta1ConditionsFromV1Beta2(m.AzureMachine, m.AzureMachine, m.AzureMachine.GetConditions())
 
 	// v1beta1 owned conditions for backward compat patch conflict resolution.
 	ownedV1Beta1Conditions := []clusterv1.ConditionType{ //nolint:staticcheck // intentional use of deprecated type for v1beta1 backward compat

azure/scope/machinepool.go

@@ -694,7 +694,7 @@ func (m *MachinePoolScope) PatchObject(ctx context.Context) error {
 	}
 
 	// Populate deprecated v1beta1 conditions from v1beta2 conditions for backward compat.
-	setV1Beta1ConditionsFromV1Beta2(m.AzureMachinePool, m.AzureMachinePool.GetConditions())
+	setV1Beta1ConditionsFromV1Beta2(m.AzureMachinePool, m.AzureMachinePool, m.AzureMachinePool.GetConditions())
 
 	// v1beta1 owned conditions for backward compat patch conflict resolution.
 	ownedV1Beta1Conditions := []clusterv1.ConditionType{ //nolint:staticcheck // intentional use of deprecated type for v1beta1 backward compat

azure/scope/machinepoolmachine.go

@@ -321,7 +321,7 @@ func (s *MachinePoolMachineScope) PatchObject(ctx context.Context) error {
 	}
 
 	// Populate deprecated v1beta1 conditions from v1beta2 conditions for backward compat.
-	setV1Beta1ConditionsFromV1Beta2(s.AzureMachinePoolMachine, s.AzureMachinePoolMachine.GetConditions())
+	setV1Beta1ConditionsFromV1Beta2(s.AzureMachinePoolMachine, s.AzureMachinePoolMachine, s.AzureMachinePoolMachine.GetConditions())
 
 	// v1beta1 owned conditions for backward compat patch conflict resolution.
 	ownedV1Beta1Conditions := []clusterv1.ConditionType{ //nolint:staticcheck // intentional use of deprecated type for v1beta1 backward compat

azure/scope/managedcontrolplane.go

@@ -244,7 +244,7 @@ func (s *ManagedControlPlaneScope) PatchObject(ctx context.Context) error {
 	}
 
 	// Populate deprecated v1beta1 conditions from v1beta2 conditions for backward compat.
-	setV1Beta1ConditionsFromV1Beta2(s.ControlPlane, s.ControlPlane.GetConditions())
+	setV1Beta1ConditionsFromV1Beta2(s.ControlPlane, s.ControlPlane, s.ControlPlane.GetConditions())
 
 	// v1beta1 owned conditions for backward compat patch conflict resolution.
 	ownedV1Beta1Conditions := []clusterv1.ConditionType{ //nolint:staticcheck // intentional use of deprecated type for v1beta1 backward compat

azure/scope/managedmachinepool.go

@@ -116,7 +116,7 @@ func (s *ManagedMachinePoolScope) PatchObject(ctx context.Context) error {
 	}
 
 	// Populate deprecated v1beta1 conditions from v1beta2 conditions for backward compat.
-	setV1Beta1ConditionsFromV1Beta2(s.InfraMachinePool, s.InfraMachinePool.GetConditions())
+	setV1Beta1ConditionsFromV1Beta2(s.InfraMachinePool, s.InfraMachinePool, s.InfraMachinePool.GetConditions())
 
 	// v1beta1 owned conditions for backward compat patch conflict resolution.
 	ownedV1Beta1Conditions := []clusterv1.ConditionType{ //nolint:staticcheck // intentional use of deprecated type for v1beta1 backward compat