add e2e tests

Signed-off-by: Varsha Prasad Narsing <[email protected]>

Author: varshaprasad96

test/e2e/catalogsource_install_test.go

@@ -4,13 +4,8 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"strings"
-	"time"
 
 	. "github.com/onsi/gomega"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/connectivity"
-	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
@@ -154,48 +149,46 @@ func createTestRegistryService(ctx context.Context, cli client.Client, namespace
 					TargetPort: intstr.FromInt(50051),
 				},
 			},
-			Type:     corev1.ServiceTypeNodePort,
 			Selector: map[string]string{"catalogsource": "prometheus-index"},
 		},
 	}
 	err := c.Create(ctx, svc)
 	Expect(err).To(BeNil())
 
-	conn, err := grpc.Dial(getServiceAddress(ctx, cli, namespace, svc.Name), []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}...)
-	Expect(err).ToNot(HaveOccurred())
-
-	defer conn.Close()
-	oldState := conn.GetState()
-	Eventually(func(g Gomega) {
-		state := conn.GetState()
-		if state != connectivity.Ready {
-			if conn.WaitForStateChange(ctx, conn.GetState()) {
-				state = conn.GetState()
-				if oldState != state {
-					oldState = state
-					if state == connectivity.Idle {
-						conn.Connect()
-					}
-				}
-			}
-		}
-		g.Expect(conn.GetState()).To(Equal(connectivity.Ready))
-	}).WithTimeout(2 * time.Minute).Should(Succeed())
+	// svcAddress := getServiceAddress(ctx, cli, namespace, svc.Name)
+
+	// conn, err := grpc.Dial(svcAddress, grpc.WithInsecure())
+	// Expect(err).ToNot(HaveOccurred())
+
+	// fmt.Println("svcAddress", svcAddress)
+	// connectionContext, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	// defer cancel()
+
+	// defer conn.Close()
+	// oldState := conn.GetState()
+	// Eventually(func(g Gomega) {
+	// 	state := conn.GetState()
+	// 	if state != connectivity.Ready {
+	// 		if conn.WaitForStateChange(connectionContext, conn.GetState()) {
+	// 			state = conn.GetState()
+	// 			if oldState != state {
+	// 				oldState = state
+	// 				if state == connectivity.Idle {
+	// 					conn.Connect()
+	// 				}
+	// 			}
+	// 		}
+	// 	}
+	// 	g.Expect(conn.GetState()).To(Equal(connectivity.Ready))
+	// }).WithTimeout(2 * time.Minute).Should(Succeed())
 	return svc.Name
 }
 
 func getServiceAddress(ctx context.Context, cli client.Client, namespace, name string) string {
 	svc := corev1.Service{}
 	err := cli.Get(ctx, types.NamespacedName{Name: name, Namespace: namespace}, &svc)
 	Expect(err).To(BeNil())
-	c := config.GetConfigOrDie()
-	parts := strings.Split(c.Host, ":")
-	address := parts[0]
-	if len(parts) == 3 {
-		address = strings.TrimLeft(parts[1], "/")
-	}
-	// TODO: not required on-cluster, fix Dockerfile and use fmt.Sprintf("%s.%s.svc:%d", svc.Name, svc.Namespace, svc.Spec.Ports[0].Port)
-	return fmt.Sprintf("%s:%d", address, svc.Spec.Ports[0].NodePort)
+	return fmt.Sprintf("%s.%s.svc:%d", svc.Name, svc.Namespace, svc.Spec.Ports[0].Port)
 }
 
 func applyCRDifNotPresent(ctx context.Context) func() {

test/e2e/catsrc_install_test.go

@@ -6,6 +6,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -41,6 +42,9 @@ var _ = BeforeSuite(func() {
 	err = catsrcapi.AddToScheme(scheme)
 	Expect(err).NotTo(HaveOccurred())
 
+	err = corev1.AddToScheme(scheme)
+	Expect(err).NotTo(HaveOccurred())
+
 	c, err = client.New(cfg, client.Options{Scheme: scheme})
 	Expect(err).To(Not(HaveOccurred()))
 })

test/e2e/e2e_suite_test.go

@@ -28,10 +28,20 @@ var _ = Describe("Operator Install", func() {
 		operator     *operatorv1alpha1.Operator
 	)
 
-	// var kubeClient *kubernetes.Clientset
 	var testNamespace string
 	cleanup := func() {}
 	ctx = context.TODO()
+	BeforeEach(func() {
+		testNamespace := createTestNamespace(ctx, c, "registry-grpc-")
+		cleanup = applyCRDifNotPresent(ctx)
+		testPrefix := "registry-grpc-"
+
+		serviceAccountName := createTestServiceAccount(ctx, c, testNamespace, testPrefix)
+		createTestRegistryPod(ctx, c, testNamespace, testPrefix, serviceAccountName)
+		serviceName := createTestRegistryService(ctx, c, testNamespace, testPrefix)
+		createTestCatalogSource(ctx, c, testNamespace, "prometheus-index", serviceName)
+
+	})
 	AfterEach(func() {
 		deleteTestNamespace(ctx, c, testNamespace)
 		cleanup()