[Monorepo]: Move catalogd upgrade e2e tests to operator-controller and cleanup makefile

Author: camilamacedo86

.github/workflows/catalogd-e2e.yaml

@@ -26,5 +26,4 @@ jobs:
         with:
           go-version-file: "go.mod"
       - name: Run the upgrade e2e test
-        working-directory: catalogd
-        run: make test-upgrade-e2e
+        run: make test-catalogd-upgrade-e2e

Makefile

@@ -227,6 +227,22 @@ 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
 
+## image-registry target has to come after run-latest-release,
+## because the image-registry depends on the olm-ca issuer.
+.PHONY: test-catalogd-upgrade-e2e
+test-catalogd-upgrade-e2e: export TEST_CLUSTER_CATALOG_NAME := test-catalog
+test-catalogd-upgrade-e2e: export TEST_CLUSTER_CATALOG_IMAGE := docker-registry.catalogd-e2e.svc:5000/test-catalog:e2e
+test-catalogd-upgrade-e2e: ISSUER_KIND=ClusterIssuer
+test-catalogd-upgrade-e2e: ISSUER_NAME=olmv1-ca
+test-catalogd-upgrade-e2e: kind-cluster docker-build kind-load run-latest-release catalogd-image-registry catalogd-pre-upgrade-setup kind-deploy catalogd-post-upgrade-checks kind-clean ## Run upgrade e2e tests on a local kind cluster
+
+.PHONY: catalogd-post-upgrade-checks
+catalogd-post-upgrade-checks:
+	$(GINKGO) $(E2E_FLAGS) -trace -vv $(FOCUS) test/catalogd-upgrade-e2e
+
+catalogd-pre-upgrade-setup:
+	./test/tools/imageregistry/pre-upgrade-setup.sh ${TEST_CLUSTER_CATALOG_IMAGE} ${TEST_CLUSTER_CATALOG_NAME}
+
 catalogd-image-registry: ## Setup in-cluster image registry
 	./test/tools/imageregistry/registry.sh $(ISSUER_KIND) $(ISSUER_NAME)
 
@@ -329,7 +345,6 @@ 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.
 	$(CONTAINER_RUNTIME) build -t $(IMG) -f Dockerfile ./bin/linux

catalogd/Makefile

@@ -23,9 +23,6 @@ else
 $(warning Could not find docker or podman in path! This may result in targets requiring a container runtime failing!)
 endif
 
-# For standard development and release flows, we use the config/overlays/cert-manager overlay.
-KUSTOMIZE_OVERLAY := config/overlays/cert-manager
-
 # bingo manages consistent tooling versions for things like kind, kustomize, etc.
 include ./../.bingo/Variables.mk
 
@@ -38,14 +35,6 @@ ifeq ($(origin KIND_CLUSTER_NAME), undefined)
 KIND_CLUSTER_NAME := catalogd
 endif
 
-# E2E configuration
-TESTDATA_DIR := testdata
-
-CATALOGD_NAMESPACE := olmv1-system
-KIND_CLUSTER_IMAGE := kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
-
-GINKGO := go run github.com/onsi/ginkgo/v2/ginkgo
-
 ##@ General
 
 # The help target prints out all targets with their descriptions organized
@@ -74,34 +63,6 @@ generate: $(CONTROLLER_GEN) ## Generate code and manifests.
 	$(CONTROLLER_GEN) object:headerFile="../hack/boilerplate.go.txt" paths="./..."
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/base/crd/bases output:rbac:artifacts:config=config/base/rbac output:webhook:artifacts:config=config/base/manager/webhook/
 
-FOCUS := $(if $(TEST),-v -focus "$(TEST)")
-ifeq ($(origin E2E_FLAGS), undefined)
-E2E_FLAGS :=
-endif
-
-image-registry: ## Setup in-cluster image registry
-	./../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.
-.PHONY: test-upgrade-e2e
-test-upgrade-e2e: export TEST_CLUSTER_CATALOG_NAME := test-catalog
-test-upgrade-e2e: export TEST_CLUSTER_CATALOG_IMAGE := docker-registry.catalogd-e2e.svc:5000/test-catalog:e2e
-test-upgrade-e2e: ISSUER_KIND=ClusterIssuer
-test-upgrade-e2e: ISSUER_NAME=olmv1-ca
-test-upgrade-e2e: kind-cluster cert-manager build-container kind-load run-latest-release image-registry pre-upgrade-setup only-deploy-manifest wait post-upgrade-checks kind-cluster-cleanup ## Run upgrade e2e tests on a local kind cluster
-
-pre-upgrade-setup:
-	./test/tools/imageregistry/pre-upgrade-setup.sh ${TEST_CLUSTER_CATALOG_IMAGE} ${TEST_CLUSTER_CATALOG_NAME}
-
-.PHONY: run-latest-release
-run-latest-release:
-	cd ..; curl -L -s https://github.com/operator-framework/operator-controller/releases/latest/download/install.sh | bash -s
-
-.PHONY: post-upgrade-checks
-post-upgrade-checks:
-	$(GINKGO) $(E2E_FLAGS) -trace -vv $(FOCUS) test/upgrade
-
 ##@ Build
 
 BINARIES=catalogd
