hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix: load pods from all namespaces in node details (#6794)

Browse Source 
* Load pods from all namespaces in Node details

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* Lint fixes

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Alex Andreev 2022-12-20 16:34:43 +03:00 committed by Sebastian Malton
parent e5dada72e7
commit 4377cd8102
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/renderer/components/+nodes/details.tsx
View File

@ -21,7 +21,7 @@ import { KubeObjectMeta } from "../kube-object-meta";
import { ClusterMetricsResourceType } from "../../../common/cluster-types"; import { ClusterMetricsResourceType } from "../../../common/cluster-types";
import { NodeDetailsResources } from "./details-resources"; import { NodeDetailsResources } from "./details-resources";
import { DrawerTitle } from "../drawer/drawer-title"; import { DrawerTitle } from "../drawer/drawer-title";
import logger from "../../../common/logger"; import type { Logger } from "../../../common/logger";
import { withInjectables } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react";
import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api"; import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api";
import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable"; import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
@ -31,6 +31,8 @@ import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active
import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable"; import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable";
import type { ClusterMetricData, RequestClusterMetricsByNodeNames } from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable"; import type { ClusterMetricData, RequestClusterMetricsByNodeNames } from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable";
import requestClusterMetricsByNodeNamesInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable"; import requestClusterMetricsByNodeNamesInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable";
import loggerInjectable from "../../../common/logger.injectable";
import loadPodsFromAllNamespacesInjectable from "../+workloads-pods/load-pods-from-all-namespaces.injectable";
export interface NodeDetailsProps extends KubeObjectDetailsProps<Node> { export interface NodeDetailsProps extends KubeObjectDetailsProps<Node> {
} }
@ -40,6 +42,8 @@ interface Dependencies {
podStore: PodStore; podStore: PodStore;
getActiveClusterEntity: GetActiveClusterEntity; getActiveClusterEntity: GetActiveClusterEntity;
requestClusterMetricsByNodeNames: RequestClusterMetricsByNodeNames; requestClusterMetricsByNodeNames: RequestClusterMetricsByNodeNames;
logger: Logger;
loadPodsFromAllNamespaces: () => void;
} }
@observer @observer
@ -61,6 +65,8 @@ class NonInjectedNodeDetails extends React.Component<NodeDetailsProps & Dependen
this.props.podStore, this.props.podStore,
]), ]),
]); ]);
this.props.loadPodsFromAllNamespaces();
} }
loadMetrics = async () => { loadMetrics = async () => {
@ -77,7 +83,7 @@ class NonInjectedNodeDetails extends React.Component<NodeDetailsProps & Dependen
} }
if (!(node instanceof Node)) { if (!(node instanceof Node)) {
logger.error("[NodeDetails]: passed object that is not an instanceof Node", node); this.props.logger.error("[NodeDetails]: passed object that is not an instanceof Node", node);
return null; return null;
} }
@ -199,6 +205,8 @@ export const NodeDetails = withInjectables<Dependencies, NodeDetailsProps>(NonIn
podStore: di.inject(podStoreInjectable), podStore: di.inject(podStoreInjectable),
getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable), getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable),
requestClusterMetricsByNodeNames: di.inject(requestClusterMetricsByNodeNamesInjectable), requestClusterMetricsByNodeNames: di.inject(requestClusterMetricsByNodeNamesInjectable),
logger: di.inject(loggerInjectable),
loadPodsFromAllNamespaces: di.inject(loadPodsFromAllNamespacesInjectable),
}), }),
}); });

28
src/renderer/components/+workloads-pods/load-pods-from-all-namespaces.injectable.ts Normal file
View File

@ -0,0 +1,28 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import namespaceStoreInjectable from "../+namespaces/store.injectable";
import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable";
import podStoreInjectable from "./store.injectable";
const loadPodsFromAllNamespacesInjectable = getInjectable({
id: "load-pods-from-all-namespaces",
instantiate: (di) => {
const podStore = di.inject(podStoreInjectable);
const namespaceStore = di.inject(namespaceStoreInjectable);
const showErrorNotification = di.inject(showErrorNotificationInjectable);
return () => {
podStore.loadAll({
namespaces: [...namespaceStore.getItems().map(ns => ns.getName())],
onLoadFailure: error =>
showErrorNotification(`Can not load Pods. ${String(error)}`),
});
};
},
});
export default loadPodsFromAllNamespacesInjectable;