fix(k8s): use ephemeral
This commit is contained in:
@@ -87,20 +87,20 @@ def display_kubernetes_nodes():
|
||||
table.add_column("Node Name", style="white")
|
||||
table.add_column("CPU", justify="right", style="yellow")
|
||||
table.add_column("Memory (MiB)", justify="right", style="cyan")
|
||||
table.add_column("Storage", style="green")
|
||||
table.add_column("Instance Type", style="blue")
|
||||
table.add_column("Storage (GB)", justify="right", style="green")
|
||||
table.add_column("Instance Type", style="white")
|
||||
table.add_column("Pods Allocatable", justify="right", style="magenta")
|
||||
|
||||
nodes = v1.list_node()
|
||||
for node in nodes.items:
|
||||
storage = node.metadata.annotations.get("node.kubernetes.io/storage", "N/A")
|
||||
ephemeral_storage = node.status.capacity.get("ephemeral-storage", "0")
|
||||
instance_type = node.metadata.labels.get("beta.kubernetes.io/instance-type", "N/A")
|
||||
|
||||
table.add_row(
|
||||
node.metadata.name,
|
||||
node.status.capacity.get("cpu"),
|
||||
f"{round(convert_memory_to_mib(node.status.capacity.get('memory')), 2)}",
|
||||
storage,
|
||||
f"{round(convert_memory_to_gb(ephemeral_storage), 2)}",
|
||||
instance_type,
|
||||
node.status.allocatable.get("pods")
|
||||
)
|
||||
|
||||
@@ -42,12 +42,20 @@ def fetch_k8s_data_with_usage():
|
||||
metrics_client = client.CustomObjectsApi()
|
||||
|
||||
# Fetch nodes
|
||||
nodes = [{
|
||||
"node_name": node.metadata.name,
|
||||
"cpu": node.status.capacity.get("cpu"),
|
||||
"memory": round(convert_memory_to_mib(node.status.capacity.get("memory")), 2), # Convert to MiB
|
||||
"pods_allocatable": node.status.allocatable.get("pods"),
|
||||
} for node in v1.list_node().items]
|
||||
nodes = []
|
||||
for node in v1.list_node().items:
|
||||
# Extract storage (ephemeral-storage) and instance type
|
||||
ephemeral_storage = node.status.capacity.get("ephemeral-storage", "0")
|
||||
instance_type = node.metadata.labels.get("beta.kubernetes.io/instance-type", "N/A")
|
||||
|
||||
nodes.append({
|
||||
"node_name": node.metadata.name,
|
||||
"cpu": node.status.capacity.get("cpu"),
|
||||
"memory": round(convert_memory_to_mib(node.status.capacity.get("memory")), 2), # Convert to MiB
|
||||
"storage": f"{round(convert_memory_to_gb(ephemeral_storage), 2)} GB",
|
||||
"instance_type": instance_type,
|
||||
"pods_allocatable": node.status.allocatable.get("pods"),
|
||||
})
|
||||
|
||||
# Fetch namespaces
|
||||
namespaces = [ns.metadata.name for ns in v1.list_namespace().items]
|
||||
@@ -82,6 +90,18 @@ def fetch_k8s_data_with_usage():
|
||||
return {"nodes": nodes, "namespaces": namespaces, "namespace_usage": namespace_usage}
|
||||
|
||||
|
||||
def convert_memory_to_gb(memory):
|
||||
"""
|
||||
Convert memory to GB (gigabytes) for ephemeral-storage.
|
||||
"""
|
||||
if "Ki" in memory:
|
||||
return int(memory.replace("Ki", "")) / (1024 ** 2)
|
||||
elif "Mi" in memory:
|
||||
return int(memory.replace("Mi", "")) / 1024
|
||||
elif "Gi" in memory:
|
||||
return int(memory.replace("Gi", ""))
|
||||
return float(memory)
|
||||
|
||||
# Export endpoint
|
||||
@router.get("/export")
|
||||
def export_data(format: str = "yaml"):
|
||||
|
||||
@@ -11,15 +11,15 @@ def fetch_k8s_data_with_usage():
|
||||
# Fetch nodes
|
||||
nodes = []
|
||||
for node in v1.list_node().items:
|
||||
# Extract storage and instance type from labels or annotations
|
||||
storage = node.metadata.annotations.get("node.kubernetes.io/storage", "N/A")
|
||||
# Extract storage (ephemeral-storage) and instance type
|
||||
ephemeral_storage = node.status.capacity.get("ephemeral-storage", "0")
|
||||
instance_type = node.metadata.labels.get("beta.kubernetes.io/instance-type", "N/A")
|
||||
|
||||
nodes.append({
|
||||
"node_name": node.metadata.name,
|
||||
"cpu": node.status.capacity.get("cpu"),
|
||||
"memory": round(convert_memory_to_mib(node.status.capacity.get("memory")), 2), # Convert to MiB
|
||||
"storage": storage,
|
||||
"storage": f"{round(convert_memory_to_gb(ephemeral_storage), 2)} GB",
|
||||
"instance_type": instance_type,
|
||||
"pods_allocatable": node.status.allocatable.get("pods"),
|
||||
})
|
||||
@@ -57,6 +57,18 @@ def fetch_k8s_data_with_usage():
|
||||
return {"nodes": nodes, "namespaces": namespaces, "namespace_usage": namespace_usage}
|
||||
|
||||
|
||||
def convert_memory_to_gb(memory):
|
||||
"""
|
||||
Convert memory to GB (gigabytes) for ephemeral-storage.
|
||||
"""
|
||||
if "Ki" in memory:
|
||||
return int(memory.replace("Ki", "")) / (1024 ** 2)
|
||||
elif "Mi" in memory:
|
||||
return int(memory.replace("Mi", "")) / 1024
|
||||
elif "Gi" in memory:
|
||||
return int(memory.replace("Gi", ""))
|
||||
return float(memory)
|
||||
|
||||
def convert_cpu_to_cores(cpu):
|
||||
if "n" in cpu:
|
||||
return round(int(cpu.replace("n", "")) / 1e9, 4)
|
||||
|
||||
Reference in New Issue
Block a user