Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 92 additions & 56 deletions frontend/src/components/pod/Details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,97 @@ export default function PodDetails(props: PodDetailsProps) {
const [isAttached, setIsAttached] = React.useState(false);
const dispatchHeadlampEvent = useEventCallback();

function prepareExtraInfo(item: Pod | null) {
let extraInfo: {
name: string;
value: React.ReactNode;
hideLabel?: boolean;
}[] = [];
if (item) {
extraInfo = [
{
name: t('State'),
value: makePodStatusLabel(item, false),
},
{
name: t('Node'),
value: item.spec.nodeName ? (
<Link
routeName="node"
params={{ name: item.spec.nodeName }}
activeCluster={item.cluster}
>
{item.spec.nodeName}
</Link>
) : (
''
),
},
{
name: t('Service Account'),
value:
!!item.spec.serviceAccountName || !!item.spec.serviceAccount ? (
<Link
routeName="serviceAccount"
params={{
namespace: item.metadata.namespace,
name: item.spec.serviceAccountName || item.spec.serviceAccount,
}}
activeCluster={item.cluster}
>
{item.spec.serviceAccountName || item.spec.serviceAccount}
</Link>
) : (
''
),
},
// Show Host IP only if Host IPs doesn't exist or is empty
...(item.status.hostIPs && item.status.hostIPs.length > 0
? []
: [
{
name: t('Host IP'),
value: item.status.hostIP ?? '',
},
]),
// Always include Host IPs, but hide if empty
{
name: t('Host IPs'),
value: item.status.hostIPs
? item.status.hostIPs.map((ipObj: { ip: string }) => ipObj.ip).join(', ')
: '',
hideLabel: !item.status.hostIPs || item.status.hostIPs.length === 0,
},
// Show Pod IP only if Pod IPs doesn't exist or is empty
...(item.status.podIPs && item.status.podIPs.length > 0
? []
: [
{
name: t('Pod IP'),
value: item.status.podIP ?? '',
},
]),
// Always include Pod IPs, but hide if empty
{
name: t('Pod IPs'),
value: item.status.podIPs
? item.status.podIPs.map((ipObj: { ip: string }) => ipObj.ip).join(', ')
: '',
hideLabel: !item.status.podIPs || item.status.podIPs.length === 0,
},
{
name: t('QoS Class'),
value: item.status.qosClass,
},
{
name: t('Priority'),
value: item.spec.priority,
},
];
}
return extraInfo;
}

return (
<DetailsGrid
resourceType={Pod}
Expand Down Expand Up @@ -566,62 +657,7 @@ export default function PodDetails(props: PodDetailsProps) {
},
]
}
extraInfo={item =>
item && [
{
name: t('State'),
value: makePodStatusLabel(item, false),
},
{
name: t('Node'),
value: item.spec.nodeName ? (
<Link
routeName="node"
params={{ name: item.spec.nodeName }}
activeCluster={item.cluster}
>
{item.spec.nodeName}
</Link>
) : (
''
),
},
{
name: t('Service Account'),
value:
!!item.spec.serviceAccountName || !!item.spec.serviceAccount ? (
<Link
routeName="serviceAccount"
params={{
namespace: item.metadata.namespace,
name: item.spec.serviceAccountName || item.spec.serviceAccount,
}}
activeCluster={item.cluster}
>
{item.spec.serviceAccountName || item.spec.serviceAccount}
</Link>
) : (
''
),
},
{
name: t('Host IP'),
value: item.status.hostIP ?? '',
},
{
name: t('Pod IP'),
value: item.status.podIP ?? '',
},
{
name: t('QoS Class'),
value: item.status.qosClass,
},
{
name: t('Priority'),
value: item.spec.priority,
},
]
}
extraInfo={item => prepareExtraInfo(item)}
extraSections={item =>
item && [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,19 @@
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Pod IP
Host IPs
</dt>
<dd
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 css-e06lsu-MuiTypography-root"
/>
</dd>
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Pod IPs
</dt>
<dd
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,19 @@
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Pod IP
Host IPs
</dt>
<dd
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 css-e06lsu-MuiTypography-root"
/>
</dd>
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Pod IPs
</dt>
<dd
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,19 @@
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Pod IP
Host IPs
</dt>
<dd
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 css-e06lsu-MuiTypography-root"
/>
</dd>
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Pod IPs
</dt>
<dd
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,19 @@
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Pod IP
Host IPs
</dt>
<dd
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 css-e06lsu-MuiTypography-root"
/>
</dd>
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Pod IPs
</dt>
<dd
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,19 @@
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Pod IP
Host IPs
</dt>
<dd
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 css-e06lsu-MuiTypography-root"
/>
</dd>
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Pod IPs
</dt>
<dd
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,18 @@
class="MuiTypography-root MuiTypography-body1 css-e06lsu-MuiTypography-root"
/>
</dd>
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Host IPs
</dt>
<dd
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 css-e06lsu-MuiTypography-root"
/>
</dd>
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Expand All @@ -288,6 +300,18 @@
class="MuiTypography-root MuiTypography-body1 css-e06lsu-MuiTypography-root"
/>
</dd>
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Pod IPs
</dt>
<dd
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-8 css-deb4a-MuiGrid-root"
>
<span
class="MuiTypography-root MuiTypography-body1 css-e06lsu-MuiTypography-root"
/>
</dd>
<dt
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-sm-4 css-1iczkge-MuiGrid-root"
>
Expand Down
Loading
Loading