Fixes

Author: MaciejKaras

scripts/evergreen/deployments/test-app/templates/mongodb-enterprise-tests.yaml

@@ -174,14 +174,14 @@ 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.operator.version }}
-    - name: OPERATOR_VERSION
-      value: "{{ .Values.operator.version }}"
-    {{ end }}
     {{ if .Values.helm.oci.repository }}
     - name: OCI_HELM_REPOSITORY
       value: "{{ .Values.helm.oci.repository }}"

scripts/release/publish_helm_chart.py

@@ -3,6 +3,7 @@
 import subprocess
 
 import yaml
+from release.build.build_scenario import SUPPORTED_SCENARIOS
 
 from lib.base_logger import logger
 from scripts.release.build.build_info import *
@@ -25,15 +26,11 @@ def run_command(command: list[str]):
         )
 
 
-# update_chart_and_get_metadata updates the helm chart's Chart.yaml and sets the version
-# to either evg patch id or commit which is set in OPERATOR_VERSION.
-def update_chart_and_get_metadata(chart_dir: str, version_prefix: str = None) -> tuple[str, 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")
-    version = os.environ.get("OPERATOR_VERSION")
-    if not version:
-        raise ValueError(
-            "Error: Environment variable 'OPERATOR_VERSION' must be set to determine the chart version to publish."
-        )
 
     if not os.path.exists(chart_path):
         raise FileNotFoundError(
@@ -51,23 +48,18 @@ def update_chart_and_get_metadata(chart_dir: str, version_prefix: str = None) ->
     except Exception as e:
         raise Exception(f"Unable to load Chart.yaml from dir {chart_path}: {e}")
 
-    # If version_prefix is not specified, the chart.yaml would already have correct chart version
-    if version_prefix is None:
+    if data["version"] == version:
+        logger.info(f"Chart '{chart_name}' already has version '{version}'. No update needed.")
         return chart_name, 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
-    new_version = f"{version_prefix}{version}"
-    logger.info(f"New helm chart version will be: {new_version}")
-
     try:
-        data["version"] = new_version
+        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 '{new_version}'.")
-        return chart_name, new_version
+        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}")
 
@@ -87,16 +79,22 @@ def get_oci_registry(chart_info: HelmChartInfo) -> str:
     return oci_registry
 
 
-def publish_helm_chart(chart_info: HelmChartInfo, build_scenario):
+def publish_helm_chart(chart_info: HelmChartInfo, operator_version: str):
     try:
-        oci_registry = get_oci_registry(chart_info)
-        chart_name, chart_version = update_chart_and_get_metadata(CHART_DIR, chart_info.version_prefix)
+        # If version_prefix is not specified, the chart.yaml would already have correct chart version
+        if chart_info.version_prefix is not None:
+            helm_version = f"{chart_info.version_prefix}{operator_version}"
+        else:
+            helm_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]
         run_command(package_command)
 
+        oci_registry = get_oci_registry(chart_info)
         logger.info(f"Pushing chart to registry: {oci_registry}")
         push_command = ["helm", "push", tgz_filename, oci_registry]
         run_command(push_command)
@@ -108,15 +106,35 @@ def publish_helm_chart(chart_info: HelmChartInfo, build_scenario):
 
 def main():
     parser = argparse.ArgumentParser(
-        description="Script to publish helm chart to the OCI container registry, based on the build scenario."
+        description="Script to publish helm chart to the OCI container registry, based on the build scenario.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+    )
+    parser.add_argument(
+        "-b",
+        "--build-scenario",
+        metavar="",
+        action="store",
+        required=True,
+        type=str,
+        choices=SUPPORTED_SCENARIOS,
+        help=f"""Build scenario when reading configuration from 'build_info.json'.
+Options: {", ".join(SUPPORTED_SCENARIOS)}. For '{BuildScenario.DEVELOPMENT}' the '{BuildScenario.PATCH}' scenario is used to read values from 'build_info.json'""",
+    )
+    parser.add_argument(
+        "-v",
+        "--version",
+        metavar="",
+        action="store",
+        required=True,
+        type=str,
+        help="Operator version to use when publishing helm chart",
     )
-    parser.add_argument("--build_scenario", type=str, help="Build scenario (e.g., patch, staging etc).")
     args = parser.parse_args()
 
     build_scenario = args.build_scenario
     build_info = load_build_info(build_scenario)
 
-    return publish_helm_chart(build_info.helm_charts["mongodb-kubernetes"], build_scenario)
+    return publish_helm_chart(build_info.helm_charts["mongodb-kubernetes"], args.version)
 
 
 if __name__ == "__main__":

scripts/release/publish_helm_chart.sh

@@ -2,10 +2,10 @@
 
 # Instead of calling the publish_helm_chart.py directly from .evergreen-functions.yaml
 # we are calling that via this .sh so that we can easily pass build_scenario from env var that
-# is set via context files. Using the env vars, set via context files, in .evergreen configuraiton 
+# is set via context files. Using the env vars, set via context files, in .evergreen configuration
 # is not that straightforward.
 set -Eeou pipefail
 
 source scripts/dev/set_env_context.sh
 
-scripts/dev/run_python.sh scripts/release/publish_helm_chart.py --build_scenario "${BUILD_SCENARIO}"
+scripts/dev/run_python.sh scripts/release/publish_helm_chart.py --build_scenario "${BUILD_SCENARIO}" --version "${OPERATOR_VERSION}"