CLOUDP-64640: refactoring of k8sutils (#56)

* CLOUDP-64640: refactoring of k8sutils

Author: Nikolas De Giorgis

scripts/dev/build_and_deploy_operator.py

@@ -9,7 +9,7 @@
 from dockerfile_generator import render
 from dockerutil import build_and_push_image
 
-from k8sutil import wait_for_condition, ignore_if_already_exists, ignore_if_doesnt_exist
+import k8s_conditions
 
 
 def _load_operator_service_account() -> Optional[Dict]:
@@ -47,12 +47,12 @@ def _ensure_crds():
     crdv1 = client.ApiextensionsV1beta1Api()
     crd = _load_mongodb_crd()
 
-    ignore_if_doesnt_exist(
+    k8s_conditions.ignore_if_doesnt_exist(
         lambda: crdv1.delete_custom_resource_definition("mongodb.mongodb.com")
     )
 
     # Make sure that the CRD has being deleted before trying to create it again
-    if not wait_for_condition(
+    if not k8s_conditions.wait(
         lambda: crdv1.list_custom_resource_definition(
             field_selector="metadata.name==mongodb.mongodb.com"
         ),
@@ -93,22 +93,22 @@ def deploy_operator():
     dev_config = load_config()
     _ensure_crds()
 
-    ignore_if_already_exists(
+    k8s_conditions.ignore_if_already_exists(
         lambda: rbacv1.create_namespaced_role(
             dev_config.namespace, _load_operator_role()
         )
     )
-    ignore_if_already_exists(
+    k8s_conditions.ignore_if_already_exists(
         lambda: rbacv1.create_namespaced_role_binding(
             dev_config.namespace, _load_operator_role_binding()
         )
     )
-    ignore_if_already_exists(
+    k8s_conditions.ignore_if_already_exists(
         lambda: corev1.create_namespaced_service_account(
             dev_config.namespace, _load_operator_service_account()
         )
     )
-    ignore_if_already_exists(
+    k8s_conditions.ignore_if_already_exists(
         lambda: appsv1.create_namespaced_deployment(
             dev_config.namespace,
             _load_operator_deployment(

scripts/dev/e2e.py

@@ -6,11 +6,7 @@
     deploy_operator,
     load_yaml_from_file,
 )
-from k8sutil import (
-    wait_for_condition,
-    ignore_if_doesnt_exist,
-    ignore_if_already_exists,
-)
+import k8s_conditions
 from dockerutil import build_and_push_image
 from typing import Dict, Optional
 from dev_config import load_config
@@ -51,28 +47,28 @@ def _prepare_testrunner_environment():
     _delete_testrunner_pod()
 
     print("Creating Role")
-    ignore_if_already_exists(
+    k8s_conditions.ignore_if_already_exists(
         lambda: rbacv1.create_namespaced_role(
             dev_config.namespace, _load_testrunner_role()
         )
     )
 
     print("Creating Role Binding")
-    ignore_if_already_exists(
+    k8s_conditions.ignore_if_already_exists(
         lambda: rbacv1.create_namespaced_role_binding(
             dev_config.namespace, _load_testrunner_role_binding()
         )
     )
 
     print("Creating Cluster Role Binding")
-    ignore_if_already_exists(
+    k8s_conditions.ignore_if_already_exists(
         lambda: rbacv1.create_cluster_role_binding(
             _load_testrunner_cluster_role_binding()
         )
     )
 
     print("Creating ServiceAccount")
-    ignore_if_already_exists(
+    k8s_conditions.ignore_if_already_exists(
         lambda: corev1.create_namespaced_service_account(
             dev_config.namespace, _load_testrunner_service_account()
         )
@@ -97,7 +93,7 @@ def create_kube_config():
         metadata=client.V1ObjectMeta(name="kube-config"), data=data
     )
 
-    ignore_if_already_exists(
+    k8s_conditions.ignore_if_already_exists(
         lambda: corev1.create_namespaced_config_map("default", config_map)
     )
 
@@ -131,7 +127,7 @@ def _delete_testrunner_pod() -> None:
     """
     dev_config = load_config()
     corev1 = client.CoreV1Api()
-    ignore_if_doesnt_exist(
+    k8s_conditions.ignore_if_doesnt_exist(
         lambda: corev1.delete_namespaced_pod(TEST_RUNNER_NAME, dev_config.namespace)
     )
 
@@ -144,7 +140,7 @@ def create_test_runner_pod(test: str):
     corev1 = client.CoreV1Api()
     pod_body = _get_testrunner_pod_body(test)
 
-    if not wait_for_condition(
+    if not k8s_conditions.wait(
         lambda: corev1.list_namespaced_pod(
             dev_config.namespace, field_selector=f"metadata.name=={TEST_RUNNER_NAME}"
         ),
@@ -162,7 +158,7 @@ def create_test_runner_pod(test: str):
 
 def wait_for_pod_to_be_running(corev1, name, namespace):
     print("Waiting for pod to be running")
-    if not wait_for_condition(
+    if not k8s_conditions.wait(
         lambda: corev1.read_namespaced_pod(name, namespace),
         lambda pod: pod.status.phase == "Running",
         sleep_time=5,

scripts/dev/k8sutil.py renamed to scripts/dev/k8s_conditions.py

@@ -12,7 +12,7 @@ def _current_milliseconds() -> int:
     return int(round(time.time() * 1000))
 
 
-def wait_for_condition(
+def wait(
     fn,
     condition,
     exceptions_to_ignore=None,