linter, reordering minkube, fix agents

Author: nammn

.evergreen-functions.yml

@@ -262,13 +262,13 @@ functions:
   # Configures docker authentication to ECR and RH registries.
   setup_building_host:
     - *switch_context
+    - *python_venv
     - *setup_aws
-    - *configure_docker_auth
     - *setup_evg_host
-    - *python_venv
+    - *configure_docker_auth
 
   # This differs for normal evg_host as we require minikube instead of kind for
-  # IBM machines and install aws cli via pip instead
+  # IBM machines also install aws cli via pip instead and use podman
   setup_building_host_minikube:
     - *switch_context
     - command: subprocess.exec

.evergreen.yml

@@ -432,11 +432,12 @@ tasks:
         vars:
           image_name: meko-tests
 
-
   - name: build_test_image_ibm
     commands:
       - func: clone
-      - func: setup_building_host_minikube
+      - func: python_venv
+      - func: setup_aws
+      - func: download_kube_tools
       - func: build_multi_cluster_binary
       - func: build_test_image_ibm
 

docker/mongodb-agent/Dockerfile.atomic

@@ -1,5 +1,6 @@
 FROM registry.access.redhat.com/ubi8/ubi-minimal AS tools_downloader
 
+ARG TARGETPLATFORM
 ARG mongodb_tools_url
 ARG mongodb_tools_version_s390x
 ARG mongodb_tools_version_ppc64le
@@ -24,6 +25,7 @@ RUN tar xfz /tools/mongodb_tools.tgz --directory /tools \
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal AS agent_downloader
 
+ARG TARGETPLATFORM
 ARG mongodb_agent_url
 ARG mongodb_agent_version_s390x
 ARG mongodb_agent_version_ppc64le

scripts/dev/configure_container_auth.sh

