NE-2097: e2e - Add custom catalog source

Author: alebedev87

test/e2e/gateway_api_upgrade_test.go

@@ -45,16 +45,34 @@ func TestOSSMOperatorUpgradeViaIntermediateVersions(t *testing.T) {
 	})
 
 	var (
-		initialOSSMVersion  = "servicemeshoperator3.v3.0.0"
-		initialIstioVersion = "v1.24.3"
-		upgradeOSSMVersion  = "servicemeshoperator3.v3.1.0"
-		upgradeIstioVersion = "v1.26.2"
+		// CatalogSource image saved before the release of servicemeshoperator 3.1.0.
+		// This image is useful because it includes intermediate versions in the
+		// servicemeshoperator3 upgrade graph. After 3.1.0 was released, all
+		// upgrades from 3.0.z were changed to jump directly to 3.1.0, skipping
+		// intermediate versions.
+		customCatalogSourceImage = "registry.redhat.io/redhat/redhat-operator-index@sha256:069050dbf2970f0762b816a054342e551802c45fb77417c216aed70cec5e843c"
+		customCatalogSourceName  = "custom-redhat-operators-4-19"
+		initialOSSMVersion       = "servicemeshoperator3.v3.0.0"
+		initialIstioVersion      = "v1.24.3"
+		upgradeOSSMVersion       = "servicemeshoperator3.v3.0.3"
+		upgradeIstioVersion      = "v1.24.6"
 	)
 
+	// Create custom catalog source with expected upgrade graph for servicemeshoperator3.
+	t.Log("Creating custom CatalogSource...")
+	if err := createCatalogSource(t, "openshift-marketplace", customCatalogSourceName, customCatalogSourceImage); err != nil {
+		t.Fatalf("Failed to create CatalogSource %q: %v", customCatalogSourceName, err)
+	}
+	t.Log("Checking for the CatalogSource...")
+	if err := assertCatalogSourceWithConfig(t, "openshift-marketplace", customCatalogSourceName, 2*time.Second, 2*time.Minute); err != nil {
+		t.Fatalf("Failed to find expected CatalogSource %q: %v", customCatalogSourceName, err)
+	}
+
 	// Installation.
 	t.Logf("Creating GatewayClass with OSSMversion %q ans 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,
 		"unsupported.do-not-use.openshift.io/ossm-version":  initialOSSMVersion,
 		"unsupported.do-not-use.openshift.io/istio-version": initialIstioVersion,
 	}
@@ -65,10 +83,6 @@ 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 CatalogSource...")
-	if err := assertCatalogSource(t, expectedCatalogSourceNamespace, expectedCatalogSourceName); err != nil {
-		t.Fatalf("Failed to find expected CatalogSource %s: %v", expectedCatalogSourceName, 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)
@@ -91,6 +105,7 @@ func TestOSSMOperatorUpgradeViaIntermediateVersions(t *testing.T) {
 			return false, nil
 		}
 		gc.Annotations = map[string]string{
+			"unsupported.do-not-use.openshift.io/ossm-catalog":  customCatalogSourceName,
 			"unsupported.do-not-use.openshift.io/ossm-version":  upgradeOSSMVersion,
 			"unsupported.do-not-use.openshift.io/istio-version": upgradeIstioVersion,
 		}

test/e2e/util_gatewayapi_test.go

@@ -420,6 +420,33 @@ func createCRD(name string) (*apiextensionsv1.CustomResourceDefinition, error) {
 	return crd, nil
 }
 
+// createCatalogSource creates a CatalogSource with the given name and image.
+// It returns an error if creation fails after retries.
+func createCatalogSource(t *testing.T, namespace, name, image string) error {
+	t.Helper()
+
+	cs := &operatorsv1alpha1.CatalogSource{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: namespace,
+			Name:      name,
+		},
+		Spec: operatorsv1alpha1.CatalogSourceSpec{
+			Image:       image,
+			SourceType:  operatorsv1alpha1.SourceTypeGrpc,
+			DisplayName: name,
+			Publisher:   "Custom Red Hat",
+		},
+	}
+
+	return wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 30*time.Second, false, func(context context.Context) (bool, error) {
+		if err := kclient.Create(context, cs); err != nil && !kerrors.IsAlreadyExists(err) {
+			t.Logf("Failed to create CatalogSource %q: %v, retrying...", name, err)
+			return false, nil
+		}
+		return true, nil
+	})
+}
+
 // buildGatewayClass initializes the GatewayClass and returns its address.
 func buildGatewayClass(name, controllerName string) *gatewayapiv1.GatewayClass {
 	return &gatewayapiv1.GatewayClass{