Add version_prefix to build_info.json + other fixes

Author: MaciejKaras

build_info.json

@@ -383,12 +383,14 @@
   "helm-charts": {
     "mongodb-kubernetes": {
       "patch": {
+        "version-prefix": "0.0.0+",
         "registry": "268558157000.dkr.ecr.us-east-1.amazonaws.com",
         "region": "us-east-1",
         "repository": "dev/mongodb/helm-charts"
       },
       "staging": {
         "sign": true,
+        "version-prefix": "0.0.0+",
         "registry": "268558157000.dkr.ecr.us-east-1.amazonaws.com",
         "region": "us-east-1",
         "repository": "staging/mongodb/helm-charts"

docker/mongodb-kubernetes-tests/Dockerfile

@@ -16,11 +16,12 @@ RUN apt-get -qq update \
 
 COPY requirements.txt requirements.txt
 
+# install aws, required to run helm registry login while running the tests
 RUN python3 -m venv /venv  \
     && . /venv/bin/activate  \
     && pip install --upgrade pip  \
     && GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 pip install -r requirements.txt \
-    && pip install awscli # install aws, required to run helm registry login while running the tests
+    && pip install awscli
 
 FROM scratch AS tools_downloader
 
@@ -48,6 +49,8 @@ RUN apt-get -qq update \
     curl \
     libldap2-dev \
     libsasl2-dev \
+    git \
+    openssl
 
 RUN mkdir -p /tmp/mongodb-tools && \
     tar xfz /tmp/mongodb-tools.tgz -C /tmp/mongodb-tools && \

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

@@ -1,5 +1,4 @@
-OPERATOR_VERSION_ENV_VAR_NAME = "OPERATOR_VERSION"
-
+OCI_HELM_VERSION = "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"

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

@@ -13,6 +13,7 @@
 
 # LOCAL_CRDs_DIR is the dir where local helm chart's CRDs are copied in tests image
 LOCAL_CRDs_DIR = "helm_chart/crds"
+OCI_HELM_REGISTRY_ECR = "268558157000.dkr.ecr.us-east-1.amazonaws.com"
 
 
 def helm_template(
@@ -314,23 +315,20 @@ def helm_chart_path_and_version(helm_chart_path: str, operator_version: str) ->
         return LOCAL_HELM_CHART_DIR, ""
 
     # if operator_version is not specified, and we are not installing the MCK or MEKO chart
-    # it would mean we want to install OCI published helm chart. Figure out respective version,
-    # it is set in env var `OPERATOR_VERSION` based on build_scenario.
+    # it would mean we want to install OCI published helm chart.
     if not operator_version and helm_chart_path not in (
         MCK_HELM_CHART,
         LEGACY_OPERATOR_CHART,
     ):
-        non_semver_operator_version = os.environ.get(OPERATOR_VERSION_ENV_VAR_NAME)
-        # when we publish the helm chart we append `0.0.0+` in the chart version, details are
-        # here https://docs.google.com/document/d/1eJ8iKsI0libbpcJakGjxcPfbrTn8lmcZDbQH1UqMR_g/edit?tab=t.gg5ble8qlesq
+        non_semver_operator_version = os.environ.get(OCI_HELM_VERSION)
         operator_version = f"0.0.0+{non_semver_operator_version}"
 
     # helm_chart_path not being passed would mean we are on evg env and would like to
     # install helm chart from OCI registry.
     if not helm_chart_path:
         registry, repository, region = oci_chart_info()
         # If ECR we need to login first to the OCI container registry
-        if registry == "268558157000.dkr.ecr.us-east-1.amazonaws.com":
+        if registry == OCI_HELM_REGISTRY_ECR:
             try:
                 helm_registry_login_to_ecr(registry, region)
             except Exception as e:

scripts/evergreen/deployments/test-app/values.yaml

@@ -48,9 +48,7 @@ omDebugHttp:
 # to run a test.
 helm:
   oci:
+    version: ""
     registry: ""
     repository: ""
     region: ""
-
-operator:
-  version: ""

scripts/evergreen/e2e/single_e2e.sh

@@ -55,11 +55,12 @@ deploy_test_app() {
     helm_oci_registry=$(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_version_prefix=$(echo "${chart_info}" | jq -r '.version_prefix // empty' )
+    helm_oci_version="${helm_oci_version_prefix:-}${OPERATOR_VERSION}"
 
     # note, that the 4 last parameters are used only for Mongodb resource testing - not for Ops Manager
     helm_params=(
         "--set" "taskId=${task_id:-'not-specified'}"
-        "--set" "operator.version=${OPERATOR_VERSION}"
         "--set" "namespace=${NAMESPACE}"
         "--set" "taskName=${task_name}"
         "--set" "mekoTestsRegistry=${MEKO_TESTS_REGISTRY}"
@@ -85,6 +86,7 @@ deploy_test_app() {
         "--set" "cognito_user_password=${cognito_user_password}"
         "--set" "cognito_workload_url=${cognito_workload_url}"
         "--set" "cognito_workload_user_id=${cognito_workload_user_id}"
+        "--set" "helm.oci.version=${helm_oci_version}"
         "--set" "helm.oci.registry=${helm_oci_registry}"
         "--set" "helm.oci.repository=${helm_oci_repository}"
         "--set" "helm.oci.region=${helm_oci_registry_region}"

scripts/release/build/build_info.py

@@ -44,7 +44,8 @@ class BinaryInfo:
 class HelmChartInfo:
     repository: str
     registry: str
-    region: str
+    region: str = None
+    version_prefix: str = None
     sign: bool = False
 
 
@@ -112,6 +113,7 @@ def load_build_info(scenario: BuildScenario) -> BuildInfo:
         helm_charts[name] = HelmChartInfo(
             repository=scenario_data.get("repository"),
             sign=scenario_data.get("sign", False),
+            version_prefix=scenario_data.get("version-prefix"),
             registry=scenario_data.get("registry"),
             region=scenario_data.get("region")
         )

scripts/release/publish_helm_chart.py

@@ -1,7 +1,6 @@
 import argparse
 import os
 import subprocess
-import sys
 
 import yaml
 
@@ -28,7 +27,7 @@ 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, build_scenario) -> tuple[str, str]:
+def update_chart_and_get_metadata(chart_dir: str, version_prefix: str = None) -> tuple[str, str]:
     chart_path = os.path.join(chart_dir, "Chart.yaml")
     version = os.environ.get("OPERATOR_VERSION")
     if not version:
@@ -50,13 +49,15 @@ def update_chart_and_get_metadata(chart_dir: str, build_scenario) -> tuple[str,
         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}")
+        raise Exception(f"Unable to load Chart.yaml from dir {chart_path}: {e}")
 
-    # if build_scenario is release, the chart.yaml would already have correct chart version
-    if build_scenario == BuildScenario.RELEASE:
+    # If version_prefix is not specified, the chart.yaml would already have correct chart version
+    if version_prefix is None:
         return chart_name, version
 
-    new_version = f"0.0.0+{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:
@@ -79,7 +80,7 @@ def get_oci_registry(chart_info: HelmChartInfo) -> str:
         raise ValueError("Error: registry doesn't seem to be set in HelmChartInfo.")
 
     if not repo:
-        raise ValueError("Error: reposiotry doesn't seem to be set in HelmChartInfo.")
+        raise ValueError("Error: repository doesn't seem to be set in HelmChartInfo.")
 
     oci_registry = f"oci://{registry}/{repo}"
     logger.info(f"Determined OCI Registry: {oci_registry}")
@@ -89,7 +90,7 @@ def get_oci_registry(chart_info: HelmChartInfo) -> str:
 def publish_helm_chart(chart_info: HelmChartInfo, build_scenario):
     try:
         oci_registry = get_oci_registry(chart_info)
-        chart_name, chart_version = update_chart_and_get_metadata(CHART_DIR, build_scenario)
+        chart_name, chart_version = update_chart_and_get_metadata(CHART_DIR, chart_info.version_prefix)
         tgz_filename = f"{chart_name}-{chart_version}.tgz"
 
         logger.info(f"Packaging chart: {chart_name} with Version: {chart_version}")
@@ -121,6 +122,5 @@ def main():
 if __name__ == "__main__":
     try:
         main()
-    except Exception as e:
-        logger.error(f"Failure in the helm publishing process {e}")
-        sys.exit(1)
+    except Exception as main_err:
+        raise Exception(f"Failure in the helm publishing process {main_err}")

scripts/release/tests/build_info_test.py

@@ -91,6 +91,7 @@ def test_load_build_info_development():
         },
         helm_charts={
             "mongodb-kubernetes": HelmChartInfo(
+                version_prefix="0.0.0+",
                 registry="268558157000.dkr.ecr.us-east-1.amazonaws.com",
                 repository="dev/mongodb/helm-charts",
                 region="us-east-1",
@@ -185,6 +186,7 @@ def test_load_build_info_patch():
         },
         helm_charts={
             "mongodb-kubernetes": HelmChartInfo(
+                version_prefix="0.0.0+",
                 region="us-east-1",
                 repository="dev/mongodb/helm-charts",
                 registry="268558157000.dkr.ecr.us-east-1.amazonaws.com",
@@ -308,10 +310,11 @@ def test_load_build_info_staging():
         },
         helm_charts={
             "mongodb-kubernetes": HelmChartInfo(
+                sign=True,
+                version_prefix="0.0.0+",
                 registry="268558157000.dkr.ecr.us-east-1.amazonaws.com",
                 repository="staging/mongodb/helm-charts",
                 region="us-east-1",
-                sign=True,
             )
         },
     )
@@ -419,10 +422,9 @@ def test_load_build_info_release():
         },
         helm_charts={
             "mongodb-kubernetes": HelmChartInfo(
+                sign=True,
                 registry="quay.io",
                 repository="mongodb/helm-charts",
-                region=None,
-                sign=True,
             )
         },
     )