Skip to content

MGMT-22116: Add info about apiVIPs and ingressVIPs for dual-stack in Review and Create page #3250

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

Merged
openshift-merge-bot merged 2 commits into from
Nov 7, 2025
Merged

MGMT-22116: Add info about apiVIPs and ingressVIPs for dual-stack in Review and Create page #3250

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0df3ace
Add info about apiVIPs and ingressVIPs for dual-stack in Review and C…
ammont82 Nov 6, 2025
225d18a
Fixing review comments
ammont82 Nov 7, 2025
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
4 changes: 1 addition & 3 deletions libs/ui-lib/lib/common/components/clusterConfiguration/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,7 @@ export const isDualStack = ({
clusterNetworks,
serviceNetworks,
openshiftVersion,
}: Pick<Cluster, 'machineNetworks' | 'clusterNetworks' | 'serviceNetworks'> & {
openshiftVersion?: string;
}) =>
}: Pick<Cluster, 'machineNetworks' | 'clusterNetworks' | 'serviceNetworks' | 'openshiftVersion'>) =>
areNetworksDualStack(machineNetworks, openshiftVersion) &&
areNetworksDualStack(clusterNetworks, openshiftVersion) &&
areNetworksDualStack(serviceNetworks, openshiftVersion);
Expand Down
2 changes: 1 addition & 1 deletion ...cm/components/clusterConfiguration/networkConfiguration/networkConfigurationValidation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const getNetworkInitialValues = (
isClusterManagedNetworkingUnsupported: boolean,
): NetworkConfigurationValues => {
const isSNOCluster = isSNO(cluster);
const isDualStackType = isDualStack({ ...cluster, openshiftVersion: cluster.openshiftVersion });
const isDualStackType = isDualStack({ ...cluster });
Comment thread
ammont82 marked this conversation as resolved.
Outdated

return {
apiVips: cluster.apiVips,
Expand Down
53 changes: 39 additions & 14 deletions libs/ui-lib/lib/ocm/components/clusterConfiguration/review/ReviewNetworkingTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import { Title } from '@patternfly/react-core';
import { Table, TableVariant, Tbody, Td, Tr } from '@patternfly/react-table';
import React from 'react';
import {
genericTableRowKey,
isDualStack,
selectApiVip,
selectIngressVip,
} from '../../../../common';
import { genericTableRowKey, isDualStack } from '../../../../common';
import {
getManagementType,
getStackTypeLabel,
Expand Down Expand Up @@ -58,7 +53,7 @@ export const ReviewNetworkingTable = ({ cluster }: { cluster: Cluster }) => {
)),
props: { 'data-testid': 'machine-networks' },
},
isDualStack({ ...cluster, openshiftVersion: cluster.openshiftVersion })
isDualStack({ ...cluster })
Comment thread
ammont82 marked this conversation as resolved.
Outdated
? {
title: cluster.machineNetworks?.map((network, index) => (
<span key={network.cidr}>
Expand All @@ -78,9 +73,24 @@ export const ReviewNetworkingTable = ({ cluster }: { cluster: Cluster }) => {
cells: [
{ title: 'API IP' },
{
title: selectApiVip(cluster),
props: { 'data-testid': 'api-vip', colSpan: 2 },
title: cluster.apiVips?.map((apiVip) => (
<span key={apiVip.ip}>
{apiVip.ip}
<br />
</span>
)),
props: { 'data-testid': 'api-vip' },
},
isDualStack({ ...cluster })
? {
title: cluster.apiVips?.map((apiVip, index) => (
<span key={apiVip.ip}>
{index === 0 ? 'Primary' : 'Secondary'}
<br />
</span>
)),
}
: { title: '' },
],
});

Expand All @@ -91,9 +101,24 @@ export const ReviewNetworkingTable = ({ cluster }: { cluster: Cluster }) => {
cells: [
{ title: 'Ingress IP' },
{
title: selectIngressVip(cluster),
props: { 'data-testid': 'ingress-vip', colSpan: 2 },
title: cluster.ingressVips?.map((ingressVip) => (
<span key={ingressVip.ip}>
{ingressVip.ip}
<br />
</span>
)),
props: { 'data-testid': 'api-vip' },
Comment thread
ammont82 marked this conversation as resolved.
Outdated
},
isDualStack({ ...cluster })
? {
title: cluster.ingressVips?.map((ingressVip, index) => (
<span key={ingressVip.ip}>
{index === 0 ? 'Primary' : 'Secondary'}
<br />
</span>
)),
}
: { title: '' },
],
});

Expand All @@ -115,7 +140,7 @@ export const ReviewNetworkingTable = ({ cluster }: { cluster: Cluster }) => {
)),
props: { 'data-testid': 'cluster-network-cidr' },
},
isDualStack({ ...cluster, openshiftVersion: cluster.openshiftVersion }) && {
isDualStack({ ...cluster }) && {
title: cluster.clusterNetworks?.map((network, index) => (
<span key={network.cidr}>
{index === 0 ? 'Primary' : 'Secondary'}
Expand All @@ -138,7 +163,7 @@ export const ReviewNetworkingTable = ({ cluster }: { cluster: Cluster }) => {
)),
props: { 'data-testid': 'cluster-network-prefix' },
},
isDualStack({ ...cluster, openshiftVersion: cluster.openshiftVersion }) && {
isDualStack({ ...cluster }) && {
title: cluster.clusterNetworks?.map((network, index) => (
<span key={network.hostPrefix}>
{index === 0 ? 'Primary' : 'Secondary'}
Expand All @@ -161,7 +186,7 @@ export const ReviewNetworkingTable = ({ cluster }: { cluster: Cluster }) => {
)),
props: { 'data-testid': 'service-network-cidr' },
},
isDualStack({ ...cluster, openshiftVersion: cluster.openshiftVersion }) && {
isDualStack({ ...cluster }) && {
title: cluster.serviceNetworks?.map((network, index) => (
<span key={network.cidr}>
{index === 0 ? 'Primary' : 'Secondary'}
Expand Down
4 changes: 2 additions & 2 deletions libs/ui-lib/lib/ocm/components/clusterDetail/ClusterProperties.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const getManagementType = ({ userManagedNetworking }: Cluster): string =>
};

export const getStackTypeLabel = (cluster: Cluster): string =>
isDualStack({ ...cluster, openshiftVersion: cluster.openshiftVersion }) ? 'Dual-stack' : 'IPv4';
isDualStack({ ...cluster }) ? 'Dual-stack' : 'IPv4';

export const getDiskEncryptionEnabledOnStatus = (diskEncryption: DiskEncryption['enableOn']) => {
let diskEncryptionType = null;
Expand All @@ -67,7 +67,7 @@ export const getDiskEncryptionEnabledOnStatus = (diskEncryption: DiskEncryption[

const ClusterProperties = ({ cluster, externalMode = false }: ClusterPropertiesProps) => {
const { t } = useTranslation();
const isDualStackType = isDualStack({ ...cluster, openshiftVersion: cluster.openshiftVersion });
const isDualStackType = isDualStack({ ...cluster });
const featureSupportLevelContext = useNewFeatureSupportLevel();

const activeFeatureConfiguration = featureSupportLevelContext.activeFeatureConfiguration;
Expand Down
Loading