Start installing chart from OCI registry in E2E

Author: viveksinghggits

.evergreen.yml

@@ -447,16 +447,6 @@ tasks:
       - func: helm_registry_login
       - func: publish_helm_chart
 
-  - name: publish_helm_chart
-    commands:
-      - func: clone
-      - func: setup_kubectl
-      - func: setup_aws
-      - func: prepare_aws
-      - func: helm_registry_login
-      - func: python_venv
-      - func: publish_helm_chart
-
   - name: prepare_aws
     priority: 59
     commands:

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

@@ -10,9 +10,6 @@
 
 logger = test_logger.get_test_logger(__name__)
 
-HELM_REGISTRY_AWS_REGION = "us-east-1" 
-HELM_ECR_REGISTRY = "268558157000.dkr.ecr.us-east-1.amazonaws.com"
-
 def helm_template(
     helm_args: Dict,
     helm_chart_path: Optional[str] = "helm_chart",
@@ -146,6 +143,53 @@ 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.")
+
+    aws_command = ["aws", "ecr", "get-login-password", "--region", region]
+
+    # as we can see the password is being provided by stdin, that would mean we will have to
+    # pipe the aws_command (it figures out the password) into helm_command.
+    helm_command = ["helm", "registry", "login", "--username", "AWS", "--password-stdin", helm_registry]
+
+    try:
+        logger.info("Starting AWS ECR credential retrieval.")
+        aws_proc = subprocess.Popen(
+            aws_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True  # Treat input/output as text strings
+        )
+
+        logger.info("Starting Helm registry login.")
+        helm_proc = subprocess.Popen(
+            helm_command, stdin=aws_proc.stdout, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
+        )
+
+        # Close the stdout stream of aws_proc in the parent process
+        # to prevent resource leakage (only needed if you plan to do more processing)
+        aws_proc.stdout.close()
+
+        # Wait for the Helm command (helm_proc) to finish and capture its output
+        helm_stdout, helm_stderr = helm_proc.communicate()
+
+        # Wait for the AWS process to finish as well
+        aws_proc.wait()
+
+        if aws_proc.returncode != 0:
+            _, aws_stderr = aws_proc.communicate()
+            raise Exception(f"aws command to get password failed. Error: {aws_stderr}")
+
+        if helm_proc.returncode == 0:
+            logger.info("Login to helm registry was successful.")
+            logger.info(helm_stdout.strip())
+        else:
+            raise Exception(
+                f"Login to helm registry failed, Exit code: {helm_proc.returncode}, Error: {helm_stderr.strip()}"
+            )
+
+    except FileNotFoundError as e:
+        # This catches errors if 'aws' or 'helm' are not in the PATH
+        raise Exception(f"Command not found. Please ensure '{e.filename}' is installed and in your system's PATH.")
+    except Exception as e:
+        raise Exception(f"An unexpected error occurred: {e}.")
 
 def helm_upgrade(
     name: str,
@@ -168,10 +212,14 @@ def helm_upgrade(
         apply_crds_from_chart(chart_dir)
 
     # login to helm registry because we are going to install published helm chart
-    if not helm_registry_login():
-        raise Exception(f"Failed logging in to the helm registry {HELM_ECR_REGISTRY}")
+    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_dir = f"oci://{HELM_ECR_REGISTRY}/dev/helm-charts/mongodb-kubernetes"
+    chart_uri = f"oci://{registry}/{repository}"
     command_args = _create_helm_args(helm_args, helm_options)
     args = [
         "helm",
@@ -181,89 +229,28 @@ def helm_upgrade(
         *command_args,
         name,
     ]
-    custom_operator_version = "0.0.0+68e3eec04df1df00072e1bb2"
+    
     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_dir)
+    args.append(chart_uri)
 
     command = " ".join(args)
     process_run_and_check(command, check=True, capture_output=True, shell=True)
 
-def helm_registry_login():
-    logger.info(f"Attempting to log into ECR registry: {HELM_ECR_REGISTRY}, using helm registry login.")
-    
-    aws_command = [
-        "aws", 
-        "ecr", 
-        "get-login-password", 
-        "--region", 
-        HELM_REGISTRY_AWS_REGION
-    ]
-    
-    # as we can see the password is being provided by stdin, that would mean we will have to
-    # pipe the aws_command (it figures out the password) into helm_command.
-    helm_command = [
-        "helm", 
-        "registry", 
-        "login", 
-        "--username", 
-        "AWS", 
-        "--password-stdin", 
-        HELM_ECR_REGISTRY
-    ]
+def oci_chart_info():
+    registry = os.environ.get("OCI_HELM_REGISTRY")
+    repository = os.environ.get("OCI_HELM_REPOSITORY")
+    region = os.environ.get("OCI_HELM_REGION")
 
-    try:
-        logger.info("Starting AWS ECR credential retrieval.")
-        aws_proc = subprocess.Popen(
-            aws_command, 
-            stdout=subprocess.PIPE, 
-            stderr=subprocess.PIPE,
-            text=True  # Treat input/output as text strings
-        )
-        
-        logger.info("Starting Helm registry login.")
-        helm_proc = subprocess.Popen(
-            helm_command, 
-            stdin=aws_proc.stdout, 
-            stdout=subprocess.PIPE, 
-            stderr=subprocess.PIPE,
-            text=True
-        )
-        
-        # Close the stdout stream of aws_proc in the parent process 
-        # to prevent resource leakage (only needed if you plan to do more processing)
-        aws_proc.stdout.close() 
-
-        # Wait for the Helm command (helm_proc) to finish and capture its output
-        helm_stdout, helm_stderr = helm_proc.communicate()
-        
-        # Wait for the AWS process to finish as well
-        aws_proc.wait() 
-
-        if aws_proc.returncode != 0:
-            logger.error(f"aws command to get password failed, (Exit Code {aws_proc.returncode}).")
-            # We captured AWS stderr directly, so print it
-            _, aws_stderr = aws_proc.communicate() 
-            logger.error(aws_stderr)
-            return False
-            
-        if helm_proc.returncode == 0:
-            logger.info("Login to helm registry was successful.")
-            logger.info(helm_stdout.strip())
-            return True
-        else:
-            logger.error(f"Login to helm registry failed, (Exit Code {helm_proc.returncode}).")
-            logger.error(helm_stderr.strip())
-            return False
+    print(f"oci chart details in test image is registry {registry}, repo {repository}, region {region}")
 
-    except FileNotFoundError as e:
-        # This catches errors if 'aws' or 'helm' are not in the PATH
-        logger.error(f"Command not found. Please ensure '{e.filename}' is installed and in your system's PATH.")
-        return False
-    except Exception as e:
-        logger.error(f"An unexpected error occurred: {e}.")
-        return False
+    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"))

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

@@ -174,6 +174,22 @@ spec:
     - name: OM_DEBUG_HTTP
       value: "{{ .Values.omDebugHttp }}"
     {{ 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 }}"
+    {{ end }}
+    {{ if .Values.helm.oci.region }}
+    - name: OCI_HELM_REGION
+      value: "{{ .Values.helm.oci.region }}"
+    {{ end }}
     - name: ops_manager_version
       value: "{{ .Values.opsManagerVersion }}"
     - name: cognito_user_pool_id

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

@@ -43,3 +43,14 @@ mdbImageType: "ubi8"
 
 # set to "true" to set OM_DEBUG_HTTP=true for the operator
 omDebugHttp:
+
+# sets the configuration using which we can figure out the helm OCI repo of the MCK operator while deploying it
+# to run a test.
+helm:
+  oci:
+    registry: ""
+    repository: ""
+    region: ""
+
+operator:
+  version: ""

scripts/evergreen/e2e/single_e2e.sh

@@ -45,6 +45,11 @@ deploy_test_app() {
     BUILD_ID="${BUILD_ID:-default_build_id}"
     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' )
+
     # 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'}"
@@ -139,6 +144,22 @@ deploy_test_app() {
         helm_params+=("--set" "omDebugHttp=true")
     fi
 
+    if [[ -n "${helm_oci_regisry:-}" ]]; then
+        helm_params+=("--set" "helm.oci.registry=${helm_oci_regisry}")
+    fi
+
+    if [[ -n "${helm_oci_repository:-}" ]]; then
+        helm_params+=("--set" "helm.oci.repository=${helm_oci_repository}")
+    fi
+
+    if [[ -n "${helm_oci_registry_region:-}" ]]; then
+        helm_params+=("--set" "helm.oci.region=${helm_oci_registry_region}")
+    fi
+
+    if [[ -n "${OPERATOR_VERSION:-}" ]]; then
+        helm_params+=("--set" "operator.version=${OPERATOR_VERSION}")
+    fi
+
     helm_params+=("--set" "opsManagerVersion=${ops_manager_version}")
 
     helm template "scripts/evergreen/deployments/test-app" "${helm_params[@]}" > "${helm_template_file}" || exit 1

scripts/release/oci_chart_info.py

@@ -0,0 +1,24 @@
+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)
+    chart_info = build_info.helm_charts["mongodb-kubernetes"]
+
+    j = json.dumps(asdict(chart_info))
+    print(j)
+
+
+
+if __name__ == "__main__":
+    try:
+        main()
+    except Exception as e:
+        logger.error(f"Failed while dumping the chart_info as json. Error: {e}")
+        sys.exit(1)