refactoring and cleanups on architecture and minikube handling

Author: nammn

.evergreen-functions.yml

@@ -231,7 +231,7 @@ functions:
       working_dir: src/github.com/mongodb/mongodb-kubernetes
       add_to_path:
         - ${workdir}/bin
-      binary: scripts/dev/configure_docker_auth.sh
+      binary: scripts/dev/configure_container_auth.sh
 
   setup_evg_host: &setup_evg_host
     command: subprocess.exec
@@ -280,10 +280,17 @@ functions:
         command: scripts/evergreen/setup_minikube_host.sh
 
   prune_docker_resources:
-    - command: subprocess.exec
+    - command: shell.exec
       type: setup
       params:
-        command: "docker system prune -a -f"
+        shell: bash
+        script: |
+          if command -v docker >/dev/null 2>&1; then
+            echo "Docker found, pruning docker resources..."
+            docker system prune -a -f
+          else
+            echo "Docker not found, skipping docker resource pruning"
+          fi
 
   # the task configures the set of tools necessary for any task working with K8 cluster:
   # installs kubectl, jq, kind (if necessary), configures docker authentication

.evergreen.yml

@@ -140,7 +140,7 @@ variables:
 
   - &teardown_group
     teardown_group:
-      - func: teardown_kubernetes_environment
+      - func: prune_docker_resources
       - func: run_retry_script
 
   - &base_om7_dependency

Makefile

@@ -147,7 +147,7 @@ ac:
 # in parallel and both call 'aws_login') then Docker login may return an error "Error saving credentials:..The
 # specified item already exists in the keychain". Seems this allows to ignore the error
 aws_login:
-	@ scripts/dev/configure_docker_auth.sh
+	@ scripts/dev/configure_container_auth.sh
 
 # cleans up aws resources, including s3 buckets which are older than 5 hours
 aws_cleanup:

docker/mongodb-kubernetes-init-database/content/agent-launcher-lib.sh

@@ -91,15 +91,28 @@ download_agent() {
       AGENT_VERSION="${MDB_AGENT_VERSION}"
     fi
 
-    if [ "$(arch)" = "x86_64" ]; then
-        AGENT_FILE="mongodb-mms-automation-agent-${AGENT_VERSION}.linux_x86_64.tar.gz"
-    elif [ "$(arch)" = "arm64" ]; then
-        AGENT_FILE="mongodb-mms-automation-agent-${AGENT_VERSION}.amzn2_aarch64.tar.gz"
-    elif [ "$(arch)" = "ppc64le" ]; then
-        AGENT_FILE="mongodb-mms-automation-agent-${AGENT_VERSION}.rhel8_ppc64le.tar.gz"
-    elif [ "$(arch)" = "s390x" ]; then
-        AGENT_FILE="mongodb-mms-automation-agent-${AGENT_VERSION}.rhel7_s390x.tar.gz"
-    fi
+    # Detect architecture for agent download
+    local detected_arch
+    detected_arch=$(uname -m)
+
+    case "${detected_arch}" in
+        x86_64)
+            AGENT_FILE="mongodb-mms-automation-agent-${AGENT_VERSION}.linux_x86_64.tar.gz"
+            ;;
+        aarch64|arm64)
+            AGENT_FILE="mongodb-mms-automation-agent-${AGENT_VERSION}.amzn2_aarch64.tar.gz"
+            ;;
+        ppc64le)
+            AGENT_FILE="mongodb-mms-automation-agent-${AGENT_VERSION}.rhel8_ppc64le.tar.gz"
+            ;;
+        s390x)
+            AGENT_FILE="mongodb-mms-automation-agent-${AGENT_VERSION}.rhel7_s390x.tar.gz"
+            ;;
+        *)
+            script_log "Error: Unsupported architecture for MongoDB agent: ${detected_arch}"
+            exit 1
+            ;;
+    esac
 
     script_log "Downloading Agent version: ${AGENT_VERSION}"
     script_log "Downloading a Mongodb Agent from ${base_url:?}"

scripts/dev/configure_docker_auth.sh scripts/dev/configure_container_auth.shscripts/dev/configure_docker_auth.sh renamed to scripts/dev/configure_container_auth.sh

@@ -8,11 +8,9 @@ source scripts/funcs/checks
 source scripts/funcs/printing
 source scripts/funcs/kubernetes
 
