update orchestratord tests for blancerd and console replicas

Author: alex-hunt-materialize

misc/helm-charts/operator/values.yaml

@@ -13,7 +13,7 @@ operator:
     # -- The Docker repository for the operator image
     repository: materialize/orchestratord
     # -- The tag/version of the operator image to be used
-    tag: v0.158.0
+    tag: v0.159.0-dev.0--pr.g1be406dc1fc56a0568365ca0b58042d88970b125
     # -- Policy for pulling the image: "IfNotPresent" avoids unnecessary re-pulling of images
     pullPolicy: IfNotPresent
 

test/orchestratord/mzcompose.py

@@ -49,57 +49,46 @@ def get_tag(tag: str | None) -> str:
     return tag
 
 
-def get_orchestratord_data() -> dict[str, Any]:
+def get_pod_data(labels: dict[str, str], namespace="materialize-environment") -> dict[str, Any]:
     return json.loads(
         spawn.capture(
             [
                 "kubectl",
                 "get",
                 "pod",
                 "-l",
-                "app.kubernetes.io/instance=operator",
+                ",".join(f"{key}={value}" for key, value in labels.items()),
                 "-n",
-                "materialize",
+                namespace,
                 "-o",
                 "json",
             ]
         )
     )
 
 
+def get_orchestratord_data() -> dict[str, Any]:
+    return get_pod_data(
+        labels={"app.kubernetes.io/instance": "operator"},
+        namespace="materialize",
+    )
+
+
 def get_balancerd_data() -> dict[str, Any]:
-    return json.loads(
-        spawn.capture(
-            [
-                "kubectl",
-                "get",
-                "pod",
-                "-l",
-                "app=balancerd",
-                "-n",
-                "materialize-environment",
-                "-o",
-                "json",
-            ]
-        )
+    return get_pod_data(
+        labels={"materialize.cloud/app": "balancerd"},
+    )
+
+
+def get_console_data() -> dict[str, Any]:
+    return get_pod_data(
+        labels={"materialize.cloud/app": "console"},
     )
 
 
 def get_environmentd_data() -> dict[str, Any]:
-    return json.loads(
-        spawn.capture(
-            [
-                "kubectl",
-                "get",
-                "pod",
-                "-l",
-                "app=environmentd",
-                "-n",
-                "materialize-environment",
-                "-o",
-                "json",
-            ]
-        )
+    return get_pod_data(
+        labels={"materialize.cloud/app": "environmentd"},
     )
 
 
@@ -515,6 +504,53 @@ def validate(self, mods: dict[type[Modification], Any]) -> None:
             ), f"Expected no {expected} in environmentd args, but found it: {args}"
 
 
+class BalancerdReplicas(Modification):
+    @classmethod
+    def values(cls) -> list[Any]:
+        return [None, 1, 2]
+
+    @classmethod
+    def default(cls) -> Any:
+        return None
+
+    def modify(self, definition: dict[str, Any]) -> None:
+        if self.value is not None:
+            definition["materialize"]["spec"]["balancerdReplicas"] = self.value
+
+    def validate(self, mods: dict[type[Modification], Any]) -> None:
+        def check_replicas():
+            balancerd = get_balancerd_data()
+            num_pods = len(balancerd["items"])
+            expected = self.value if self.value is not None else 2
+            assert  num_pods == expected, f"Expected {expected} balancerd pods, but found {num_pods}"
+
+        retry(check_replicas, 5)
+
+
+class ConsoleReplicas(Modification):
+    @classmethod
+    def values(cls) -> list[Any]:
+        return [None, 1, 2]
+
+    @classmethod
+    def default(cls) -> Any:
+        return None
+
+    def modify(self, definition: dict[str, Any]) -> None:
+        if self.value is not None:
+            definition["materialize"]["spec"]["consoleReplicas"] = self.value
+
+    def validate(self, mods: dict[type[Modification], Any]) -> None:
+        def check_replicas():
+            console = get_console_data()
+            num_pods = len(console["items"])
+            expected = self.value if self.value is not None else 2
+            assert  num_pods == expected, f"Expected {expected} console pods, but found {num_pods}"
+
+        # console doesn't get launched until last
+        retry(check_replicas, 120)
+
+
 def validate_cluster_replica_size(
     size: dict[str, Any], swap_enabled: bool, storage_class_name_set: bool
 ):
@@ -558,24 +594,6 @@ def validate_container_resources(
         assert resources["requests"]["memory"] == resources["limits"]["memory"]
 
 
-def get_pod_data(labels: dict[str, str]) -> dict[str, Any]:
-    return json.loads(
-        spawn.capture(
-            [
-                "kubectl",
-                "get",
-                "pod",
-                "-l",
-                ",".join(f"{key}={value}" for key, value in labels.items()),
-                "-n",
-                "materialize-environment",
-                "-o",
-                "json",
-            ]
-        )
-    )
-
-
 class SwapEnabledGlobal(Modification):
     @classmethod
     def values(cls) -> list[Any]: