github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

kubernetes: improved the node view [r8s-47] (#108)

release/2.24.0
Steven Kang 2024-11-12 09:42:14 +13:00 committed by GitHub
parent 08d77b4333
commit e6577ca269
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/react/kubernetes/cluster/HomeView/NodesDatatable/columns/conditions.tsx
View File

@ -14,7 +14,7 @@ export const conditions = columnHelper.accessor((row) => getConditions(row), {
Conditions
<Tooltip
position="top"
message="Green indicates the node is healthy. Orange indicates the node is experiencing MemoryPressure, DiskPressure, or PIDPressure."
message="Empty indicates the node is healthy. Orange indicates the node is experiencing MemoryPressure, DiskPressure, NetworkUnavailable or PIDPressure."
/>
</>
),
@ -45,9 +45,9 @@ function ConditionsCell({
function getConditions(node: NodeRowData) {
return (
// exclude the Ready condition as it is already being utilised in the Status column
// exclude the Ready condition and search for unhealthy conditions
node.status?.conditions?.filter(
(condition) => condition.type !== 'Ready'
(condition) => condition.type !== 'Ready' && condition.status === 'True'
) ?? []
);
}

6
app/react/kubernetes/cluster/HomeView/NodesDatatable/columns/status.tsx
View File

@ -36,7 +36,9 @@ function StatusCell({
function getStatus(node: NodeRowData) {
return (
node.status?.conditions?.find((condition) => condition.status === 'True')
?.type ?? 'Not ready'
// only look for the ready type to identify if the node is either ready or not ready
node.status?.conditions?.find(
(condition) => condition.status === 'True' && condition.type === 'Ready'
)?.type ?? 'Not Ready'
);
}