Merge pull request #11952 from cahillsf/modify-calling-agg-cluster-conditions

🐛 Modify calling agg cluster conditions

Author: k8s-ci-robot

internal/controllers/cluster/cluster_controller_status.go

@@ -791,15 +791,6 @@ func setRollingOutCondition(ctx context.Context, cluster *clusterv1.Cluster, con
 		return
 	}
 
-	if controlPlane == nil && len(machinePools.Items)+len(machineDeployments.Items) == 0 {
-		v1beta2conditions.Set(cluster, metav1.Condition{
-			Type:   clusterv1.ClusterRollingOutV1Beta2Condition,
-			Status: metav1.ConditionFalse,
-			Reason: clusterv1.ClusterNotRollingOutV1Beta2Reason,
-		})
-		return
-	}
-
 	ws := make([]aggregationWrapper, 0, len(machinePools.Items)+len(machineDeployments.Items)+1)
 	if controlPlane != nil {
 		// control plane is considered only if it is reporting the condition (the contract does not require conditions to be reported)
@@ -815,6 +806,15 @@ func setRollingOutCondition(ctx context.Context, cluster *clusterv1.Cluster, con
 		ws = append(ws, aggregationWrapper{md: &md})
 	}
 
+	if len(ws) == 0 {
+		v1beta2conditions.Set(cluster, metav1.Condition{
+			Type:   clusterv1.ClusterRollingOutV1Beta2Condition,
+			Status: metav1.ConditionFalse,
+			Reason: clusterv1.ClusterNotRollingOutV1Beta2Reason,
+		})
+		return
+	}
+
 	rollingOutCondition, err := v1beta2conditions.NewAggregateCondition(
 		ws, clusterv1.RollingOutV1Beta2Condition,
 		v1beta2conditions.TargetConditionType(clusterv1.ClusterRollingOutV1Beta2Condition),
@@ -862,15 +862,6 @@ func setScalingUpCondition(ctx context.Context, cluster *clusterv1.Cluster, cont
 		return
 	}
 
-	if controlPlane == nil && len(machinePools.Items)+len(machineDeployments.Items) == 0 {
-		v1beta2conditions.Set(cluster, metav1.Condition{
-			Type:   clusterv1.ClusterScalingUpV1Beta2Condition,
-			Status: metav1.ConditionFalse,
-			Reason: clusterv1.ClusterNotScalingUpV1Beta2Reason,
-		})
-		return
-	}
-
 	ws := make([]aggregationWrapper, 0, len(machinePools.Items)+len(machineDeployments.Items)+1)
 	if controlPlane != nil {
 		// control plane is considered only if it is reporting the condition (the contract does not require conditions to be reported)
@@ -892,6 +883,15 @@ func setScalingUpCondition(ctx context.Context, cluster *clusterv1.Cluster, cont
 		ws = append(ws, aggregationWrapper{ms: &ms})
 	}
 
+	if len(ws) == 0 {
+		v1beta2conditions.Set(cluster, metav1.Condition{
+			Type:   clusterv1.ClusterScalingUpV1Beta2Condition,
+			Status: metav1.ConditionFalse,
+			Reason: clusterv1.ClusterNotScalingUpV1Beta2Reason,
+		})
+		return
+	}
+
 	scalingUpCondition, err := v1beta2conditions.NewAggregateCondition(
 		ws, clusterv1.ScalingUpV1Beta2Condition,
 		v1beta2conditions.TargetConditionType(clusterv1.ClusterScalingUpV1Beta2Condition),
@@ -939,15 +939,6 @@ func setScalingDownCondition(ctx context.Context, cluster *clusterv1.Cluster, co
 		return
 	}
 
-	if controlPlane == nil && len(machinePools.Items)+len(machineDeployments.Items) == 0 {
-		v1beta2conditions.Set(cluster, metav1.Condition{
-			Type:   clusterv1.ClusterScalingDownV1Beta2Condition,
-			Status: metav1.ConditionFalse,
-			Reason: clusterv1.ClusterNotScalingDownV1Beta2Reason,
-		})
-		return
-	}
-
 	ws := make([]aggregationWrapper, 0, len(machinePools.Items)+len(machineDeployments.Items)+1)
 	if controlPlane != nil {
 		// control plane is considered only if it is reporting the condition (the contract does not require conditions to be reported)
@@ -969,6 +960,15 @@ func setScalingDownCondition(ctx context.Context, cluster *clusterv1.Cluster, co
 		ws = append(ws, aggregationWrapper{ms: &ms})
 	}
 
+	if len(ws) == 0 {
+		v1beta2conditions.Set(cluster, metav1.Condition{
+			Type:   clusterv1.ClusterScalingDownV1Beta2Condition,
+			Status: metav1.ConditionFalse,
+			Reason: clusterv1.ClusterNotScalingDownV1Beta2Reason,
+		})
+		return
+	}
+
 	scalingDownCondition, err := v1beta2conditions.NewAggregateCondition(
 		ws, clusterv1.ScalingDownV1Beta2Condition,
 		v1beta2conditions.TargetConditionType(clusterv1.ClusterScalingDownV1Beta2Condition),

util/conditions/v1beta2/aggregate_test.go

@@ -69,8 +69,10 @@ func TestAggregate(t *testing.T) {
 			wantErr: false,
 		},
 		{
-			name:          "Error if negative polarity conditions are misconfigured",
-			conditions:    [][]metav1.Condition{},
+			name: "Error if negative polarity conditions are misconfigured",
+			conditions: [][]metav1.Condition{
+				{{Type: clusterv1.ScalingUpV1Beta2Condition, Status: metav1.ConditionTrue, Reason: "Reason-1", Message: "Message-1"}},
+			},
 			conditionType: clusterv1.ScalingUpV1Beta2Condition,
 			options:       []AggregateOption{NegativePolarityConditionTypes{"foo"}}, // NegativePolarityConditionTypes if set must equal source condition
 			want:          nil,