test(e2e): amend according to new conditions

Author: zerospiel

test/e2e/clusterdeployment/validate_deployed.go

@@ -28,6 +28,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	clusterapiv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 
 	"github.com/K0rdent/kcm/test/e2e/kubeclient"
 	validationutil "github.com/K0rdent/kcm/test/util/validation"
@@ -56,7 +57,11 @@ func validateCluster(ctx context.Context, kc *kubeclient.KubeClient, clusterName
 		Fail(err.Error())
 	}
 
-	return validationutil.ValidateConditionsTrue(cluster)
+	return validationutil.ValidateConditionsTrue(cluster,
+		clusterapiv1.AvailableCondition,
+		clusterapiv1.ClusterControlPlaneMachinesReadyCondition,
+		clusterapiv1.ClusterWorkerMachinesReadyReason,
+	)
 }
 
 func validateMachines(ctx context.Context, kc *kubeclient.KubeClient, clusterName string) error {
@@ -80,7 +85,7 @@ func validateMachines(ctx context.Context, kc *kubeclient.KubeClient, clusterNam
 				Fail(err.Error())
 			}
 
-			if err := validationutil.ValidateConditionsTrue(&md); err != nil {
+			if err := validationutil.ValidateConditionsTrue(&md, clusterapiv1.ReadyCondition); err != nil {
 				return err
 			}
 		}
@@ -91,7 +96,7 @@ func validateMachines(ctx context.Context, kc *kubeclient.KubeClient, clusterNam
 			Fail(err.Error())
 		}
 
-		if err := validationutil.ValidateConditionsTrue(&machine); err != nil {
+		if err := validationutil.ValidateConditionsTrue(&machine, clusterapiv1.ReadyCondition, clusterapiv1.AvailableCondition); err != nil {
 			return err
 		}
 	}

test/util/validation/validation.go

@@ -27,18 +27,30 @@ import (
 
 // ValidateConditionsTrue iterates over the conditions of the given
 // unstructured object and returns an error if any of the conditions are not
-// true.  Conditions are expected to be of type metav1.Condition.
-func ValidateConditionsTrue(unstrObj *unstructured.Unstructured) error {
+// true. Conditions are expected to be of type metav1.Condition.
+//
+// If includeTypes argument is set, then validation includes only the given,
+// otherwise all of the available conditions are up to be tested against Status == True.
+func ValidateConditionsTrue(unstrObj *unstructured.Unstructured, includeTypes ...string) error {
 	objKind, objName := statusutil.ObjKindName(unstrObj)
 
 	conditions, err := statusutil.ConditionsFromUnstructured(unstrObj)
 	if err != nil {
 		return fmt.Errorf("failed to get conditions from unstructured object: %w", err)
 	}
 
-	var errs error
+	include := make(map[string]struct{}, len(includeTypes))
+	for _, v := range includeTypes {
+		include[v] = struct{}{}
+	}
 
+	var errs error
 	for _, c := range conditions {
+		if len(include) > 0 {
+			if _, ok := include[c.Type]; !ok {
+				continue
+			}
+		}
 		if c.Status == metav1.ConditionTrue {
 			continue
 		}