mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Fix crash on NetworkPolicy when matchLabels is missing (#4500)
This commit is contained in:
parent
637f26ae1e
commit
f6193718ff
@ -53,4 +53,19 @@ describe("NetworkPolicyDetails", () => {
|
|||||||
expect(await findByTestId(container, "egress-0")).toBeInstanceOf(HTMLElement);
|
expect(await findByTestId(container, "egress-0")).toBeInstanceOf(HTMLElement);
|
||||||
expect(await findByText(container, "foo: bar")).toBeInstanceOf(HTMLElement);
|
expect(await findByText(container, "foo: bar")).toBeInstanceOf(HTMLElement);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should not crash if egress nodeSelector doesn't have matchLabels", async () => {
|
||||||
|
const spec: NetworkPolicySpec = {
|
||||||
|
egress: [{
|
||||||
|
to: [{
|
||||||
|
namespaceSelector: {},
|
||||||
|
}],
|
||||||
|
}],
|
||||||
|
podSelector: {},
|
||||||
|
};
|
||||||
|
const policy = new NetworkPolicy({ metadata: {} as any, spec } as any);
|
||||||
|
const { container } = render(<NetworkPolicyDetails object={policy} />);
|
||||||
|
|
||||||
|
expect(container).toBeInstanceOf(HTMLElement);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@ -29,4 +29,13 @@
|
|||||||
padding-bottom: 16px;
|
padding-bottom: 16px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ul.policySelectorList {
|
||||||
|
list-style: disc;
|
||||||
|
}
|
||||||
|
|
||||||
|
.policySelectorList ul {
|
||||||
|
list-style: circle;
|
||||||
|
list-style-position: inside;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,13 +23,15 @@ import styles from "./network-policy-details.module.css";
|
|||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { DrawerItem, DrawerTitle } from "../drawer";
|
import { DrawerItem, DrawerTitle } from "../drawer";
|
||||||
import { IPolicyIpBlock, IPolicySelector, NetworkPolicy, NetworkPolicyPeer, NetworkPolicyPort } from "../../../common/k8s-api/endpoints/network-policy.api";
|
import { IPolicyIpBlock, NetworkPolicy, NetworkPolicyPeer, NetworkPolicyPort } from "../../../common/k8s-api/endpoints/network-policy.api";
|
||||||
import { Badge } from "../badge";
|
import { Badge } from "../badge";
|
||||||
import { SubTitle } from "../layout/sub-title";
|
import { SubTitle } from "../layout/sub-title";
|
||||||
import { observer } from "mobx-react";
|
import { observer } from "mobx-react";
|
||||||
import type { KubeObjectDetailsProps } from "../kube-object-details";
|
import type { KubeObjectDetailsProps } from "../kube-object-details";
|
||||||
import { KubeObjectMeta } from "../kube-object-meta";
|
import { KubeObjectMeta } from "../kube-object-meta";
|
||||||
import logger from "../../../common/logger";
|
import logger from "../../../common/logger";
|
||||||
|
import type { LabelMatchExpression, LabelSelector } from "../../../common/k8s-api/kube-object";
|
||||||
|
import { isEmpty } from "lodash";
|
||||||
|
|
||||||
interface Props extends KubeObjectDetailsProps<NetworkPolicy> {
|
interface Props extends KubeObjectDetailsProps<NetworkPolicy> {
|
||||||
}
|
}
|
||||||
@ -60,20 +62,57 @@ export class NetworkPolicyDetails extends React.Component<Props> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
renderIPolicySelector(name: string, selector: IPolicySelector | undefined) {
|
renderMatchLabels(matchLabels: Record<string, string | undefined> | undefined) {
|
||||||
|
if (!matchLabels) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Object.entries(matchLabels)
|
||||||
|
.map(([key, value]) => <li key={key}>{key}: {value}</li>);
|
||||||
|
}
|
||||||
|
|
||||||
|
renderMatchExpressions(matchExpressions: LabelMatchExpression[] | undefined) {
|
||||||
|
if (!matchExpressions) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return matchExpressions.map(expr => {
|
||||||
|
switch (expr.operator) {
|
||||||
|
case "DoesNotExist":
|
||||||
|
case "Exists":
|
||||||
|
return <li key={expr.key}>{expr.key} ({expr.operator})</li>;
|
||||||
|
case "In":
|
||||||
|
case "NotIn":
|
||||||
|
return (
|
||||||
|
<li key={expr.key}>
|
||||||
|
{expr.key}({expr.operator})
|
||||||
|
<ul>
|
||||||
|
{expr.values.map((value, index) => <li key={index}>{value}</li>)}
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
renderIPolicySelector(name: string, selector: LabelSelector | undefined) {
|
||||||
if (!selector) {
|
if (!selector) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const { matchLabels, matchExpressions } = selector;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DrawerItem name={name}>
|
<DrawerItem name={name}>
|
||||||
|
<ul className={styles.policySelectorList}>
|
||||||
|
{this.renderMatchLabels(matchLabels)}
|
||||||
|
{this.renderMatchExpressions(matchExpressions)}
|
||||||
{
|
{
|
||||||
Object
|
(isEmpty(matchLabels) && isEmpty(matchExpressions)) && (
|
||||||
.entries(selector.matchLabels)
|
<li>(empty)</li>
|
||||||
.map(data => data.join(": "))
|
)
|
||||||
.join(", ")
|
|
||||||
|| "(empty)"
|
|
||||||
}
|
}
|
||||||
|
</ul>
|
||||||
</DrawerItem>
|
</DrawerItem>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user