e2e: Add assertInstallPlan helper function

Use assertInstallPlan helper function get more insights
about failed install plans for the upgrade e2e test.

Author: alebedev87

test/e2e/gateway_api_upgrade_test.go

@@ -69,7 +69,7 @@ func TestOSSMOperatorUpgradeViaIntermediateVersions(t *testing.T) {
 	}
 
 	// Installation.
-	t.Logf("Creating GatewayClass with OSSMversion %q ans Istio version %q...", initialOSSMVersion, initialIstioVersion)
+	t.Logf("Creating GatewayClass with OSSMversion %q and Istio version %q...", initialOSSMVersion, initialIstioVersion)
 	gatewayClass := buildGatewayClass("openshift-default", "openshift.io/gateway-controller/v1")
 	gatewayClass.Annotations = map[string]string{
 		"unsupported.do-not-use.openshift.io/ossm-catalog":  customCatalogSourceName,
@@ -83,6 +83,10 @@ func TestOSSMOperatorUpgradeViaIntermediateVersions(t *testing.T) {
 	if err := assertSubscription(t, openshiftOperatorsNamespace, expectedSubscriptionName); err != nil {
 		t.Fatalf("Failed to find expected Subscription %s: %v", expectedSubscriptionName, err)
 	}
+	t.Log("Checking for the InstallPlan...")
+	if err := assertInstallPlan(t, openshiftOperatorsNamespace, initialOSSMVersion); err != nil {
+		t.Fatalf("Failed to find expected InstallPlan %s: %v", initialOSSMVersion, err)
+	}
 	t.Log("Checking for the OSSM operator deployment...")
 	if err := assertOSSMOperatorWithConfig(t, initialOSSMVersion, 2*time.Second, 2*time.Minute); err != nil {
 		t.Fatalf("Failed to find expected Istio operator: %v", err)

test/e2e/util_gatewayapi_test.go

@@ -640,6 +640,63 @@ func deleteExistingSubscription(t *testing.T, namespace, subName string) error {
 
 }
 
+// assertInstallPlan checks if the InstallPlan with given ClusterServiceVersion exists and installed.
+func assertInstallPlan(t *testing.T, namespace, csvName string) error {
+	t.Helper()
+
+	ips := &operatorsv1alpha1.InstallPlanList{}
+	var ip *operatorsv1alpha1.InstallPlan
+	ipHasCSV := func(ip operatorsv1alpha1.InstallPlan) bool {
+		for _, c := range ip.Spec.ClusterServiceVersionNames {
+			if c == csvName {
+				return true
+			}
+		}
+		return false
+	}
+
+	err := wait.PollUntilContextTimeout(context.Background(), 2*time.Second, 2*time.Minute, false, func(context context.Context) (bool, error) {
+		if err := kclient.List(context, ips); err != nil {
+			t.Logf("Failed to list install plans: %v, retrying...", err)
+			return false, nil
+		}
+
+		for i := range ips.Items {
+			if ipHasCSV(ips.Items[i]) {
+				ip = &ips.Items[i]
+				break
+			}
+		}
+
+		if ip == nil {
+			t.Logf("Failed to find install plan for clusterserviceversion %q, retrying...", csvName)
+			return false, nil
+		}
+
+		t.Logf("Found install plan %q", ip.Name)
+		for _, c := range ip.Status.Conditions {
+			if c.Type == operatorsv1alpha1.InstallPlanInstalled {
+				if c.Status == corev1.ConditionTrue {
+					t.Logf("Installed condition is false for install plan %q, retrying...", ip.Name)
+					return false, nil
+				}
+				break
+			}
+		}
+		t.Logf("Install plan %q successfully installed", ip.Name)
+		return true, nil
+	})
+	if err != nil {
+		if ip != nil {
+			t.Logf("Last observed state of install plan %q:\n%s", ip.Name, util.ToYaml(ip))
+		} else {
+			t.Logf("Last observed state of all install plans:\n%s", util.ToYaml(ips))
+		}
+	}
+
+	return err
+}
+
 // assertOSSMOperator checks if the OSSM operator gets successfully installed
 // and returns an error if not. It uses configurable parameters such as the expected OSSM version, polling interval, and timeout.
 func assertOSSMOperator(t *testing.T) error {