[Monorepo]: Move e2e tests from catalogd to operator-controller

Author: camilamacedo86

.github/workflows/catalogd-e2e.yaml

@@ -17,8 +17,7 @@ jobs:
         with:
           go-version-file: "go.mod"
       - name: Run E2e
-        working-directory: catalogd
-        run: make e2e
+        run: make test-catalogd-e2e
   upgrade-e2e:
     runs-on: ubuntu-latest
     steps:

Makefile

@@ -25,6 +25,7 @@ endif
 export IMAGE_TAG
 
 IMG := $(IMAGE_REPO):$(IMAGE_TAG)
+CATALOGD_IMG := $(CATALOG_IMAGE_REPO):$(IMAGE_TAG)
 
 # Define dependency versions (use go.mod if we also use Go code from dependency)
 export CERT_MGR_VERSION := v1.15.3
@@ -64,12 +65,15 @@ $(warning Could not find docker or podman in path! This may result in targets re
 endif
 
 KUSTOMIZE_BUILD_DIR := config/overlays/cert-manager
+CATALOGD_KUSTOMIZE_BUILD_DIR := catalogd/config/overlays/cert-manager
 
 # Disable -j flag for make
 .NOTPARALLEL:
 
 .DEFAULT_GOAL := build
 
+GINKGO := go run github.com/onsi/ginkgo/v2/ginkgo
+
 #SECTION General
 
 # The help target prints out all targets with their descriptions organized
@@ -209,6 +213,23 @@ test-e2e: KUSTOMIZE_BUILD_DIR := config/overlays/e2e
 test-e2e: GO_BUILD_FLAGS := -cover
 test-e2e: run image-registry e2e e2e-coverage kind-clean #HELP Run e2e test suite on local kind cluster
 
+# Catalogd e2e tests
+FOCUS := $(if $(TEST),-v -focus "$(TEST)")
+ifeq ($(origin E2E_FLAGS), undefined)
+E2E_FLAGS :=
+endif
+test-catalogd-e2e: ## Run the e2e tests on existing cluster
+	$(GINKGO) $(E2E_FLAGS) -trace -vv $(FOCUS) test/catalogd-e2e
+
+catalogd-e2e: KIND_CLUSTER_NAME := catalogd-e2e
+catalogd-e2e: ISSUER_KIND := Issuer
+catalogd-e2e: ISSUER_NAME := selfsigned-issuer
+catalogd-e2e: CATALOGD_KUSTOMIZE_BUILD_DIR := catalogd/config/overlays/e2e
+catalogd-e2e: run catalogd-image-registry test-catalogd-e2e ##  kind-clean Run e2e test suite on local kind cluster
+
+catalogd-image-registry: ## Setup in-cluster image registry
+	./test/tools/imageregistry/registry.sh $(ISSUER_KIND) $(ISSUER_NAME)
+
 .PHONY: extension-developer-e2e
 extension-developer-e2e: KUSTOMIZE_BUILD_DIR := config/overlays/cert-manager
 extension-developer-e2e: KIND_CLUSTER_NAME := operator-controller-ext-dev-e2e  #EXHELP Run extension-developer e2e on local kind cluster
@@ -246,10 +267,9 @@ kind-load: $(KIND) #EXHELP Loads the currently constructed images into the KIND
 kind-deploy: export MANIFEST := ./operator-controller.yaml
 kind-deploy: export DEFAULT_CATALOG := ./catalogd/config/base/default/clustercatalogs/default-catalogs.yaml
 kind-deploy: manifests $(KUSTOMIZE)
-	($(KUSTOMIZE) build $(KUSTOMIZE_BUILD_DIR) && echo "---" && $(KUSTOMIZE) build catalogd/config/overlays/cert-manager | sed "s/cert-git-version/cert-$(VERSION)/g") > $(MANIFEST)
+	($(KUSTOMIZE) build $(KUSTOMIZE_BUILD_DIR) && echo "---" && $(KUSTOMIZE) build $(CATALOGD_KUSTOMIZE_BUILD_DIR) | sed "s/cert-git-version/cert-$(VERSION)/g") > $(MANIFEST)
 	envsubst '$$DEFAULT_CATALOG,$$CERT_MGR_VERSION,$$INSTALL_DEFAULT_CATALOGS,$$MANIFEST' < scripts/install.tpl.sh | bash -s
 
-
 .PHONY: kind-cluster
 kind-cluster: $(KIND) #EXHELP Standup a kind cluster.
 	-$(KIND) delete cluster --name $(KIND_CLUSTER_NAME)
@@ -302,7 +322,13 @@ go-build-linux: export GOARCH=amd64
 go-build-linux: $(BINARIES)
 
 .PHONY: run
-run: docker-build kind-cluster kind-load kind-deploy #HELP Build the operator-controller then deploy it into a new kind cluster.
+run: generate docker-build kind-cluster kind-load kind-deploy wait #HELP Build the operator-controller then deploy it into a new kind cluster.
+
+CATALOGD_NAMESPACE := olmv1-system
+wait:
+	kubectl wait --for=condition=Available --namespace=$(CATALOGD_NAMESPACE) deployment/catalogd-controller-manager --timeout=60s
+	kubectl wait --for=condition=Ready --namespace=$(CATALOGD_NAMESPACE) certificate/catalogd-service-cert # Avoid upgrade test flakes when reissuing cert
+
 
 .PHONY: docker-build
 docker-build: build-linux  #EXHELP Build docker image for operator-controller and catalog with GOOS=linux and local GOARCH.

catalogd/Makefile

@@ -78,17 +78,9 @@ FOCUS := $(if $(TEST),-v -focus "$(TEST)")
 ifeq ($(origin E2E_FLAGS), undefined)
 E2E_FLAGS :=
 endif
-test-e2e: ## Run the e2e tests on existing cluster
-	$(GINKGO) $(E2E_FLAGS) -trace -vv $(FOCUS) test/e2e
-
-e2e: KIND_CLUSTER_NAME := catalogd-e2e
-e2e: ISSUER_KIND := Issuer
-e2e: ISSUER_NAME := selfsigned-issuer
-e2e: KUSTOMIZE_OVERLAY := config/overlays/e2e
-e2e: run image-registry test-e2e kind-cluster-cleanup ## Run e2e test suite on local kind cluster
 
 image-registry: ## Setup in-cluster image registry
-	./test/tools/imageregistry/registry.sh $(ISSUER_KIND) $(ISSUER_NAME)
+	./../test/tools/imageregistry/registry.sh $(ISSUER_KIND) $(ISSUER_NAME)
 
 ## image-registry target has to come after run-latest-release,
 ## because the image-registry depends on the olm-ca issuer.

catalogd/test/upgrade/unpack_test.go

@@ -21,7 +21,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	catalogdv1 "github.com/operator-framework/operator-controller/catalogd/api/v1"
-	"github.com/operator-framework/operator-controller/catalogd/test/e2e"
+	catalogde2e "github.com/operator-framework/operator-controller/test/catalogd-e2e"
 )
 
 var _ = Describe("ClusterCatalog Unpacking", func() {
@@ -92,7 +92,7 @@ var _ = Describe("ClusterCatalog Unpacking", func() {
 
 			By("Making sure the catalog content is available via the http server")
 			Eventually(func(g Gomega) {
-				actualFBC, err := e2e.ReadTestCatalogServerContents(ctx, catalog, c, kubeClient)
+				actualFBC, err := catalogde2e.ReadTestCatalogServerContents(ctx, catalog, c, kubeClient)
 				g.Expect(err).To(Not(HaveOccurred()))
 				g.Expect(cmp.Diff(expectedFBC, actualFBC)).To(BeEmpty())
 			}).Should(Succeed())

catalogd/test/e2e/e2e_suite_test.go renamed to test/catalogd-e2e/e2e_suite_test.go

@@ -1,4 +1,4 @@
-package e2e
+package catalogde2e
 
 import (
 	"fmt"

catalogd/test/e2e/unpack_test.go renamed to test/catalogd-e2e/unpack_test.go

@@ -1,4 +1,4 @@
-package e2e
+package catalogde2e
 
 import (
 	"context"
@@ -79,7 +79,7 @@ var _ = Describe("ClusterCatalog Unpacking", func() {
 			actualFBC, err := ReadTestCatalogServerContents(ctx, catalog, c, kubeClient)
 			Expect(err).To(Not(HaveOccurred()))
 
-			expectedFBC, err := os.ReadFile("../../testdata/catalogs/test-catalog/expected_all.json")
+			expectedFBC, err := os.ReadFile("../../catalogd/testdata/catalogs/test-catalog/expected_all.json")
 			Expect(err).To(Not(HaveOccurred()))
 			Expect(cmp.Diff(expectedFBC, actualFBC)).To(BeEmpty())
 

catalogd/test/e2e/util.go renamed to test/catalogd-e2e/util.go

@@ -1,4 +1,4 @@
-package e2e
+package catalogde2e
 
 import (
 	"context"

catalogd/test/tools/imageregistry/imagebuilder.yaml renamed to test/tools/imageregistry/imagebuilder.yaml

@@ -26,8 +26,8 @@ envsubst '${ISSUER_KIND},${ISSUER_NAME}' < test/tools/imageregistry/imgreg.yaml
 kubectl wait -n catalogd-e2e --for=condition=Available deployment/docker-registry --timeout=60s
 
 # Load the testdata onto the cluster as a configmap so it can be used with kaniko
-kubectl create configmap -n catalogd-e2e --from-file=testdata/catalogs/test-catalog.Dockerfile catalogd-e2e.dockerfile
-kubectl create configmap -n catalogd-e2e --from-file=testdata/catalogs/test-catalog catalogd-e2e.build-contents
+kubectl create configmap -n catalogd-e2e --from-file=catalogd/testdata/catalogs/test-catalog.Dockerfile catalogd-e2e.dockerfile
+kubectl create configmap -n catalogd-e2e --from-file=catalogd/testdata/catalogs/test-catalog catalogd-e2e.build-contents
 
 # Create the kaniko pod to build the test image and push it to the test registry.
 kubectl apply -f test/tools/imageregistry/imagebuilder.yaml