Fix & unify helm test setup as make rules

Author: josvazg

.github/workflows/test-e2e.yml

@@ -157,9 +157,9 @@ jobs:
         run: devbox run -- make install-crds
 
       - name: Run CI E2E tests
-        run: devbox run -- ./scripts/launch-ci-e2e.sh
+        run: devbox run -- make e2e
         env:
-          TEST_NAME: ${{ matrix.test }}
+          label: ${{ matrix.test }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_ACCOUNT_ARN_LIST: ${{ secrets.AWS_ACCOUNT_ARN_LIST }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/tests-selectable.yaml

@@ -251,16 +251,15 @@ jobs:
           devbox run -- 'make install'
       - name: Run E2E test
         env:
+          label: "${{ matrix.test }}"
           MCLI_OPS_MANAGER_URL: "https://cloud-qa.mongodb.com/"
           MCLI_ORG_ID: ${{ secrets.ATLAS_ORG_ID}}
           MCLI_PUBLIC_API_KEY: ${{ secrets.ATLAS_PUBLIC_KEY }}
           MCLI_PRIVATE_API_KEY: ${{ secrets.ATLAS_PRIVATE_KEY }}
-          IMAGE_URL: "ghcr.io/mongodb/mongodb-atlas-kubernetes-operator-prerelease:${{ needs.detect-tests.outputs.image_tag }}"
           BUNDLE_IMAGE: "ghcr.io/mongodb/mongodb-atlas-kubernetes-bundles-prerelease:${{ needs.detect-tests.outputs.image_tag }}"
           IMAGE_PULL_SECRET_REGISTRY: ghcr.io
           IMAGE_PULL_SECRET_USERNAME: $
           IMAGE_PULL_SECRET_PASSWORD: "${{ secrets.GITHUB_TOKEN }}"
-          TEST_NAME: "${{ matrix.test }}"
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_ACCOUNT_ARN_LIST: ${{ secrets.AWS_ACCOUNT_ARN_LIST }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -273,7 +272,7 @@ jobs:
           PAGER_DUTY_SERVICE_KEY: ${{ secrets.PAGER_DUTY_SERVICE_KEY }}
         run: |
           echo "Using ENV: ${{ steps.select-env.outputs.ENV }}"
-          devbox run -- ./scripts/launch-ci-e2e.sh
+          devbox run -- make e2e
       - name: Upload operator logs
         if: ${{ failure() }}
         uses: actions/upload-artifact@v5

.gitignore

@@ -61,3 +61,6 @@ config/manifests/kustomization.yaml
 config/manager/kustomization.yaml
 config/generated/crd/bases/*.yaml
 config/generated/rbac/role.yaml
+
+# ignore helm test artifacts
+helm-charts/atlas-operator/charts/

Makefile

@@ -18,6 +18,7 @@ DOCKER_SBOM_PLUGIN_VERSION=0.6.1
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
 VERSION_FILE=version.json
 CURRENT_VERSION := $(shell $(JQ) -r .current $(VERSION_FILE))
+NEXT_VERSION := $(shell $(JQ) -r .next $(VERSION_FILE))
 VERSION ?= $(shell git describe --always --tags --dirty --broken | cut -c 2-)
 BUILDTIME ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 GITCOMMIT ?= $(shell git rev-parse --short HEAD 2> /dev/null || true)
@@ -32,13 +33,6 @@ ifdef EXPERIMENTAL
 LD_FLAGS += -X $(VERSION_PACKAGE).Experimental=$(EXPERIMENTAL)
 endif
 
-# NEXT_VERSION represents a version that is higher than anything released
-# VERSION default value does not play well with the run target which might end up failing
-# with errors such as:
-# "version of the resource $Resource is higher than the operator version $VERSION"
-# This happens if you use exported YAMLs from CLI and the dirty version is deemed a pre-release
-NEXT_VERSION = 99.99.99-next
-
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
 # To re-generate a bundle for other specific channels without changing the standard setup, you can:
@@ -188,6 +182,17 @@ SBOMS_DIR ?= template
 
 SHELLCHECK_OPTIONS ?= -e SC2086
 
+DEFAULT_IMAGE_URL := localhost:5000/mongodb-atlas-kubernetes-operator:$(NEXT_VERSION)-test
+export IMAGE_URL
+
+ifndef IMAGE_URL
+    IMAGE_URL := $(DEFAULT_IMAGE_URL)
+	BUILD_DEPENDENCY := test-docker-image
+else
+    $(info --- IMAGE_URL is set externally: $(IMAGE_URL))
+    BUILD_DEPENDENCY :=
+endif
+
 .DEFAULT_GOAL := help
 .PHONY: help
 help: ## Show this help screen
@@ -246,7 +251,7 @@ envtest-assets:
 	mkdir -p $(ENVTEST_ASSETS_DIR)
 
 .PHONY: e2e
-e2e: bundle manifests run-kind ## Run e2e test. Command `make e2e label=cluster-ns` run cluster-ns test
+e2e: bundle manifests run-kind $(BUILD_DEPENDENCY) ## Run e2e test. Command `make e2e label=cluster-ns` run cluster-ns test
 	AKO_E2E_TEST=1 $(GINKGO) $(shell pwd)/test/$@
 
 .PHONY: e2e2
@@ -488,6 +493,14 @@ all-platforms-docker: all-platforms
 	docker build --build-arg BINARY_PATH=bin/linux/amd64 -f fast.Dockerfile -t manager-amd64 .
 	docker build --build-arg BINARY_PATH=bin/linux/arm64 -f fast.Dockerfile -t manager-arm64 .
 
+.PHONY: docker-image
+docker-image:
+	docker build  --build-arg BINARY_PATH=bin/$(TARGET_OS)/$(TARGET_ARCH) -f fast.Dockerfile -t $(DEFAULT_IMAGE_URL) .
+
+.PHONY: test-docker-image
+test-docker-image: docker-image run-kind
+	docker push $(DEFAULT_IMAGE_URL)
+
 .PHONY: check-major-version
 check-major-version: ## Check that VERSION starts with MAJOR_VERSION
 	@VERSION_MAJOR=$$(echo "$(VERSION)" | cut -d. -f1 | sed 's/v//'); \