Fix multicluster tests

Author: MaciejKaras

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

@@ -1,5 +1,4 @@
 import glob
-import logging
 import os
 import re
 import subprocess
@@ -30,7 +29,7 @@ def helm_template(
         command_args.append("--show-only")
         command_args.append(templates)
 
-    args = ("helm", "template", *(command_args), _helm_chart_dir(helm_chart_path))
+    args = ("helm", "template", *command_args, _helm_chart_dir(helm_chart_path))
     logger.info(" ".join(args))
 
     yaml_file_name = "{}.yaml".format(str(uuid.uuid4()))
@@ -316,7 +315,10 @@ def helm_chart_path_and_version(helm_chart_path: str, operator_version: str) ->
 
     # helm_chart_path not being passed would mean we would like to install helm chart from OCI registry.
     if not helm_chart_path:
-        operator_version = os.environ.get(OCI_HELM_VERSION)
+        # 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)
+
         registry, repository, region = oci_chart_info()
         # If ECR we need to login first to the OCI container registry
         if registry == OCI_HELM_REGISTRY_ECR:

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

@@ -22,6 +22,7 @@
 from kubetester.awss3client import AwsS3Client
 from kubetester.consts import *
 from kubetester.helm import (
+    helm_chart_path_and_version,
     helm_install_from_chart,
     helm_repo_add,
 )
@@ -837,6 +838,8 @@ def _install_multi_cluster_operator(
     # The Operator will be installed from the following repo, so adding it first
     helm_repo_add("mongodb", "https://mongodb.github.io/helm-charts")
 
+    helm_chart_path, operator_version = helm_chart_path_and_version(helm_chart_path, custom_operator_version)
+
     prepare_multi_cluster_namespaces(
         namespace,
         multi_cluster_operator_installation_config,

scripts/release/publish_helm_chart.py

@@ -1,14 +1,12 @@
 import argparse
-import os
 import subprocess
 
-import yaml
-
 from lib.base_logger import logger
 from scripts.release.build.build_info import *
 from scripts.release.build.build_scenario import SUPPORTED_SCENARIOS
 
 CHART_DIR = "helm_chart"
+MONGODB_KUBERNETES_CHART = "mongodb-kubernetes"
 
 
 def run_command(command: list[str]):
@@ -26,44 +24,6 @@ def run_command(command: list[str]):
         )
 
 
-# update_chart_and_get_metadata updates the helm chart's Chart.yaml and sets the proper version
-# When we publish the helm chart to dev and staging we append `0.0.0+` in the chart version, details are
-# here https://docs.google.com/document/d/1eJ8iKsI0libbpcJakGjxcPfbrTn8lmcZDbQH1UqMR_g/edit?tab=t.gg5ble8qlesq
-def update_chart_and_get_metadata(chart_dir: str, version: str) -> tuple[str, str]:
-    chart_path = os.path.join(chart_dir, "Chart.yaml")
-
-    if not os.path.exists(chart_path):
-        raise FileNotFoundError(
-            f"Error: Chart.yaml not found in directory '{chart_dir}'. "
-            "Please ensure the directory exists and contains a valid Chart.yaml."
-        )
-
-    try:
-        with open(chart_path, "r") as f:
-            data = yaml.safe_load(f)
-
-        chart_name = data.get("name")
-        if not chart_name:
-            raise ValueError("Chart.yaml is missing required 'name' field.")
-    except Exception as e:
-        raise Exception(f"Unable to load Chart.yaml from dir {chart_path}: {e}")
-
-    if data["version"] == version:
-        logger.info(f"Chart '{chart_name}' already has version '{version}'. No update needed.")
-        return chart_name, version
-
-    try:
-        data["version"] = version
-
-        with open(chart_path, "w") as f:
-            yaml.safe_dump(data, f, sort_keys=False)
-
-        logger.info(f"Successfully updated version for chart '{chart_name}' to '{version}'.")
-        return chart_name, version
-    except Exception as e:
-        raise RuntimeError(f"Failed to read or update Chart.yaml: {e}")
-
-
 def get_oci_registry(chart_info: HelmChartInfo) -> str:
     registry = chart_info.registry
     repo = chart_info.repository
@@ -79,19 +39,18 @@ def get_oci_registry(chart_info: HelmChartInfo) -> str:
     return oci_registry
 
 
-def publish_helm_chart(chart_info: HelmChartInfo, operator_version: str):
+def publish_helm_chart(chart_name: str, chart_info: HelmChartInfo, operator_version: str):
     try:
-        # If version_prefix is not specified, the chart.yaml would already have correct chart version
+        # If version_prefix is not specified, use the operator_version as is.
         if chart_info.version_prefix is not None:
-            helm_version = f"{chart_info.version_prefix}{operator_version}"
+            chart_version = f"{chart_info.version_prefix}{operator_version}"
         else:
-            helm_version = operator_version
+            chart_version = operator_version
 
-        chart_name, chart_version = update_chart_and_get_metadata(CHART_DIR, helm_version)
         tgz_filename = f"{chart_name}-{chart_version}.tgz"
 
         logger.info(f"Packaging chart: {chart_name} with Version: {chart_version}")
-        package_command = ["helm", "package", CHART_DIR]
+        package_command = ["helm", "package", "--version", chart_version, CHART_DIR]
         run_command(package_command)
 
         oci_registry = get_oci_registry(chart_info)
@@ -134,7 +93,7 @@ def main():
     build_scenario = args.build_scenario
     build_info = load_build_info(build_scenario)
 
-    return publish_helm_chart(build_info.helm_charts["mongodb-kubernetes"], args.version)
+    return publish_helm_chart(MONGODB_KUBERNETES_CHART, build_info.helm_charts[MONGODB_KUBERNETES_CHART], args.version)
 
 
 if __name__ == "__main__":