Skip to content

Commit 2aca314

Browse files
authored
Revert "Set UMN=true in disconnected" (#2867)
This reverts commit 23158a9.
1 parent ea82bb9 commit 2aca314

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

libs/ui-lib/lib/ocm/components/clusterWizard/ClusterDetailsForm.tsx

+2-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import {
3131
InfraEnv,
3232
ManagedDomain,
3333
} from '@openshift-assisted/types/assisted-installer-service';
34-
import { useFeature } from '../../hooks/use-feature';
3534

3635
type ClusterDetailsFormProps = {
3736
cluster?: Cluster;
@@ -65,7 +64,6 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
6564
} = props;
6665

6766
const clusterWizardContext = useClusterWizardContext();
68-
const isSingleCluster = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
6967
const { search } = useLocation();
7068
const { isViewerMode } = useSelector(selectCurrentClusterPermissionsState);
7169
const { clearAlerts } = useAlerts();
@@ -85,11 +83,11 @@ const ClusterDetailsForm = (props: ClusterDetailsFormProps) => {
8583
const params = ClusterDetailsService.getClusterUpdateParams(values, resetPlatform);
8684
await handleClusterUpdate(cluster.id, params, values.addCustomManifest);
8785
} else {
88-
const params = ClusterDetailsService.getClusterCreateParams(values, isSingleCluster);
86+
const params = ClusterDetailsService.getClusterCreateParams(values);
8987
await handleClusterCreate(params, values.addCustomManifest);
9088
}
9189
},
92-
[cluster, handleClusterCreate, handleClusterUpdate, isSingleCluster],
90+
[cluster, handleClusterCreate, handleClusterUpdate],
9391
);
9492

9593
const handleOnNext = React.useCallback(

libs/ui-lib/lib/ocm/services/ClusterDetailsService.ts

+3-7
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,10 @@ const getExistingClusterCpuArchitecture = (infraEnv: InfraEnv) => {
3434
};
3535

3636
const ClusterDetailsService = {
37-
getClusterCreateParams(
38-
values: OcmClusterDetailsValues,
39-
isSingleCluster: boolean,
40-
): ClusterCreateParamsWithStaticNetworking {
41-
const controlPlaneCount = toNumber(values.controlPlaneCount);
37+
getClusterCreateParams(values: OcmClusterDetailsValues): ClusterCreateParamsWithStaticNetworking {
4238
const params: ClusterCreateParamsWithStaticNetworking = {
4339
name: values.name,
44-
controlPlaneCount,
40+
controlPlaneCount: toNumber(values.controlPlaneCount),
4541
openshiftVersion: values.openshiftVersion,
4642
pullSecret: values.pullSecret,
4743
baseDnsDomain: values.baseDnsDomain,
@@ -60,7 +56,7 @@ const ClusterDetailsService = {
6056
},
6157
};
6258

63-
if (!values.isCMNSupported || (isSingleCluster && controlPlaneCount !== 1)) {
59+
if (!values.isCMNSupported) {
6460
params.userManagedNetworking = true;
6561
}
6662

0 commit comments

Comments
 (0)