diff --git a/libs/ui-lib-tests/cypress/integration/ui-behaviour/cluster-updates.cy.ts b/libs/ui-lib-tests/cypress/integration/ui-behaviour/cluster-updates.cy.ts index c77f330cdf..ec8993d843 100644 --- a/libs/ui-lib-tests/cypress/integration/ui-behaviour/cluster-updates.cy.ts +++ b/libs/ui-lib-tests/cypress/integration/ui-behaviour/cluster-updates.cy.ts @@ -37,7 +37,6 @@ describe('Assisted Installer UI behaviour - cluster updates', () => { navbar.clickOnNavItem('Operators'); operatorsPage.singleOperatorsToggle().click(); - operatorsPage.migrationToolkitForVirtualization().click(); operatorsPage.openshiftVirtualization().click(); cy.wait('@update-cluster').then(() => { commonActions.getDangerAlert().should('exist'); diff --git a/libs/ui-lib-tests/cypress/views/operatorsPage.ts b/libs/ui-lib-tests/cypress/views/operatorsPage.ts index e677eb36e7..00f6a6d2cb 100644 --- a/libs/ui-lib-tests/cypress/views/operatorsPage.ts +++ b/libs/ui-lib-tests/cypress/views/operatorsPage.ts @@ -2,9 +2,6 @@ export const operatorsPage = { openshiftVirtualization: () => { return cy.get('#form-checkbox-useContainerNativeVirtualization-field'); }, - migrationToolkitForVirtualization: () => { - return cy.get('#form-checkbox-useMigrationToolkitforVirtualization-field'); - }, singleOperatorsToggle: () => { return cy.contains('Single Operators '); }, diff --git a/libs/ui-lib/lib/ocm/components/clusterConfiguration/operators/CnvCheckbox.tsx b/libs/ui-lib/lib/ocm/components/clusterConfiguration/operators/CnvCheckbox.tsx index 123b189956..97072fbac7 100644 --- a/libs/ui-lib/lib/ocm/components/clusterConfiguration/operators/CnvCheckbox.tsx +++ b/libs/ui-lib/lib/ocm/components/clusterConfiguration/operators/CnvCheckbox.tsx @@ -79,6 +79,8 @@ const CnvCheckbox = ({ const fieldId = getFieldId(CNV_FIELD_NAME, 'input'); const selectOperatorsNeeded = (checked: boolean) => { if (featureSupportLevelData.isFeatureSupported('LSO')) setFieldValue('useLso', checked); + if (featureSupportLevelData.isFeatureSupported('MTV')) + setFieldValue('useMigrationToolkitforVirtualization', checked); }; return ( diff --git a/libs/ui-lib/lib/ocm/components/clusterWizard/OperatorsStep.tsx b/libs/ui-lib/lib/ocm/components/clusterWizard/OperatorsStep.tsx index 308beeae63..3a78c730de 100644 --- a/libs/ui-lib/lib/ocm/components/clusterWizard/OperatorsStep.tsx +++ b/libs/ui-lib/lib/ocm/components/clusterWizard/OperatorsStep.tsx @@ -40,7 +40,6 @@ import { useFormikContext } from 'formik'; import NewFeatureSupportLevelBadge from '../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge'; import { useNewFeatureSupportLevel } from '../../../common/components/newFeatureSupportLevels'; import { - getCnvDisabledWithMtvReason, getCnvIncompatibleWithLvmReason, getLvmIncompatibleWithCnvReason, getLvmsIncompatibleWithOdfReason, @@ -255,11 +254,6 @@ export const OperatorsStep = (props: ClusterOperatorProps) => { const lvmSupport = featureSupportLevelData.getFeatureSupportLevel('LVM'); disabledReason = getCnvIncompatibleWithLvmReason(values, lvmSupport); } - if (!disabledReason) { - if (featureSupportLevelData.isFeatureSupported('MTV')) { - disabledReason = getCnvDisabledWithMtvReason(values); - } - } } if (operatorKey === 'lvm') { if (!disabledReason) { diff --git a/libs/ui-lib/lib/ocm/components/featureSupportLevels/featureStateUtils.ts b/libs/ui-lib/lib/ocm/components/featureSupportLevels/featureStateUtils.ts index a36c1a5589..9582bfecdd 100644 --- a/libs/ui-lib/lib/ocm/components/featureSupportLevels/featureStateUtils.ts +++ b/libs/ui-lib/lib/ocm/components/featureSupportLevels/featureStateUtils.ts @@ -361,7 +361,9 @@ const getOpenShiftAIDisabledReason = ( }; export const getCnvDisabledWithMtvReason = (operatorValues: OperatorsValues) => { - const mustDisableCnv = !operatorValues.useMigrationToolkitforVirtualization; + const mustDisableCnv = + operatorValues.useContainerNativeVirtualization && + !operatorValues.useMigrationToolkitforVirtualization; return mustDisableCnv ? `Currently, you need to install ${CNV_OPERATOR_LABEL} operator at the same time as ${MTV_OPERATOR_LABEL} operator.` : undefined;