From 85b5041bfa264e5b8c6272aa4669d3b7f42c0f7f Mon Sep 17 00:00:00 2001 From: Thomas Achatz Date: Mon, 6 Nov 2023 13:52:36 +0100 Subject: [PATCH] fixup! Add `nodepool` to the CRD --- crate/operator/create.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/crate/operator/create.py b/crate/operator/create.py index 92cc8d48..786f8e48 100644 --- a/crate/operator/create.py +++ b/crate/operator/create.py @@ -1117,19 +1117,7 @@ async def create_system_user( def is_shared_resources_cluster(node_spec: Dict[str, Any]) -> bool: - try: - cpu_request = node_spec["resources"].get("requests", {}).get("cpu") - cpu_limit = node_spec["resources"].get("limits", {}).get("cpu") - memory_request = node_spec["resources"].get("requests", {}).get("memory") - memory_limit = node_spec["resources"].get("limits", {}).get("memory") - nodepool = node_spec.get("nodepool") - if not (cpu_request or memory_request): - return False - return ( - cpu_request != cpu_limit or memory_request != memory_limit - ) and nodepool == Nodepool.SHARED - except KeyError: - return False + return node_spec.get("nodepool") == Nodepool.SHARED def get_cluster_resource_requests(