Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clickable links in pods details for ServiceAccount, PriorityClass and RuntimeClass #6352

Merged
merged 6 commits into from Oct 11, 2022
Merged

Clickable links in pods details for ServiceAccount, PriorityClass and RuntimeClass #6352

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0cacdbe
Clickable links in pods details
dex4er Oct 7, 2022
253ef2d
Make linter happy
dex4er Oct 7, 2022
6161070
Use withInjectables
dex4er Oct 9, 2022
53390c1
ServiceAccounts are namespaced
dex4er Oct 9, 2022
93960e4
Revert legacy APIs
dex4er Oct 9, 2022
371c4ba
Make linter happy
dex4er Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 50 additions & 7 deletions src/renderer/components/+workloads-pods/pod-details.tsx
View file
Open in desktop
Expand Up @@ -10,11 +10,11 @@ import kebabCase from "lodash/kebabCase";
import { disposeOnUnmount, observer } from "mobx-react";
import { Link } from "react-router-dom";
import { observable, reaction, makeObservable } from "mobx";
import type { NodeApi } from "../../../common/k8s-api/endpoints";
import { Pod } from "../../../common/k8s-api/endpoints";
import type { NodeApi, PriorityClassApi, RuntimeClassApi, ServiceAccountApi } from "../../../common/k8s-api/endpoints";
import { DrawerItem, DrawerTitle } from "../drawer";
import { Badge } from "../badge";
import { cssNames, toJS } from "../../utils";
import { cssNames, stopPropagation, toJS } from "../../utils";
import { PodDetailsContainer } from "./pod-details-container";
import { PodDetailsAffinities } from "./pod-details-affinities";
import { PodDetailsTolerations } from "./pod-details-tolerations";
Expand All @@ -35,6 +35,9 @@ import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.inject
import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
import nodeApiInjectable from "../../../common/k8s-api/endpoints/node.api.injectable";
import runtimeClassApiInjectable from "../../../common/k8s-api/endpoints/runtime-class.api.injectable";
import serviceAccountApiInjectable from "../../../common/k8s-api/endpoints/service-account.api.injectable";
import priorityClassApiInjectable from "../../../common/k8s-api/endpoints/priority-class.api.injectable";

export interface PodDetailsProps extends KubeObjectDetailsProps<Pod> {
}
Expand All @@ -44,6 +47,9 @@ interface Dependencies {
getActiveClusterEntity: GetActiveClusterEntity;
getDetailsUrl: GetDetailsUrl;
nodeApi: NodeApi;
priorityClassApi: PriorityClassApi;
runtimeClassApi: RuntimeClassApi;
serviceAccountApi: ServiceAccountApi;
}

@observer
Expand Down Expand Up @@ -94,6 +100,22 @@ class NonInjectedPodDetails extends React.Component<PodDetailsProps & Dependenci
const initContainers = pod.getInitContainers();
const containers = pod.getContainers();

const namespace = pod.getNs();
const priorityClassName = pod.getPriorityClassName();
const runtimeClassName = pod.getRuntimeClassName();
const serviceAccountName = pod.getServiceAccountName();

const priorityClassDetailsUrl = getDetailsUrl(this.props.priorityClassApi.getUrl({
name: priorityClassName,
}));
const runtimeClassDetailsUrl = getDetailsUrl(this.props.runtimeClassApi.getUrl({
name: runtimeClassName,
}));
const serviceAccountDetailsUrl = getDetailsUrl(this.props.serviceAccountApi.getUrl({
name: serviceAccountName,
namespace,
}));

return (
<div className="PodDetails">
{!isMetricHidden && (
Expand Down Expand Up @@ -130,16 +152,34 @@ class NonInjectedPodDetails extends React.Component<PodDetailsProps & Dependenci
{podIPs.map(label => <Badge key={label} label={label} />)}
</DrawerItem>
<DrawerItem name="Service Account">
{pod.getServiceAccountName()}
<Link
key="link"
to={serviceAccountDetailsUrl}
onClick={stopPropagation}
>
{serviceAccountName}
</Link>
</DrawerItem>
<DrawerItem name="Priority Class" hidden={pod.getPriorityClassName() === ""}>
{pod.getPriorityClassName()}
<DrawerItem name="Priority Class" hidden={priorityClassName === ""}>
<Link
key="link"
to={priorityClassDetailsUrl}
onClick={stopPropagation}
>
{priorityClassName}
</Link>
</DrawerItem>
<DrawerItem name="QoS Class">
{pod.getQosClass()}
</DrawerItem>
<DrawerItem name="Runtime Class" hidden={pod.getRuntimeClassName() === ""}>
{pod.getRuntimeClassName()}
<DrawerItem name="Runtime Class" hidden={runtimeClassName === ""}>
<Link
key="link"
to={runtimeClassDetailsUrl}
onClick={stopPropagation}
>
{runtimeClassName}
</Link>
</DrawerItem>

<DrawerItem
Expand Down Expand Up @@ -207,5 +247,8 @@ export const PodDetails = withInjectables<Dependencies, PodDetailsProps>(NonInje
getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
getDetailsUrl: di.inject(getDetailsUrlInjectable),
nodeApi: di.inject(nodeApiInjectable),
priorityClassApi: di.inject(priorityClassApiInjectable),
runtimeClassApi: di.inject(runtimeClassApiInjectable),
serviceAccountApi: di.inject(serviceAccountApiInjectable),
}),
});