Merge pull request #12477 from sbueringer/pr-remove-redundant-check

🌱 Remove redundant check in verifyV1Beta2ConditionsTrueV1Beta1

Author: k8s-ci-robot

test/e2e/clusterctl_upgrade.go

@@ -832,19 +832,17 @@ func verifyV1Beta2ConditionsTrueV1Beta1(ctx context.Context, c client.Client, cl
 				clusterv1.ClusterNameLabel: clusterName,
 			})
 	}, 3*time.Minute, 3*time.Second).Should(Succeed(), "Failed to list Machines for Cluster %s", klog.KObj(cluster))
-	if cluster.Status.V1Beta2 != nil && len(cluster.Status.V1Beta2.Conditions) > 0 {
-		for _, machine := range machineList.Items {
-			if machine.Status.V1Beta2 == nil || len(machine.Status.V1Beta2.Conditions) == 0 {
-				continue
-			}
-			for _, conditionType := range v1beta2conditionTypes {
-				for _, condition := range machine.Status.V1Beta2.Conditions {
-					if condition.Type != conditionType {
-						continue
-					}
-					Expect(condition.Status).To(Equal(metav1.ConditionTrue), "The v1beta2 condition %q on the Machine %q should be set to true", conditionType, machine.Name)
-					Expect(condition.Message).To(BeEmpty(), "The v1beta2 condition %q on the Machine %q should have an empty message", conditionType, machine.Name)
+	for _, machine := range machineList.Items {
+		if machine.Status.V1Beta2 == nil || len(machine.Status.V1Beta2.Conditions) == 0 {
+			continue
+		}
+		for _, conditionType := range v1beta2conditionTypes {
+			for _, condition := range machine.Status.V1Beta2.Conditions {
+				if condition.Type != conditionType {
+					continue
 				}
+				Expect(condition.Status).To(Equal(metav1.ConditionTrue), "The v1beta2 condition %q on the Machine %q should be set to true", conditionType, machine.Name)
+				Expect(condition.Message).To(BeEmpty(), "The v1beta2 condition %q on the Machine %q should have an empty message", conditionType, machine.Name)
 			}
 		}
 	}