mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Clickable links in pods details for ServiceAccount, PriorityClass and RuntimeClass (#6352)
* Clickable links in pods details Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com> * Make linter happy Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com> * Use withInjectables Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com> * ServiceAccounts are namespaced Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com> * Revert legacy APIs Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com> * Make linter happy Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com> Signed-off-by: Piotr Roszatycki <piotr.roszatycki@gmail.com>
This commit is contained in:
parent
078bee4a37
commit
da91347121
@ -10,11 +10,11 @@ import kebabCase from "lodash/kebabCase";
|
|||||||
import { disposeOnUnmount, observer } from "mobx-react";
|
import { disposeOnUnmount, observer } from "mobx-react";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { observable, reaction, makeObservable } from "mobx";
|
import { observable, reaction, makeObservable } from "mobx";
|
||||||
import type { NodeApi } from "../../../common/k8s-api/endpoints";
|
|
||||||
import { Pod } 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 { DrawerItem, DrawerTitle } from "../drawer";
|
||||||
import { Badge } from "../badge";
|
import { Badge } from "../badge";
|
||||||
import { cssNames, toJS } from "../../utils";
|
import { cssNames, stopPropagation, toJS } from "../../utils";
|
||||||
import { PodDetailsContainer } from "./pod-details-container";
|
import { PodDetailsContainer } from "./pod-details-container";
|
||||||
import { PodDetailsAffinities } from "./pod-details-affinities";
|
import { PodDetailsAffinities } from "./pod-details-affinities";
|
||||||
import { PodDetailsTolerations } from "./pod-details-tolerations";
|
import { PodDetailsTolerations } from "./pod-details-tolerations";
|
||||||
@ -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 getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
|
||||||
import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
|
import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable";
|
||||||
import nodeApiInjectable from "../../../common/k8s-api/endpoints/node.api.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> {
|
export interface PodDetailsProps extends KubeObjectDetailsProps<Pod> {
|
||||||
}
|
}
|
||||||
@ -44,6 +47,9 @@ interface Dependencies {
|
|||||||
getActiveClusterEntity: GetActiveClusterEntity;
|
getActiveClusterEntity: GetActiveClusterEntity;
|
||||||
getDetailsUrl: GetDetailsUrl;
|
getDetailsUrl: GetDetailsUrl;
|
||||||
nodeApi: NodeApi;
|
nodeApi: NodeApi;
|
||||||
|
priorityClassApi: PriorityClassApi;
|
||||||
|
runtimeClassApi: RuntimeClassApi;
|
||||||
|
serviceAccountApi: ServiceAccountApi;
|
||||||
}
|
}
|
||||||
|
|
||||||
@observer
|
@observer
|
||||||
@ -94,6 +100,22 @@ class NonInjectedPodDetails extends React.Component<PodDetailsProps & Dependenci
|
|||||||
const initContainers = pod.getInitContainers();
|
const initContainers = pod.getInitContainers();
|
||||||
const containers = pod.getContainers();
|
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 (
|
return (
|
||||||
<div className="PodDetails">
|
<div className="PodDetails">
|
||||||
{!isMetricHidden && (
|
{!isMetricHidden && (
|
||||||
@ -130,16 +152,34 @@ class NonInjectedPodDetails extends React.Component<PodDetailsProps & Dependenci
|
|||||||
{podIPs.map(label => <Badge key={label} label={label} />)}
|
{podIPs.map(label => <Badge key={label} label={label} />)}
|
||||||
</DrawerItem>
|
</DrawerItem>
|
||||||
<DrawerItem name="Service Account">
|
<DrawerItem name="Service Account">
|
||||||
{pod.getServiceAccountName()}
|
<Link
|
||||||
|
key="link"
|
||||||
|
to={serviceAccountDetailsUrl}
|
||||||
|
onClick={stopPropagation}
|
||||||
|
>
|
||||||
|
{serviceAccountName}
|
||||||
|
</Link>
|
||||||
</DrawerItem>
|
</DrawerItem>
|
||||||
<DrawerItem name="Priority Class" hidden={pod.getPriorityClassName() === ""}>
|
<DrawerItem name="Priority Class" hidden={priorityClassName === ""}>
|
||||||
{pod.getPriorityClassName()}
|
<Link
|
||||||
|
key="link"
|
||||||
|
to={priorityClassDetailsUrl}
|
||||||
|
onClick={stopPropagation}
|
||||||
|
>
|
||||||
|
{priorityClassName}
|
||||||
|
</Link>
|
||||||
</DrawerItem>
|
</DrawerItem>
|
||||||
<DrawerItem name="QoS Class">
|
<DrawerItem name="QoS Class">
|
||||||
{pod.getQosClass()}
|
{pod.getQosClass()}
|
||||||
</DrawerItem>
|
</DrawerItem>
|
||||||
<DrawerItem name="Runtime Class" hidden={pod.getRuntimeClassName() === ""}>
|
<DrawerItem name="Runtime Class" hidden={runtimeClassName === ""}>
|
||||||
{pod.getRuntimeClassName()}
|
<Link
|
||||||
|
key="link"
|
||||||
|
to={runtimeClassDetailsUrl}
|
||||||
|
onClick={stopPropagation}
|
||||||
|
>
|
||||||
|
{runtimeClassName}
|
||||||
|
</Link>
|
||||||
</DrawerItem>
|
</DrawerItem>
|
||||||
|
|
||||||
<DrawerItem
|
<DrawerItem
|
||||||
@ -207,5 +247,8 @@ export const PodDetails = withInjectables<Dependencies, PodDetailsProps>(NonInje
|
|||||||
getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
|
getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
|
||||||
getDetailsUrl: di.inject(getDetailsUrlInjectable),
|
getDetailsUrl: di.inject(getDetailsUrlInjectable),
|
||||||
nodeApi: di.inject(nodeApiInjectable),
|
nodeApi: di.inject(nodeApiInjectable),
|
||||||
|
priorityClassApi: di.inject(priorityClassApiInjectable),
|
||||||
|
runtimeClassApi: di.inject(runtimeClassApiInjectable),
|
||||||
|
serviceAccountApi: di.inject(serviceAccountApiInjectable),
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user