@@ -149,62 +110,16 @@ $(LINUX_BINARIES): BUILDBIN = bin/linux
 $(LINUX_BINARIES):
 	GOOS=linux $(BUILDCMD)
 
-
-.PHONY: run
-run: generate kind-cluster install ## Create a kind cluster and install a local build of catalogd
-
 .PHONY: build-container
 build-container: build-linux ## Build docker image for catalogd.
 	$(CONTAINER_RUNTIME) build -f Dockerfile -t $(IMAGE) ./bin/linux
 
-##@ Deploy
-
-.PHONY: kind-cluster
-kind-cluster: $(KIND) kind-cluster-cleanup ## Standup a kind cluster
-	$(KIND) create cluster --name $(KIND_CLUSTER_NAME) --image $(KIND_CLUSTER_IMAGE)
-	$(KIND) export kubeconfig --name $(KIND_CLUSTER_NAME)
-
-.PHONY: kind-cluster-cleanup
-kind-cluster-cleanup: $(KIND) ## Delete the kind cluster
-	$(KIND) delete cluster --name $(KIND_CLUSTER_NAME)
-
 .PHONY: kind-load
-kind-load: check-cluster $(KIND) ## Load the built images onto the local cluster
+kind-load: $(KIND) ## Load the built images onto the local cluster
 	$(CONTAINER_RUNTIME) save $(IMAGE) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
 
-.PHONY: install
-install: check-cluster build-container kind-load deploy wait ## Install local catalogd to an existing cluster
-
-.PHONY: deploy
-deploy: export MANIFEST="./catalogd.yaml"
-deploy: export DEFAULT_CATALOGS="./config/base/default/clustercatalogs/default-catalogs.yaml"
-deploy: $(KUSTOMIZE) ## Deploy Catalogd to the K8s cluster specified in ~/.kube/config with cert-manager and default clustercatalogs
-	cd config/base/manager && $(KUSTOMIZE) edit set image controller=$(IMAGE) && cd ../../..
-	$(KUSTOMIZE) build $(KUSTOMIZE_OVERLAY) | sed "s/cert-git-version/cert-$(GIT_VERSION)/g" > catalogd.yaml
-	envsubst '$$CERT_MGR_VERSION,$$MANIFEST,$$DEFAULT_CATALOGS' < scripts/install.tpl.sh | bash -s
-
-.PHONY: only-deploy-manifest
-only-deploy-manifest: $(KUSTOMIZE) ## Deploy just the Catalogd manifest--used in e2e testing where cert-manager is installed in a separate step
-	cd config/base/manager && $(KUSTOMIZE) edit set image controller=$(IMAGE)
-	$(KUSTOMIZE) build $(KUSTOMIZE_OVERLAY) | kubectl apply -f -
-
-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: cert-manager
-cert-manager:
-	kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/${CERT_MGR_VERSION}/cert-manager.yaml
-	kubectl wait --for=condition=Available --namespace=cert-manager deployment/cert-manager-webhook --timeout=60s
+##@ Deploy
 
 .PHONY: demo-update
 demo-update:
 	hack/scripts/generate-asciidemo.sh
-
-.PHONY: check-cluster
-check-cluster:
-	@kubectl config current-context >/dev/null 2>&1 || ( \
-		echo "Error: Could not get current Kubernetes context. Maybe use 'run' or 'e2e' targets first?"; \
-		exit 1; \
-	)

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

@@ -1,4 +1,4 @@
-package upgradee2e
+package catalogdupgradee2e
 
 import (
 	"bufio"
@@ -87,7 +87,7 @@ var _ = Describe("ClusterCatalog Unpacking", func() {
 				g.Expect(cond.Reason).To(Equal(catalogdv1.ReasonSucceeded))
 			}).Should(Succeed())
 
-			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()))
 
 			By("Making sure the catalog content is available via the http server")

catalogd/test/upgrade/upgrade_suite_test.go renamed to test/catalogd-upgrade-e2e/upgrade_suite_test.go

@@ -1,4 +1,4 @@
-package upgradee2e
+package catalogdupgradee2e
 
 import (
 	"os"