Add DEFAULT_HELM_CHART_PATH env var

Author: MaciejKaras

docker/mongodb-kubernetes-tests/kubetester/consts.py

@@ -5,13 +5,13 @@
 import uuid
 from typing import Dict, List, Optional, Tuple
 
-from kubetester.consts import (
+from tests import test_logger
+from tests.constants import (
+    DEFAULT_HELM_CHART_PATH_ENV_VAR_NAME,
     OCI_HELM_REGION_ENV_VAR_NAME,
     OCI_HELM_REGISTRY_ENV_VAR_NAME,
-    OCI_HELM_REPOSITORY_ENV_VAR_NAME,
-    OCI_HELM_VERSION,
+    OCI_HELM_VERSION_ENV_VAR_NAME,
 )
-from tests import test_logger
 
 logger = test_logger.get_test_logger(__name__)
 
@@ -241,19 +241,6 @@ def helm_upgrade(
     process_run_and_check(command, check=True, capture_output=True, shell=True)
 
 
-# oci_chart_info returns the respective registry/repo and region information
-# based on the build scenario (dev/staging) tests are being run in. These are
-# read from build_info.json and then set to the tests image as env vars.
-def oci_chart_info():
-    registry = os.environ.get(OCI_HELM_REGISTRY_ENV_VAR_NAME)
-    repository = os.environ.get(OCI_HELM_REPOSITORY_ENV_VAR_NAME)
-    region = os.environ.get(OCI_HELM_REGION_ENV_VAR_NAME)
-
-    logger.info(f"oci chart details in test image is registry {registry}, repo {repository}, region {region}")
-
-    return registry, f"{repository}/mongodb-kubernetes", region
-
-
 def apply_crds_from_chart(crds_dir: str):
     crd_files = glob.glob(os.path.join(crds_dir, "*.yaml"))
 
@@ -308,28 +295,22 @@ def _create_helm_args(helm_args: Dict[str, str], helm_options: Optional[List[str
 # based on the caller. In most of the cases we will install chart from OCI registry but for the tests where we would like
 # to install MEKO's specific version or MCK's specific version, we would expect `helm_chart_path` to set already.
 def helm_chart_path_and_version(helm_chart_path: str, operator_version: str) -> tuple[str, str]:
-    # these are imported here to resolve import cycle issue
-    from tests.conftest import LOCAL_HELM_CHART_DIR, local_operator
-
-    if local_operator():
-        return LOCAL_HELM_CHART_DIR, ""
-
-    # helm_chart_path not being passed would mean we would like to install helm chart from OCI registry.
+    # if helm_chart_path is not passed, use the default value from DEFAULT_HELM_CHART_PATH
     if not helm_chart_path:
+        helm_chart_path = os.getenv(DEFAULT_HELM_CHART_PATH_ENV_VAR_NAME)
+
+    if helm_chart_path.startswith("oci://"):
         # If operator_version is not passed, we want to install the current version.
         if not operator_version:
-            operator_version = os.environ.get(OCI_HELM_VERSION)
+            operator_version = os.environ.get(OCI_HELM_VERSION_ENV_VAR_NAME)
 
-        registry, repository, region = oci_chart_info()
+        registry = os.environ.get(OCI_HELM_REGISTRY_ENV_VAR_NAME)
         # If ECR we need to login first to the OCI container registry
         if registry == OCI_HELM_REGISTRY_ECR:
+            region = os.environ.get(OCI_HELM_REGION_ENV_VAR_NAME)
             try:
                 helm_registry_login_to_ecr(registry, region)
             except Exception as e:
                 raise Exception(f"Failed to login to ECR helm registry {registry}. Error: {e}")
 
-        # figure out the registry URI, based on dev/staging scenario
-        chart_uri = f"oci://{registry}/{repository}"
-        helm_chart_path = chart_uri
-
     return helm_chart_path, operator_version

docker/mongodb-kubernetes-tests/kubetester/helm.py

@@ -18,7 +18,6 @@
     helm_upgrade,
 )
 from tests import test_logger
-from tests.constants import LOCAL_HELM_CHART_DIR
 
 OPERATOR_CRDS = (
     "mongodb.mongodb.com",

docker/mongodb-kubernetes-tests/kubetester/operator.py

@@ -44,7 +44,6 @@
     LEGACY_OPERATOR_CHART,
     LEGACY_OPERATOR_IMAGE_NAME,
     LEGACY_OPERATOR_NAME,
-    LOCAL_HELM_CHART_DIR,
     MCK_HELM_CHART,
     MONITOR_APPDB_E2E_DEFAULT,
     MULTI_CLUSTER_CONFIG_DIR,

docker/mongodb-kubernetes-tests/tests/conftest.py

@@ -16,6 +16,13 @@
 LEGACY_DEPLOYMENT_STATE_VERSION: str = "1.27.0"
 
 # Helm charts
+DEFAULT_HELM_CHART_PATH_ENV_VAR_NAME = "DEFAULT_HELM_CHART_PATH"
+
+OCI_HELM_VERSION_ENV_VAR_NAME = "OCI_HELM_VERSION"
+OCI_HELM_REGISTRY_ENV_VAR_NAME = "OCI_HELM_REGISTRY"
+OCI_HELM_REPOSITORY_ENV_VAR_NAME = "OCI_HELM_REPOSITORY"
+OCI_HELM_REGION_ENV_VAR_NAME = "OCI_HELM_REGION"
+
 LEGACY_OPERATOR_CHART = "mongodb/enterprise-operator"
 MCK_HELM_CHART = "mongodb/mongodb-kubernetes"
 LOCAL_HELM_CHART_DIR = "helm_chart"

docker/mongodb-kubernetes-tests/tests/constants.py

@@ -40,3 +40,6 @@ export ALWAYS_REMOVE_TESTING_NAMESPACE="true"
 # MCO settings
 ## whether we want to run cleanup after the run
 export PERFORM_CLEANUP=false
+
+# Specifies default local path to the helm charts if not specified explicitly in e2e test.
+export DEFAULT_HELM_CHART_PATH="${PROJECT_DIR}/helm_chart"

scripts/dev/contexts/local-defaults-context

@@ -101,3 +101,7 @@ export PRERELEASE_PULLSECRET_DOCKERCONFIGJSON="<dockerconfigjson secret>"
 
 # uncomment to enable license update with pre-commit script
 # export MDB_UPDATE_LICENSES=true
+
+# Uncomment to specify a custom path to the helm chart if not specified explicitly in e2e test.
+# It can point to OCI registry, GitHub pages based url or custom directory.
+# export DEFAULT_HELM_CHART_PATH=""

scripts/dev/contexts/private-context-template

@@ -174,22 +174,16 @@ spec:
     - name: OM_DEBUG_HTTP
       value: "{{ .Values.omDebugHttp }}"
     {{ end }}
-    {{ if .Values.helm.oci.version }}
     - name: OCI_HELM_VERSION
       value: "{{ .Values.helm.oci.version }}"
-    {{ end }}
-    {{ if .Values.helm.oci.registry }}
     - name: OCI_HELM_REGISTRY
       value: "{{ .Values.helm.oci.registry }}"
-    {{ end }}
-    {{ if .Values.helm.oci.repository }}
     - name: OCI_HELM_REPOSITORY
       value: "{{ .Values.helm.oci.repository }}"
-    {{ end }}
-    {{ if .Values.helm.oci.region }}
     - name: OCI_HELM_REGION
       value: "{{ .Values.helm.oci.region }}"
-    {{ end }}
+    - name: DEFAULT_HELM_CHART_PATH
+      value: "oci://{{ .Values.helm.oci.registry }}/{{ .Values.helm.oci.repository }}/mongodb-kubernetes"
     - name: ops_manager_version
       value: "{{ .Values.opsManagerVersion }}"
     - name: cognito_user_pool_id