From 47ea52440e58ad399f6e013ab14c1f10e4640cd8 Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Wed, 10 Sep 2025 14:30:20 +0200 Subject: [PATCH 1/3] don't sleep for infinity but 2 hours instead --- docker/cluster-cleaner/Makefile | 2 +- docker/cluster-cleaner/scripts/clean-failed-namespaces.sh | 3 ++- .../fixtures/mongodb-multi-central-sts-override.yaml | 4 ++-- .../multicluster/fixtures/mongodb-multi-sts-override.yaml | 6 +++--- .../tests/opsmanager/fixtures/om_ops_manager_pod_spec.yaml | 2 +- .../replicaset/fixtures/replica-set-custom-podspec.yaml | 2 +- .../tests/replicaset/replica_set_custom_podspec.py | 2 +- .../fixtures/sharded-cluster-custom-podspec.yaml | 4 ++-- .../standalone/fixtures/standalone-custom-podspec.yaml | 2 +- .../test-app/templates/mongodb-enterprise-tests.yaml | 2 +- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/docker/cluster-cleaner/Makefile b/docker/cluster-cleaner/Makefile index 801767e2f..630a4688c 100644 --- a/docker/cluster-cleaner/Makefile +++ b/docker/cluster-cleaner/Makefile @@ -1,4 +1,4 @@ -IMAGE_VERSION=0.14 +IMAGE_VERSION=0.15 .PHONY: all all: build push install diff --git a/docker/cluster-cleaner/scripts/clean-failed-namespaces.sh b/docker/cluster-cleaner/scripts/clean-failed-namespaces.sh index 6ee0596f9..6b3f3b0c8 100755 --- a/docker/cluster-cleaner/scripts/clean-failed-namespaces.sh +++ b/docker/cluster-cleaner/scripts/clean-failed-namespaces.sh @@ -8,7 +8,8 @@ delete_resources_safely() { kubectl delete "${resource_type}" --all -n "${namespace}" --wait=true --timeout=10s || true # Check if any resources are still stuck - resources=$(kubectl get "$resource_type" -n "${namespace}" --no-headers -o custom-columns=":metadata.name") + # Let's not fail here and continue deletion + resources=$(kubectl get "$resource_type" -n "${namespace}" --no-headers -o custom-columns=":metadata.name" 2>/dev/null || true) for resource in ${resources}; do echo "${resource_type}/${resource} is still present, force deleting..." diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/fixtures/mongodb-multi-central-sts-override.yaml b/docker/mongodb-kubernetes-tests/tests/multicluster/fixtures/mongodb-multi-central-sts-override.yaml index d8434d35f..09db4793f 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/fixtures/mongodb-multi-central-sts-override.yaml +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/fixtures/mongodb-multi-central-sts-override.yaml @@ -12,13 +12,13 @@ spec: spec: template: spec: - # FIXME workaround for sleep infinity hanging + # FIXME workaround for sleep 7200 hanging shareProcessNamespace: true containers: - name: sidecar1 image: busybox command: ["sleep"] - args: [ "infinity" ] + args: [ "7200" ] opsManager: configMapRef: name: my-project diff --git a/docker/mongodb-kubernetes-tests/tests/multicluster/fixtures/mongodb-multi-sts-override.yaml b/docker/mongodb-kubernetes-tests/tests/multicluster/fixtures/mongodb-multi-sts-override.yaml index b0c36bbea..21d381cca 100644 --- a/docker/mongodb-kubernetes-tests/tests/multicluster/fixtures/mongodb-multi-sts-override.yaml +++ b/docker/mongodb-kubernetes-tests/tests/multicluster/fixtures/mongodb-multi-sts-override.yaml @@ -28,7 +28,7 @@ spec: - name: sidecar1 image: busybox command: ["sleep"] - args: [ "infinity" ] + args: [ "7200" ] volumeClaimTemplates: - metadata: name: data @@ -44,7 +44,7 @@ spec: - name: sidecar2 image: busybox command: ["sleep"] - args: [ "infinity" ] + args: [ "7200" ] volumeClaimTemplates: - metadata: name: data @@ -60,7 +60,7 @@ spec: - name: sidecar3 image: busybox command: ["sleep"] - args: [ "infinity" ] + args: [ "7200" ] volumeClaimTemplates: - metadata: name: data diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/fixtures/om_ops_manager_pod_spec.yaml b/docker/mongodb-kubernetes-tests/tests/opsmanager/fixtures/om_ops_manager_pod_spec.yaml index 347c67fca..afadab595 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/fixtures/om_ops_manager_pod_spec.yaml +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/fixtures/om_ops_manager_pod_spec.yaml @@ -66,7 +66,7 @@ spec: - name: appdb-sidecar image: busybox command: ["sleep"] - args: ["infinity"] + args: ["7200"] resources: limits: cpu: "1" diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/fixtures/replica-set-custom-podspec.yaml b/docker/mongodb-kubernetes-tests/tests/replicaset/fixtures/replica-set-custom-podspec.yaml index 2f38cfaaa..2d62c521f 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/fixtures/replica-set-custom-podspec.yaml +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/fixtures/replica-set-custom-podspec.yaml @@ -25,7 +25,7 @@ spec: - name: side-car image: busybox:latest command: ["/bin/sh"] - args: ["-c", "echo ok > /somewhere/busybox_file && sleep 86400"] + args: ["-c", "echo ok > /somewhere/busybox_file && sleep 7200"] volumeMounts: - mountPath: /somewhere name: test-volume diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_podspec.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_podspec.py index 145d31e08..ef7e130f6 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_podspec.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_podspec.py @@ -139,7 +139,7 @@ def test_stateful_set_spec_updated(replica_set, namespace): } ], "command": ["/bin/sh"], - "args": ["-c", "echo ok > /somewhere/busybox_file && sleep 86400"], + "args": ["-c", "echo ok > /somewhere/busybox_file && sleep 10800"], }, ] diff --git a/docker/mongodb-kubernetes-tests/tests/shardedcluster/fixtures/sharded-cluster-custom-podspec.yaml b/docker/mongodb-kubernetes-tests/tests/shardedcluster/fixtures/sharded-cluster-custom-podspec.yaml index 91a94bc30..f1408e957 100644 --- a/docker/mongodb-kubernetes-tests/tests/shardedcluster/fixtures/sharded-cluster-custom-podspec.yaml +++ b/docker/mongodb-kubernetes-tests/tests/shardedcluster/fixtures/sharded-cluster-custom-podspec.yaml @@ -43,7 +43,7 @@ spec: - name: sharded-cluster-sidecar image: busybox command: ["sleep"] - args: [ "infinity" ] + args: [ "7200" ] resources: limits: cpu: "1" @@ -63,7 +63,7 @@ spec: - name: sharded-cluster-sidecar-override image: busybox command: ["sleep"] - args: [ "infinity" ] + args: [ "7200" ] resources: limits: cpu: "1" diff --git a/docker/mongodb-kubernetes-tests/tests/standalone/fixtures/standalone-custom-podspec.yaml b/docker/mongodb-kubernetes-tests/tests/standalone/fixtures/standalone-custom-podspec.yaml index 871d2191a..606464c60 100644 --- a/docker/mongodb-kubernetes-tests/tests/standalone/fixtures/standalone-custom-podspec.yaml +++ b/docker/mongodb-kubernetes-tests/tests/standalone/fixtures/standalone-custom-podspec.yaml @@ -21,7 +21,7 @@ spec: - name: standalone-sidecar image: busybox command: ["sleep"] - args: [ "infinity" ] + args: [ "7200" ] terminationGracePeriodSeconds: 10 affinity: podAntiAffinity: diff --git a/scripts/evergreen/deployments/test-app/templates/mongodb-enterprise-tests.yaml b/scripts/evergreen/deployments/test-app/templates/mongodb-enterprise-tests.yaml index 0b6e72b1b..1071e6770 100644 --- a/scripts/evergreen/deployments/test-app/templates/mongodb-enterprise-tests.yaml +++ b/scripts/evergreen/deployments/test-app/templates/mongodb-enterprise-tests.yaml @@ -55,7 +55,7 @@ spec: containers: - image: public.ecr.aws/docker/library/busybox:1.37.0 name: keepalive - command: ["/bin/sh", "-c", "while true; do sleep 3600; done"] + command: ["/bin/sh", "-c", "while true; do sleep 7200; done"] volumeMounts: - name: results mountPath: /tmp/results From 9d7244058778edcd08a33f09660a5a5c1714a807 Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Wed, 10 Sep 2025 14:32:14 +0200 Subject: [PATCH 2/3] don't sleep for infinity but 2 hours instead --- .../tests/replicaset/replica_set_custom_podspec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_podspec.py b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_podspec.py index ef7e130f6..7a9f9eb53 100644 --- a/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_podspec.py +++ b/docker/mongodb-kubernetes-tests/tests/replicaset/replica_set_custom_podspec.py @@ -139,7 +139,7 @@ def test_stateful_set_spec_updated(replica_set, namespace): } ], "command": ["/bin/sh"], - "args": ["-c", "echo ok > /somewhere/busybox_file && sleep 10800"], + "args": ["-c", "echo ok > /somewhere/busybox_file && sleep 7200"], }, ] From 20b31eb2039732f87650591935a90d20c1b5b313 Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Fri, 12 Sep 2025 15:53:09 +0200 Subject: [PATCH 3/3] don'fix pod spec test --- .../opsmanager/withMonitoredAppDB/om_ops_manager_pod_spec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_pod_spec.py b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_pod_spec.py index 3258ebbd1..1800456d2 100644 --- a/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_pod_spec.py +++ b/docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_ops_manager_pod_spec.py @@ -96,7 +96,7 @@ def test_appdb_pod_template_containers(self, ops_manager: MongoDBOpsManager): appdb_sidecar_container = containers_by_name["appdb-sidecar"] assert appdb_sidecar_container.image == "busybox" assert appdb_sidecar_container.command == ["sleep"] - assert appdb_sidecar_container.args == ["infinity"] + assert appdb_sidecar_container.args == ["7200"] def test_appdb_persistence(self, ops_manager: MongoDBOpsManager, namespace: str): # appdb pod volume claim template