diff --git a/libs/ui-lib/lib/cim/components/helpers/versions.ts b/libs/ui-lib/lib/cim/components/helpers/versions.ts index 1a6ca3a786..5b6e915c15 100644 --- a/libs/ui-lib/lib/cim/components/helpers/versions.ts +++ b/libs/ui-lib/lib/cim/components/helpers/versions.ts @@ -8,7 +8,7 @@ import { } from '../../types'; import { CpuArchitecture, OpenshiftVersionOptionType } from '../../../common'; import { OpenshiftVersion } from '@openshift-assisted/types/assisted-installer-service'; -import { isMajorMinorVersionEqualOrGreater } from '../../../common/utils'; +import { getComparableVersionInt } from '../../../common/utils'; export const getVersionFromReleaseImage = (releaseImage = '') => { const match = /.+:(\d+\.\d+(?:\.\d+)?(?:-\w+)?)/gm.exec(releaseImage); @@ -123,5 +123,9 @@ export const getCurrentClusterVersion = (cv?: ClusterVersionK8sResource): string export const getNetworkType = ( ocpVersion: OpenshiftVersionOptionType | undefined, -): 'OVNKubernetes' | 'OpenShiftSDN' => - isMajorMinorVersionEqualOrGreater(ocpVersion?.version, '4.12') ? 'OVNKubernetes' : 'OpenShiftSDN'; +): 'OVNKubernetes' | 'OpenShiftSDN' => { + const checkVersionNum = getComparableVersionInt(ocpVersion?.version || ''); + const toVersionNum = getComparableVersionInt('4.12'); + + return !checkVersionNum || checkVersionNum >= toVersionNum ? 'OVNKubernetes' : 'OpenShiftSDN'; +}; diff --git a/libs/ui-lib/lib/common/utils.ts b/libs/ui-lib/lib/common/utils.ts index 2317c81a9b..b7e369b39a 100644 --- a/libs/ui-lib/lib/common/utils.ts +++ b/libs/ui-lib/lib/common/utils.ts @@ -113,7 +113,7 @@ export const getMajorMinorVersion = (version = '') => { }; // Converts an Openshift version to a comparable integer -const getComparableVersionInt = (version: string): number => { +export const getComparableVersionInt = (version: string): number => { const majorMinorParts = version.split('.').slice(0, 2).map(Number); if (majorMinorParts.length < 2 || majorMinorParts.some(isNaN)) { // If the version doesn't have the required format, returning 0 makes it be considered