Remove hard coded name (#103)

Author: chatton

.evergreen.yml

@@ -50,6 +50,7 @@ functions:
         local_files_include_filter:
           - e2e/*.txt
           - e2e/*.log
+          - e2e/*.json
         region: us-east-1
         remote_file: logs/${task_id}/${execution}/
         bucket: community-operator-e2e-logs
@@ -132,7 +133,7 @@ functions:
 
 task_groups:
 - name: e2e_test_group
-  max_hosts: 3
+  max_hosts: 4
   setup_group:
     - func: clone
     - func: setup_virtualenv

scripts/dev/dump_diagnostic.py

@@ -83,6 +83,18 @@ def dump_configmap_keys_namespaced(
                     )
 
 
+def dump_automation_configs(namespace: str) -> None:
+    mongodb_resources = k8s_request_data.get_all_mongodb_namespaced(namespace)
+    if mongodb_resources is None:
+        print("No MongoDB resources found, not dumping any automation configs")
+        return
+    for mdb in mongodb_resources:
+        name = mdb["metadata"]["name"]
+        dump_configmap_keys_namespaced(
+            namespace, ["automation-config"], f"{name}-config"
+        )
+
+
 def dump_all(namespace: str) -> None:
 
     if os.path.exists("logs"):
@@ -103,4 +115,4 @@ def dump_all(namespace: str) -> None:
     with open("logs/e2e/crd.log", mode="w", encoding="utf-8") as crd_log:
         dump_crd(crd_log)
 
-    dump_configmap_keys_namespaced(namespace, ["automation-config"], "mdb0-config")
+    dump_automation_configs(namespace)

scripts/dev/k8s_request_data.py

@@ -1,10 +1,10 @@
 from kubernetes.client.rest import ApiException
 from kubernetes import client
 
-from typing import Optional
+from typing import Optional, List, Dict
 
 
-def get_crds() -> Optional[dict]:
+def get_crds() -> Optional[Dict]:
     crdv1 = client.ApiextensionsV1beta1Api()
     try:
         crd = crdv1.list_custom_resource_definition(pretty="true")
@@ -14,7 +14,20 @@ def get_crds() -> Optional[dict]:
     return crd.to_dict()
 
 
-def get_persistent_volumes() -> Optional[dict]:
+def get_all_mongodb_namespaced(namespace: str) -> Optional[List]:
+    customv1 = client.CustomObjectsApi()
+    try:
+        return list(
+            customv1.list_namespaced_custom_object(
+                "mongodb.com", "v1", namespace, "mongodb", pretty=True
+            )["items"]
+        )
+    except ApiException as e:
+        print("Exception when calling get_namespaced_custom_object %s\n" % e)
+    return None
+
+
+def get_persistent_volumes() -> Optional[Dict]:
     corev1 = client.CoreV1Api()
     try:
         pv = corev1.list_persistent_volume(pretty="true")
@@ -24,7 +37,7 @@ def get_persistent_volumes() -> Optional[dict]:
     return pv.to_dict()
 
 
-def get_stateful_sets_namespaced(namespace: str) -> Optional[dict]:
+def get_stateful_sets_namespaced(namespace: str) -> Optional[Dict]:
     av1beta1 = client.AppsV1Api()
     try:
         sst = av1beta1.list_namespaced_stateful_set(namespace, pretty="true")
@@ -34,7 +47,7 @@ def get_stateful_sets_namespaced(namespace: str) -> Optional[dict]:
     return sst.to_dict()
 
 
-def get_configmap_namespaced(namespace: str, name: str) -> Optional[dict]:
+def get_configmap_namespaced(namespace: str, name: str) -> Optional[Dict]:
     corev1 = client.CoreV1Api()
     try:
         config_map = corev1.read_namespaced_config_map(name, namespace, pretty="true")
@@ -44,7 +57,7 @@ def get_configmap_namespaced(namespace: str, name: str) -> Optional[dict]:
     return config_map.to_dict()
 
 
-def get_pods_namespaced(namespace: str) -> Optional[list]:
+def get_pods_namespaced(namespace: str) -> Optional[List]:
     corev1 = client.CoreV1Api()
     try:
         pods = corev1.list_namespaced_pod(namespace)
@@ -60,6 +73,7 @@ def get_pod_namespaced(namespace: str, pod_name: str) -> Optional[client.V1Pod]:
         pod = corev1.read_namespaced_pod(name=pod_name, namespace=namespace)
     except ApiException as e:
         print("Exception when calling read_namespaced_pod: %s\n" % e)
+        return None
     return pod