-# Parse command line arguments
 CONTAINER_RUNTIME="${CONTAINER_RUNTIME-"docker"}"
 
-# Validate and set up container runtime configuration
-setup_container_runtime() {
+setup_validate_container_runtime() {
   case "${CONTAINER_RUNTIME}" in
     "podman")
       if ! command -v podman &> /dev/null; then
@@ -38,7 +36,6 @@ setup_container_runtime() {
       ;;
   esac
 
-  # Create config directory
   if [[ "$USE_SUDO" == "true" ]]; then
     sudo mkdir -p "$(dirname "${CONFIG_PATH}")"
   else
@@ -76,51 +73,20 @@ write_file() {
   fi
 }
 
-check_docker_daemon_is_running() {
-  if [[ "${CONTAINER_RUNTIME}" == "podman" ]]; then
-    # Podman doesn't require a daemon
-    echo "Using Podman (no daemon required)"
-    return 0
-  fi
-
-  if [[ "$(uname -s)" != "Linux" ]]; then
-    echo "Skipping docker daemon check when not running in Linux"
-    return 0
-  fi
-
-  if systemctl is-active --quiet docker; then
-      echo "Docker is already running."
-  else
-      echo "Docker is not running. Starting Docker..."
-      # Start the Docker daemon
-      sudo systemctl start docker
-      for _ in {1..15}; do
-        if systemctl is-active --quiet docker; then
-            echo "Docker started successfully."
-            return 0
-        fi
-        echo "Waiting for Docker to start..."
-        sleep 3
-      done
-  fi
-}
-
 remove_element() {
   local config_option="$1"
-  local tmpfile=$(mktemp)
+  local tmpfile
+  tmpfile=$(mktemp)
 
-  # Initialize config file if it doesn't exist
   if [[ ! -f "${CONFIG_PATH}" ]]; then
     write_file '{}' "${CONFIG_PATH}"
   fi
 
-  # Remove the specified element using jq
   exec_cmd jq 'del(.'"${config_option}"')' "${CONFIG_PATH}" > "${tmpfile}"
   exec_cmd cp "${tmpfile}" "${CONFIG_PATH}"
   rm "${tmpfile}"
 }
 
-# Container runtime login wrapper
 container_login() {
   local username="$1"
   local registry="$2"
@@ -132,21 +98,14 @@ container_login() {
   fi
 }
 
-# This is the script which performs container authentication to different registries that we use (so far ECR and RedHat)
-# As the result of this login the config file will have all the 'auth' information necessary to work with container registries
-
-setup_container_runtime
-
-check_docker_daemon_is_running
+setup_validate_container_runtime
 
-# Initialize config file if it doesn't exist
 if [[ ! -f "${CONFIG_PATH}" ]]; then
   write_file '{}' "${CONFIG_PATH}"
 fi
 
 if [[ -f "${CONFIG_PATH}" ]]; then
   if [[ "${RUNNING_IN_EVG:-"false"}" != "true" ]]; then
-    # Check if login is actually required by making a HEAD request to ECR using existing credentials
     echo "Checking if container registry credentials are valid..."
     ecr_auth=$(exec_cmd jq -r '.auths."268558157000.dkr.ecr.us-east-1.amazonaws.com".auth // empty' "${CONFIG_PATH}")
 

scripts/dev/prepare_local_e2e_run.sh

@@ -49,7 +49,7 @@ ensure_namespace "${NAMESPACE}" 2>&1 | prepend "ensure_namespace"
 
 echo "Deleting ~/.docker/.config.json and re-creating it"
 rm ~/.docker/config.json || true
-scripts/dev/configure_docker_auth.sh 2>&1 | prepend "configure_docker_auth"
+scripts/dev/configure_container_auth.sh 2>&1 | prepend "configure_docker_auth"
 
 echo "Configuring operator"
 scripts/evergreen/e2e/configure_operator.sh 2>&1 | prepend "configure_operator"

scripts/evergreen/setup_aws.sh

@@ -2,34 +2,16 @@
 set -Eeou pipefail
 
 source scripts/dev/set_env_context.sh
+source scripts/funcs/install
 
-# Detect system architecture
-detect_architecture() {
-    local arch
-    arch=$(uname -m)
-    echo "Detected architecture: ${arch}" >&2
-    echo "${arch}"
-}
-
-# Install AWS CLI v2 via binary download (for x86_64 and aarch64)
+# Install AWS CLI v2 via binary download (for amd64 and arm64)
 install_aws_cli_binary() {
     local arch="$1"
     echo "Installing AWS CLI v2 via binary download for ${arch}..."
 
     # Map architecture names for AWS CLI download URLs
     local aws_arch
-    case "${arch}" in
-        x86_64)
-            aws_arch="x86_64"
-            ;;
-        aarch64|arm64)
-            aws_arch="aarch64"
-            ;;
-        *)
-            echo "Error: Unsupported architecture for binary installation: ${arch}" >&2
-            return 1
-            ;;
-    esac
+    aws_arch=$(uname -m)
 
     # Download and install AWS CLI v2
     local temp_dir
@@ -38,7 +20,7 @@ install_aws_cli_binary() {
 
     echo "Downloading AWS CLI v2 for ${aws_arch}..."
     curl -s "https://awscli.amazonaws.com/awscli-exe-linux-${aws_arch}.zip" -o "awscliv2.zip"
-    
+
     unzip -q awscliv2.zip
     sudo ./aws/install --update
 
@@ -97,11 +79,7 @@ install_aws_cli() {
     arch=$(detect_architecture)
 
     case "${arch}" in
-        ppc64le|s390x)
-            echo "IBM architecture detected (${arch}). Using pip installation..."
-            install_aws_cli_pip
-            ;;
-        x86_64|aarch64|arm64)
+        amd64|arm64)
             echo "Standard architecture detected (${arch}). Using binary installation..."
             install_aws_cli_binary "${arch}"
             ;;

