Skip to content

[release-4.21] CNV-90112: fix matched nodes count in NNCP detail view #232

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

Open
adamviktora wants to merge 1 commit into
base: release-4.21
Choose a base branch
from
+3 −17
Open

[release-4.21] CNV-90112: fix matched nodes count in NNCP detail view #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/views/policies/details/PolicyDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ import {
} from '@patternfly/react-core';

import PolicyEnactments from './PolicyEnactments';
import { getInterfaceToShow, getMatchedPolicyNodes } from './utils';
import { getInterfaceToShow } from './utils';
import { filterPolicyAppliedNodes } from '@utils/resources/policies/utils';

export type PolicyDetailsPageProps = {
obj?: V1NodeNetworkConfigurationPolicy;
Expand All @@ -35,7 +36,7 @@ const PolicyDetailsPage: FC<PolicyDetailsPageProps> = ({ obj: policy, iface }) =
namespaced: false,
});

const policyMatchedNodes = getMatchedPolicyNodes(policy, nodes);
const policyMatchedNodes = filterPolicyAppliedNodes(policy, nodes);
const interfaceToShow = getInterfaceToShow(policy, iface?.name);

const dnsResolver = policy?.spec?.desiredState?.['dns-resolver'];
Expand Down
15 changes: 0 additions & 15 deletions src/views/policies/details/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,7 @@
import { IoK8sApiCoreV1Node } from '@kubevirt-ui/kubevirt-api/kubernetes/models';
import {
NodeNetworkConfigurationInterface,
V1NodeNetworkConfigurationPolicy,
} from '@kubevirt-ui/kubevirt-api/nmstate';
import { isEmpty } from '@utils/helpers';

export const getMatchedPolicyNodes = (
policy: V1NodeNetworkConfigurationPolicy,
nodes: IoK8sApiCoreV1Node[],
) => {
if (isEmpty(policy.spec.nodeSelector)) return nodes;

return nodes.filter((node) =>
Object.entries(policy).every(
([labelKey, labelValue]) => node.metadata?.labels?.[labelKey] === labelValue,
),
);
};

export const getInterfaceToShow = (
policy: V1NodeNetworkConfigurationPolicy,
Expand Down