@@ -36,7 +36,7 @@ setup_validate_container_runtime() {
       ;;
   esac
 
-  if [[ "$USE_SUDO" == "true" ]]; then
+  if [[ "${USE_SUDO}" == "true" ]]; then
     sudo mkdir -p "$(dirname "${CONFIG_PATH}")"
   else
     mkdir -p "$(dirname "${CONFIG_PATH}")"
@@ -45,8 +45,8 @@ setup_validate_container_runtime() {
 
 # Wrapper function to execute commands with or without sudo
 exec_cmd() {
-  if [[ "$USE_SUDO" == "true" ]]; then
-    sudo env PATH="$PATH" "$@"
+  if [[ "${USE_SUDO}" == "true" ]]; then
+    sudo env PATH="${PATH}" "$@"
   else
     "$@"
   fi
@@ -55,21 +55,21 @@ exec_cmd() {
 # Wrapper function to read files with or without sudo
 read_file() {
   local file="$1"
-  if [[ "$USE_SUDO" == "true" ]]; then
-    sudo cat "$file"
+  if [[ "${USE_SUDO}" == "true" ]]; then
+    sudo cat "${file}"
   else
-    cat "$file"
+    cat "${file}"
   fi
 }
 
 # Wrapper function to write files with or without sudo
 write_file() {
   local content="$1"
   local file="$2"
-  if [[ "$USE_SUDO" == "true" ]]; then
-    echo "$content" | sudo tee "$file" > /dev/null
+  if [[ "${USE_SUDO}" == "true" ]]; then
+    echo "${content}" | sudo tee "${file}" > /dev/null
   else
-    echo "$content" > "$file"
+    echo "${content}" > "${file}"
   fi
 }
 

scripts/evergreen/e2e/build_e2e_image_ibm.sh

@@ -1,16 +1,16 @@
 #!/usr/bin/env bash
 source scripts/dev/set_env_context.sh
 
+# we need to use podman here and a special script as ibm machines don't have docker
+
 cp -rf public docker/mongodb-kubernetes-tests/public
 cp release.json docker/mongodb-kubernetes-tests/release.json
 cp requirements.txt docker/mongodb-kubernetes-tests/requirements.txt
 cp -rf helm_chart docker/mongodb-kubernetes-tests/helm_chart
 
 echo "Building mongodb-kubernetes-tests image with tag: ${BASE_REPO_URL}/mongodb-kubernetes-tests:${version_id}"
 cd docker/mongodb-kubernetes-tests
-#sudo podman buildx build --progress plain . -f Dockerfile -t "${BASE_REPO_URL}/mongodb-kubernetes-tests:${version_id}-$(arch)" --build-arg PYTHON_VERSION="${PYTHON_VERSION}"
-#sudo podman push --authfile="/root/.config/containers/auth.json" "${BASE_REPO_URL}/mongodb-kubernetes-tests:${version_id}-$(arch)"
-docker buildx build --progress plain . -f Dockerfile -t "${BASE_REPO_URL}/mongodb-kubernetes-tests:${version_id}-$(arch)" --build-arg PYTHON_VERSION="${PYTHON_VERSION}"
-docker push "${BASE_REPO_URL}/mongodb-kubernetes-tests:${version_id}-$(arch)"
+sudo podman buildx build --progress plain . -f Dockerfile -t "${BASE_REPO_URL}/mongodb-kubernetes-tests:${version_id}-$(arch)" --build-arg PYTHON_VERSION="${PYTHON_VERSION}"
+sudo podman push --authfile="/root/.config/containers/auth.json" "${BASE_REPO_URL}/mongodb-kubernetes-tests:${version_id}-$(arch)"
 
 # docker buildx imagetools create "${BASE_REPO_URL}mongodb-kubernetes-tests:${version_id}" --append "${BASE_REPO_URL}mongodb-kubernetes-tests:${version_id}-$(arch)" -t "${BASE_REPO_URL}mongodb-kubernetes-tests:${version_id}"

scripts/evergreen/setup_kind.sh

@@ -11,10 +11,15 @@ arch_suffix=$(detect_architecture)
 # This should be changed when needed
 latest_version="v0.27.0"
 
-mkdir -p "${PROJECT_DIR}/bin/"
-echo "Saving kind to ${PROJECT_DIR}/bin"
-curl --retry 3 --silent -L "https://github.com/kubernetes-sigs/kind/releases/download/${latest_version}/kind-${os}-${arch_suffix}" -o kind
+# Only proceed with installation if architecture is supported (amd64 or arm64)
+if [[ "$arch_suffix" == "amd64" || "$arch_suffix" == "arm64" ]]; then
+  mkdir -p "${PROJECT_DIR}/bin/"
+  echo "Saving kind to ${PROJECT_DIR}/bin"
+  curl --retry 3 --silent -L "https://github.com/kubernetes-sigs/kind/releases/download/${latest_version}/kind-${os}-${arch_suffix}" -o kind
 
-chmod +x kind
-sudo mv kind "${PROJECT_DIR}/bin"
-echo "Installed kind in ${PROJECT_DIR}/bin"
+  chmod +x kind
+  sudo mv kind "${PROJECT_DIR}/bin"
+  echo "Installed kind in ${PROJECT_DIR}/bin"
+else
+  echo "Architecture ${arch_suffix} not supported for kind installation, skipping"
+fi

scripts/evergreen/setup_minikube_host.sh

@@ -6,7 +6,7 @@
 
 source scripts/dev/set_env_context.sh
 source scripts/funcs/install
-set -Eeoux pipefail
+set -Eeou pipefail
 
 echo "=========================================="
 echo "Setting up minikube host with multi-architecture support"
@@ -39,7 +39,6 @@ run_setup_step() {
 }
 
 # Setup Python environment (needed for AWS CLI pip installation)
-export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
 export SKIP_INSTALL_REQUIREMENTS=true
 run_setup_step "Python Virtual Environment" "scripts/dev/recreate_python_venv.sh"
 
@@ -54,14 +53,9 @@ run_setup_step "Minikube Host Setup with Container Runtime Detection" "scripts/m
 export CONTAINER_RUNTIME=podman
 run_setup_step "Container Registry Authentication" "scripts/dev/configure_container_auth.sh"
 
-# The minikube cluster is already started by the setup_minikube_host.sh script
-echo ""
-echo ">>> Minikube cluster startup completed by setup_minikube_host.sh"
-echo "✅ Minikube cluster is ready for use"
-
 echo ""
 echo "=========================================="
-echo "✅ Minikube host setup completed successfully!"
+echo "✅ host setup completed successfully!"
 echo "=========================================="
 echo ""
 echo "Installed tools summary:"
@@ -70,7 +64,5 @@ echo "- AWS CLI: $(aws --version 2>/dev/null || echo 'Not found')"
 echo "- kubectl: $(kubectl version --client 2>/dev/null || echo 'Not found')"
 echo "- helm: $(helm version --short 2>/dev/null || echo 'Not found')"
 echo "- jq: $(jq --version 2>/dev/null || echo 'Not found')"
-echo "- Container Runtime: $(command -v podman &>/dev/null && echo "Podman $(podman --version 2>/dev/null)" || command -v docker &>/dev/null && echo "Docker $(docker --version 2>/dev/null)" || echo "Not found")"
-echo "- Minikube: $(./bin/minikube version --short 2>/dev/null || echo 'Not found')"
 echo ""
-echo "Setup complete! Host is ready for minikube operations."
+echo "Setup complete! Host is ready for operations."

scripts/release/atomic_pipeline.py

@@ -64,10 +64,7 @@ def get_build_arg_names(platform: str) -> Dict[str, str]:
     # Extract architecture from platform (e.g., "amd64" from "linux/amd64")
     arch = platform.split("/")[1]
 
-    return {
-        "agent_build_arg": f"mongodb_agent_version_{arch}",
-        "tools_build_arg": f"mongodb_tools_version_{arch}"
-    }
+    return {"agent_build_arg": f"mongodb_agent_version_{arch}", "tools_build_arg": f"mongodb_tools_version_{arch}"}
 
 
 def generate_tools_build_args(platforms: List[str], tools_version: str) -> Dict[str, str]:
@@ -346,14 +343,13 @@ def build_init_appdb_image(build_configuration: ImageBuildConfiguration):
     # Extract tools version and generate platform-specific build args
     tools_version = extract_tools_version_from_release(release)
     platform_build_args = generate_tools_build_args(
-        platforms=build_configuration.platforms,
-        tools_version=tools_version
+        platforms=build_configuration.platforms, tools_version=tools_version
     )
 
     args = {
         "version": build_configuration.version,
         "mongodb_tools_url": base_url,  # Base URL for platform-specific downloads
-        **platform_build_args  # Add the platform-specific build args
+        **platform_build_args,  # Add the platform-specific build args
     }
 
     build_image(
@@ -372,14 +368,13 @@ def build_init_database_image(build_configuration: ImageBuildConfiguration):
     # Extract tools version and generate platform-specific build args
     tools_version = extract_tools_version_from_release(release)
     platform_build_args = generate_tools_build_args(
-        platforms=build_configuration.platforms,
-        tools_version=tools_version
+        platforms=build_configuration.platforms, tools_version=tools_version
     )
 
     args = {
         "version": build_configuration.version,
         "mongodb_tools_url": base_url,  # Add the base URL for the Dockerfile
-        **platform_build_args  # Add the platform-specific build args
+        **platform_build_args,  # Add the platform-specific build args
     }
 
     build_image(
@@ -520,14 +515,7 @@ def _build_agent(
     agent_version = agent_tools_version[0]
     tools_version = agent_tools_version[1]
 
-    tasks_queue.put(
-        executor.submit(
-            build_agent_pipeline,
-            build_configuration,
-            agent_version,
-            tools_version
-        )
-    )
+    tasks_queue.put(executor.submit(build_agent_pipeline, build_configuration, agent_version, tools_version))
 
 
 def build_agent_pipeline(
@@ -543,20 +531,20 @@ def build_agent_pipeline(
 
     # Generate platform-specific build arguments using the mapping
     platform_build_args = generate_agent_build_args(
-        platforms=build_configuration.platforms,
-        agent_version=agent_version,
-        tools_version=tools_version
+        platforms=build_configuration.platforms, agent_version=agent_version, tools_version=tools_version
     )
 
-    agent_base_url = "https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod"
+    agent_base_url = (
+        "https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod"
+    )
     tools_base_url = "https://fastdl.mongodb.org/tools/db"
 
     args = {
         "version": agent_version,
         "agent_version": agent_version,
         "mongodb_agent_url": agent_base_url,
         "mongodb_tools_url": tools_base_url,
-        **platform_build_args  # Add the platform-specific build args
+        **platform_build_args,  # Add the platform-specific build args
     }
 
     build_image(