scripts/evergreen/setup_jq.sh

@@ -9,32 +9,7 @@ set -Eeou pipefail
 
 source scripts/funcs/install
 
-# Detect and map architecture for jq releases
-detect_jq_architecture() {
-    local arch
-    arch=$(uname -m)
-
-    case "${arch}" in
-        x86_64)
-            echo "amd64"
-            ;;
-        aarch64|arm64)
-            echo "arm64"
-            ;;
-        ppc64le)
-            echo "ppc64el"  # jq uses ppc64el instead of ppc64le
-            ;;
-        s390x)
-            echo "s390x"
-            ;;
-        *)
-            echo "Error: Unsupported architecture for jq: ${arch}" >&2
-            exit 1
-            ;;
-    esac
-}
-
-jq_arch=$(detect_jq_architecture)
-echo "Detected architecture: $(uname -m), using jq architecture: ${jq_arch}"
+jq_arch=$(detect_architecture "jq")
+echo "Detected architecture: ${jq_arch}"
 
 download_and_install_binary "${PROJECT_DIR:-${workdir}}/bin" jq "https://github.com/stedolan/jq/releases/download/jq-1.8.1/jq-linux-${jq_arch}"

scripts/evergreen/setup_kind.sh

@@ -2,16 +2,12 @@
 set -Eeou pipefail
 
 source scripts/dev/set_env_context.sh
+source scripts/funcs/install
 
 # Store the lowercase name of Operating System
 os=$(uname | tr '[:upper:]' '[:lower:]')
 # Detect architecture
-arch=$(uname -m)
-case ${arch} in
-    x86_64) arch_suffix="amd64" ;;
-    aarch64|arm64) arch_suffix="arm64" ;;
-    *) echo "Unsupported architecture: ${arch}" >&2; exit 1 ;;
-esac
+arch_suffix=$(detect_architecture)
 # This should be changed when needed
 latest_version="v0.27.0"
 

scripts/evergreen/setup_kubectl.sh

@@ -2,32 +2,7 @@
 set -Eeou pipefail
 
 source scripts/dev/set_env_context.sh
-
-# Detect system architecture and map to kubectl/helm architecture names
-detect_architecture() {
-    local arch
-    arch=$(uname -m)
-    
-    case "${arch}" in
-        x86_64)
-            echo "amd64"
-            ;;
-        aarch64|arm64)
-            echo "arm64"
-            ;;
-        ppc64le)
-            echo "ppc64le"
-            ;;
-        s390x)
-            echo "s390x"
-            ;;
-        *)
-            echo "Unsupported architecture: ${arch}" >&2
-            echo "Supported architectures: x86_64 (amd64), aarch64 (arm64), ppc64le, s390x" >&2
-            exit 1
-            ;;
-    esac
-}
+source scripts/funcs/install
 
 # Detect the current architecture
 ARCH=$(detect_architecture)