From 092ac307eda56f93bb06b6bef33d7cfc50ea87ba Mon Sep 17 00:00:00 2001
From: Aleksandr Tcitlionok <803797+terghalin@users.noreply.github.com>
Date: Thu, 5 Dec 2024 07:00:03 +0000
Subject: [PATCH] fix(k8s): serialization

---
 app/routes/k8s.py | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/routes/k8s.py b/app/routes/k8s.py
index b68b9c4..945f157 100644
--- a/app/routes/k8s.py
+++ b/app/routes/k8s.py
@@ -5,11 +5,11 @@ import math
 router = APIRouter()
 
 def fetch_k8s_data_with_usage():
-    config.load_incluster_config()
+    config.load_incluster_config()  # Use in-cluster configuration
     v1 = client.CoreV1Api()
     metrics_client = client.CustomObjectsApi()
 
-    # Fetch nodes and namespaces
+    # Fetch nodes
     nodes = [{
         "node_name": node.metadata.name,
         "cpu": node.status.capacity.get("cpu"),
@@ -17,12 +17,13 @@ def fetch_k8s_data_with_usage():
         "pods_allocatable": node.status.allocatable.get("pods"),
     } for node in v1.list_node().items]
 
+    # Fetch namespaces
     namespaces = [ns.metadata.name for ns in v1.list_namespace().items]
 
     # Fetch pod metrics and calculate namespace resource usage
     namespace_usage = {}
-    pod_metrics = metrics_client.list_namespaced_custom_object(
-        group="metrics.k8s.io", version="v1beta1", namespace="", plural="pods"
+    pod_metrics = metrics_client.list_cluster_custom_object(
+        group="metrics.k8s.io", version="v1beta1", plural="pods"
     )
     for pod in pod_metrics["items"]:
         pod_namespace = pod["metadata"]["namespace"]
@@ -37,14 +38,24 @@ def fetch_k8s_data_with_usage():
             namespace_usage[pod_namespace]["cpu"] += convert_cpu_to_millicores(cpu_usage)
             namespace_usage[pod_namespace]["memory"] += convert_memory_to_mib(memory_usage)
 
+    # Convert usage to serializable types
+    namespace_usage = {
+        ns: {
+            "cpu": round(usage["cpu"], 2),  # Round to 2 decimal places for readability
+            "memory": round(usage["memory"], 2),
+        }
+        for ns, usage in namespace_usage.items()
+    }
+
     return {"nodes": nodes, "namespaces": namespaces, "namespace_usage": namespace_usage}
 
+
 def convert_cpu_to_millicores(cpu):
     if "n" in cpu:
         return int(cpu.replace("n", "")) / 1e6
     elif "m" in cpu:
         return int(cpu.replace("m", ""))
-    return int(cpu) * 1000
+    return float(cpu) * 1000  # Use float to ensure compatibility
 
 def convert_memory_to_mib(memory):
     if "Ki" in memory:
@@ -53,7 +64,7 @@ def convert_memory_to_mib(memory):
         return int(memory.replace("Mi", ""))
     elif "Gi" in memory:
         return int(memory.replace("Gi", "")) * 1024
-    return int(memory)
+    return float(memory)
 
 @router.get("/k8s/data")
 def get_k8s_data():