Refactor

1. Move figuring out of chart dir from helm.py to other places
	to Operator() and _install_multi_cluster_operator
2. Run precommit

Author: viveksinghggits

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

@@ -10,6 +10,7 @@
 
 logger = test_logger.get_test_logger(__name__)
 
+
 def helm_template(
     helm_args: Dict,
     helm_chart_path: Optional[str] = "helm_chart",
@@ -143,6 +144,7 @@ def process_run_and_check(args, **kwargs):
         logger.error(f"output: {exc.output}")
         raise
 
+
 def oci_helm_registry_login(helm_registry: str, region: str):
     logger.info(f"Attempting to log into ECR registry: {helm_registry}, using helm registry login.")
 
@@ -191,6 +193,7 @@ def oci_helm_registry_login(helm_registry: str, region: str):
     except Exception as e:
         raise Exception(f"An unexpected error occurred: {e}.")
 
+
 def helm_upgrade(
     name: str,
     namespace: str,
@@ -208,18 +211,8 @@ def helm_upgrade(
     chart_dir = helm_chart_path if helm_override_path else _helm_chart_dir(helm_chart_path)
 
     if apply_crds_first:
-        # right now tests image has the entire helm_chart directory, maybe we should just copy the CRDs
         apply_crds_from_chart(chart_dir)
 
-    # login to helm registry because we are going to install published helm chart
-    try:
-        registry, repository, region = oci_chart_info()
-        
-        oci_helm_registry_login(registry, region)
-    except Exception as e:
-        raise Exception(f"Failed logging in to the helm registry {registry}. Error: {e}")
-
-    chart_uri = f"oci://{registry}/{repository}"
     command_args = _create_helm_args(helm_args, helm_options)
     args = [
         "helm",
@@ -229,20 +222,16 @@ def helm_upgrade(
         *command_args,
         name,
     ]
-    
+
     if custom_operator_version:
         args.append(f"--version={custom_operator_version}")
-    else:
-        published_chart_version = os.environ.get("OPERATOR_VERSION")
-        if not published_chart_version:
-            logger.info("OPERATOR_VERSION env var is not set")
-        args.append(f"--version=0.0.0+{published_chart_version}")
 
-    args.append(chart_uri)
+    args.append(chart_dir)
 
     command = " ".join(args)
     process_run_and_check(command, check=True, capture_output=True, shell=True)
 
+
 def oci_chart_info():
     registry = os.environ.get("OCI_HELM_REGISTRY")
     repository = os.environ.get("OCI_HELM_REPOSITORY")
@@ -252,6 +241,7 @@ def oci_chart_info():
 
     return registry, f"{repository}/mongodb-kubernetes", region
 
+
 def apply_crds_from_chart(chart_dir: str):
     crd_files = glob.glob(os.path.join(chart_dir, "crds", "*.yaml"))
 

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

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import os
 import time
 from typing import Dict, List, Optional
 
@@ -16,6 +17,8 @@
     helm_template,
     helm_uninstall,
     helm_upgrade,
+    oci_chart_info,
+    oci_helm_registry_login,
 )
 from tests import test_logger
 
@@ -43,13 +46,27 @@ def __init__(
         namespace: str,
         helm_args: Optional[Dict] = None,
         helm_options: Optional[List[str]] = None,
-        helm_chart_path: Optional[str] = "helm_chart",
+        helm_chart_path: Optional[str] = None,
         name: Optional[str] = "mongodb-kubernetes-operator",
         api_client: Optional[client.api_client.ApiClient] = None,
+        operator_version: Optional[str] = None,
     ):
+        if not helm_chart_path:
+            # login to the OCI container registry
+            registry, repository, region = oci_chart_info()
+            try:
+                oci_helm_registry_login(registry, region)
+            except Exception as e:
+                raise e
 
-        # The Operator will be installed from the following repo, so adding it first
-        helm_repo_add("mongodb", "https://mongodb.github.io/helm-charts")
+            # figure out the registry URI, based on dev/staging scenario
+            chart_uri = f"oci://{registry}/{repository}"
+            helm_chart_path = chart_uri
+
+        if not operator_version:
+            # most probably we are trying to install current operator which will be installed
+            # from OCI registry. The version (dev/staging) is set in `OPERATOR_VERSION`
+            operator_version = os.environ.get("OPERATOR_VERSION")
 
         if helm_args is None:
             helm_args = {}
@@ -69,6 +86,7 @@ def __init__(
         self.helm_chart_path = helm_chart_path
         self.name = name
         self.api_client = api_client
+        self.operator_version = operator_version
 
     def install_from_template(self):
         """Uses helm to generate yaml specification and then uses python K8s client to apply them to the cluster
@@ -82,6 +100,9 @@ def install_from_template(self):
 
     def install(self, custom_operator_version: Optional[str] = None) -> Operator:
         """Installs the Operator to Kubernetes cluster using 'helm install', waits until it's running"""
+        if not custom_operator_version:
+            custom_operator_version = self.operator_version
+
         helm_install(
             self.name,
             self.namespace,
@@ -99,6 +120,9 @@ def upgrade(
         self, multi_cluster: bool = False, custom_operator_version: Optional[str] = None, apply_crds_first: bool = False
     ) -> Operator:
         """Upgrades the Operator in Kubernetes cluster using 'helm upgrade', waits until it's running"""
+        if not custom_operator_version:
+            custom_operator_version = self.operator_version
+
         helm_upgrade(
             self.name,
             self.namespace,

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

@@ -20,7 +20,12 @@
     update_configmap,
 )
 from kubetester.awss3client import AwsS3Client
-from kubetester.helm import helm_install_from_chart, helm_repo_add
+from kubetester.helm import (
+    helm_install_from_chart,
+    helm_repo_add,
+    oci_chart_info,
+    oci_helm_registry_login,
+)
 from kubetester.kubetester import KubernetesTester
 from kubetester.kubetester import fixture as _fixture
 from kubetester.kubetester import running_locally
@@ -827,14 +832,31 @@ def _install_multi_cluster_operator(
     helm_opts: dict[str, str],
     central_cluster_name: str,
     operator_name: Optional[str] = MULTI_CLUSTER_OPERATOR_NAME,
-    helm_chart_path: Optional[str] = LOCAL_HELM_CHART_DIR,
+    helm_chart_path: Optional[str] = None,
     custom_operator_version: Optional[str] = None,
     apply_crds_first: bool = False,
 ) -> Operator:
     multi_cluster_operator_installation_config.update(helm_opts)
 
     # The Operator will be installed from the following repo, so adding it first
-    helm_repo_add("mongodb", "https://mongodb.github.io/helm-charts")
+    # helm_repo_add("mongodb", "https://mongodb.github.io/helm-charts")
+
+    # login to the OCI container registry
+    registry, repository, region = oci_chart_info()
+    try:
+        oci_helm_registry_login(registry, region)
+    except Exception as e:
+        raise e
+
+    # figure out the registry URI, based on dev/staging scenario
+    chart_uri = f"oci://{registry}/{repository}"
+    if not helm_chart_path:
+        helm_chart_path = chart_uri
+
+    if not custom_operator_version:
+        # most probably we are trying to install current operator which will be installed
+        # from OCI registry. The version (dev/staging) is set in `OPERATOR_VERSION`
+        custom_operator_version = os.environ.get("OPERATOR_VERSION")
 
     prepare_multi_cluster_namespaces(
         namespace,

scripts/evergreen/e2e/single_e2e.sh

@@ -49,9 +49,9 @@ deploy_test_app() {
     BUILD_VARIANT="${BUILD_VARIANT:-default_build_variant}"
 
     chart_info=$(scripts/dev/run_python.sh scripts/release/oci_chart_info.py)
-    helm_oci_regisry=$(echo "$chart_info" | jq -r '.registry' )
-    helm_oci_repository=$(echo "$chart_info" | jq -r '.repository' )
-    helm_oci_registry_region=$(echo "$chart_info" | jq -r '.region' )
+    helm_oci_regisry=$(echo "${chart_info}" | jq -r '.registry' )
+    helm_oci_repository=$(echo "${chart_info}" | jq -r '.repository' )
+    helm_oci_registry_region=$(echo "${chart_info}" | jq -r '.region' )
 
     # note, that the 4 last parameters are used only for Mongodb resource testing - not for Ops Manager
     helm_params=(

scripts/release/oci_chart_info.py

@@ -1,11 +1,12 @@
+import json
 import os
 import sys
-import json
-
 from dataclasses import asdict
+
 from lib.base_logger import logger
 from scripts.release.build.build_info import load_build_info
 
+
 def main():
     build_scenario = os.environ.get("BUILD_SCENARIO")
     build_info = load_build_info(build_scenario)
@@ -15,7 +16,6 @@ def main():
     print(j)
 
 
-
 if __name__ == "__main__":
     try:
         main()