MGMT-15380: Not set userManagedNetworking=true when user select arm64…

… as cpu architecture (openshift-assisted#2280) * Not set userManagedNetworking=true when user select arm64 * Removing console.log * Set UMN = true only when CMN is not supported according to the API --------- Co-authored-by: Jonathan Kilzi <jkilzi@redhat.com>
rawagner · Sep 13, 2023 · 6c27844 · 6c27844
1 parent a615bc7
commit 6c27844
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/libs/ui-lib/lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx b/libs/ui-lib/lib/ocm/components/clusterConfiguration/OcmClusterDetailsFormFields.tsx
@@ -39,6 +39,7 @@ import { ExternalPlatformDropdown, ExternalPlatformType } from './ExternalPlatfo
 import { useOracleDropdownItemState } from '../../hooks/useOracleDropdownItemState';
 import { useClusterWizardContext } from '../clusterWizard/ClusterWizardContext';
 import { HostsNetworkConfigurationType } from '../../services/types';
+import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels';
 
 export type OcmClusterDetailsFormFieldsProps = {
   forceOpenshiftVersion?: string;
@@ -108,7 +109,7 @@ export const OcmClusterDetailsFormFields = ({
     featureSupportLevelData,
     values.cpuArchitecture,
   );
-
+  const featureSupportLevelContext = useNewFeatureSupportLevel();
   React.useEffect(() => {
     nameInputRef.current?.focus();
   }, []);
@@ -136,6 +137,17 @@ export const OcmClusterDetailsFormFields = ({
     [clusterWizardContext, setFieldValue],
   );
 
+  React.useEffect(() => {
+    setFieldValue(
+      'isCMNSupported',
+      featureSupportLevelContext.isFeatureSupported(
+        'CLUSTER_MANAGED_NETWORKING',
+        featureSupportLevelData ?? undefined,
+      ),
+      false,
+    );
+  }, [setFieldValue, featureSupportLevelContext, featureSupportLevelData]);
+
   return (
     <Form id="wizard-cluster-details__form">
       <OcmRichInputField

diff --git a/libs/ui-lib/lib/ocm/services/ClusterDetailsService.ts b/libs/ui-lib/lib/ocm/services/ClusterDetailsService.ts
@@ -45,7 +45,7 @@ const ClusterDetailsService = {
       },
     };
 
-    if (params.cpuArchitecture === CpuArchitecture.ARM || params.platform?.type === 'oci') {
+    if (!values.isCMNSupported) {
       params.userManagedNetworking = true;
     }
 
@@ -115,6 +115,7 @@ const ClusterDetailsService = {
       hostsNetworkConfigurationType,
       addCustomManifest: false,
       platform: platform === undefined ? 'none' : platform,
+      isCMNSupported: true,
     };
   },
 };

diff --git a/libs/ui-lib/lib/ocm/services/types.ts b/libs/ui-lib/lib/ocm/services/types.ts
@@ -22,4 +22,5 @@ export enum HostsNetworkConfigurationType {
 export type OcmClusterDetailsValues = ClusterDetailsValues & {
   hostsNetworkConfigurationType: HostsNetworkConfigurationType;
   addCustomManifest: boolean;
+  isCMNSupported: boolean;
 };