Add cluster name for the mothership, small UI fixes
Related-PROD: K0RQA-20
Change-Id: Ia7c8a9e20fc28d0484a17ea4c8073193817e0f9f
diff --git a/cfg_checker/common/kube_utils.py b/cfg_checker/common/kube_utils.py
index 36efcaa..eb355ab 100644
--- a/cfg_checker/common/kube_utils.py
+++ b/cfg_checker/common/kube_utils.py
@@ -313,6 +313,17 @@
f"Failed to get the k0rdent release from the '{mgmt_name}' mgmt CRD: {e}")
return "Unknown"
+ def get_cluster_name_from_kube_config(self):
+ try:
+ with open(self.kConfigPath.split(":")[1], "r") as f:
+ config = yaml.safe_load(f)
+ clusters = config.get("clusters", [])
+ return clusters[0].get("name")
+ except Exception as e:
+ logger.warning(
+ f"Failed to get the cluster name from the loaded kubeconfig: {e}")
+ return ""
+
def get_node_info(self, http=False):
# Query API for the nodes and do some presorting
_nodes = {}
diff --git a/cfg_checker/modules/network/checker.py b/cfg_checker/modules/network/checker.py
index b212845..1ad8f99 100644
--- a/cfg_checker/modules/network/checker.py
+++ b/cfg_checker/modules/network/checker.py
@@ -112,6 +112,7 @@
_report(
{
"domain": self.mapper.domain,
+ "cluster_name": self.mapper.cluster['cluster_name'],
"nodes": self.mapper.nodes,
"map": self.mapper.map,
"k0rdent_release": self.mapper.cluster['k0rdent_release']
diff --git a/cfg_checker/nodes.py b/cfg_checker/nodes.py
index eb2ebd8..9b906d8 100644
--- a/cfg_checker/nodes.py
+++ b/cfg_checker/nodes.py
@@ -103,7 +103,8 @@
_info = {
'mcp_release': self.mcp_release,
'openstack_release': self.openstack_release,
- 'k0rdent_release': self.kube.get_k0rdent_release()
+ 'k0rdent_release': self.kube.get_k0rdent_release(),
+ 'cluster_name': self.kube.get_cluster_name_from_kube_config()
}
return _info