@openshift-assisted/ui-lib 2.15.3-cim → 2.16.1-cim

package/lib/cim/components/Hypershift/modals/AddNodePoolModal.tsx

@@ -41,7 +41,7 @@ const AddNodePoolModal = ({
   const handleSubmit = async (values: NodePoolFormValues) => {
     setError(undefined);
     const nodePool: NodePoolK8sResource = {
-      apiVersion: 'hypershift.openshift.io/v1alpha1',
+      apiVersion: 'hypershift.openshift.io/v1beta1',
       kind: 'NodePool',
       metadata: {
         name: values.nodePoolName,

package/lib/cim/components/Hypershift/modals/ManageHostsModal.tsx

@@ -66,7 +66,7 @@ const getPatches = (values: NodePoolFormValues, nodePool: NodePoolK8sResource) =
       );
     }
   } else {
-    if (!!nodePool.spec.replicas) {
+    if (nodePool.spec.replicas !== undefined) {
       patches.push({
         op: 'replace',
         value: values.count,
@@ -127,7 +127,7 @@ const ManageHostsModal = ({
           agentLabels: labelsToFormikValue(
             nodePool.spec.platform?.agent?.agentLabelSelector?.matchLabels || {},
           ),
-          count: nodePool.spec.replicas || 1,
+          count: nodePool.spec.replicas || 0,
           useAutoscaling: !!nodePool.spec.autoScaling,
           autoscaling: {
             minReplicas: nodePool.spec.autoScaling?.min || 1,

package/lib/cim/components/helpers/toAssisted.ts

@@ -1,6 +1,11 @@
 import cloneDeep from 'lodash-es/cloneDeep.js';
 import { AgentK8sResource } from '../../types/k8s/agent';
-import { Cluster, Host, Inventory } from '@openshift-assisted/types/assisted-installer-service';
+import {
+  Cluster,
+  Host,
+  Inventory,
+  PlatformType,
+} from '@openshift-assisted/types/assisted-installer-service';
 import { ClusterDeploymentK8sResource } from '../../types/k8s/cluster-deployment';
 import { AgentClusterInstallK8sResource } from '../../types/k8s/agent-cluster-install';
 import { getAgentStatusKey, getClusterStatus } from './status';
@@ -174,6 +179,9 @@ export const getAICluster = ({
     cpuArchitecture: getClusterDeploymentCpuArchitecture(clusterDeployment, infraEnv),
     networkType: agentClusterInstall?.spec?.networking.networkType,
     controlPlaneCount: agentClusterInstall?.spec?.provisionRequirements.controlPlaneAgents || 3,
+    platform: {
+      type: (agentClusterInstall?.spec?.platformType?.toLowerCase() || 'baremetal') as PlatformType,
+    },
   };
   /*
   aiCluster.agentSelectorMasterLabels =

package/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 { getMajorMinorVersion } 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' =>
-  parseFloat(getMajorMinorVersion(ocpVersion?.version)) >= 4.12 ? 'OVNKubernetes' : 'OpenShiftSDN';
+): 'OVNKubernetes' | 'OpenShiftSDN' => {
+  const checkVersionNum = getComparableVersionInt(ocpVersion?.version || '');
+  const toVersionNum = getComparableVersionInt('4.12');
+
+  return !checkVersionNum || checkVersionNum >= toVersionNum ? 'OVNKubernetes' : 'OpenShiftSDN';
+};

package/lib/cim/components/modals/EditProxyModal.tsx

@@ -111,7 +111,7 @@ const EditProxyModal: React.FC<EditProxyModalProps> = ({
                 <Form>
                   <ProxyInputFields />
                   {error && (
-                    <Alert variant="danger" title={t('ai:An error occured')} isInline>
+                    <Alert variant="danger" title={t('ai:An error occurred')} isInline>
                       {error}
                     </Alert>
                   )}

package/lib/cim/components/modals/EditSSHKeyModal.tsx

@@ -68,7 +68,7 @@ const EditSSHKeyModal: React.FC<EditSSHKeyModalProps> = ({
             onClose();
           } catch (err) {
             const error = err as Error;
-            setError(error?.message || t('ai:An error occured'));
+            setError(error?.message || t('ai:An error occurred'));
           }
         }}
         validateOnMount

package/lib/cim/components/modals/MassApproveAgentModal.tsx

@@ -121,7 +121,7 @@ const MassApproveAgentModal: React.FC<MassApproveAgentModalProps> = ({
       onClose();
     } catch (err) {
       setError({
-        title: t('ai:An error occured while approving agents'),
+        title: t('ai:An error occurred while approving agents'),
         message: getErrorMessage(err),
       });
       setProgress(null);

package/lib/cim/hooks/index.tsx

@@ -0,0 +1 @@
+export * from './useConfigMaps';

package/lib/cim/hooks/types.tsx

@@ -0,0 +1,8 @@
+import { WatchK8sResource } from '@openshift-console/dynamic-plugin-sdk';
+
+export type K8sWatchHookListProps = Omit<
+  WatchK8sResource,
+  'groupVersionKind' | 'name' | 'isList'
+> | null;
+
+export type K8sWatchHookProps = Pick<WatchK8sResource, 'name' | 'namespace' | 'isList'> | null;

package/lib/cim/hooks/useConfigMaps.tsx

@@ -0,0 +1,14 @@
+import { useK8sWatchResource } from './useK8sWatchResource';
+import { ConfigMapK8sResource } from '../types';
+import { K8sWatchHookProps } from './types';
+
+export const useConfigMaps = (props: K8sWatchHookProps) =>
+  useK8sWatchResource<ConfigMapK8sResource[]>(
+    {
+      groupVersionKind: {
+        kind: 'ConfigMap',
+        version: 'v1',
+      },
+    },
+    props,
+  );

package/lib/cim/hooks/useK8sWatchResource.tsx

@@ -0,0 +1,27 @@
+import {
+  useK8sWatchResource as consoleWatch,
+  K8sResourceCommon,
+  WatchK8sResource,
+} from '@openshift-console/dynamic-plugin-sdk';
+
+export type WatchK8sResult<R extends K8sResourceCommon | K8sResourceCommon[]> = [
+  R,
+  boolean,
+  unknown,
+];
+
+export const useK8sWatchResource = <R extends K8sResourceCommon | K8sResourceCommon[]>(
+  resource: Pick<WatchK8sResource, 'groupVersionKind'>,
+  props?: Omit<WatchK8sResource, 'groupVersionKind'> | null,
+): WatchK8sResult<R> => {
+  // eslint-disable-next-line
+  const [data, loaded, error] = consoleWatch<R>(
+    props !== null
+      ? {
+          ...resource,
+          ...(props || {}),
+        }
+      : null,
+  );
+  return [data, error ? true : loaded, error as unknown];
+};

package/lib/cim/types/index.ts

@@ -2,3 +2,4 @@ export * from './fromOCP';
 export * from './k8s';
 export * from './metal3';
 export * from './resources';
+export * from './models';

package/lib/cim/types/k8s/agent-cluster-install.ts

@@ -42,6 +42,7 @@ export type AgentClusterInstallK8sResource = K8sResourceCommon & {
     provisionRequirements: {
       controlPlaneAgents: number;
       workerAgents?: number;
+      arbiterAgents?: number;
     };
     networking: {
       clusterNetwork?: {
@@ -57,6 +58,7 @@ export type AgentClusterInstallK8sResource = K8sResourceCommon & {
     };
     holdInstallation?: boolean;
     platformType: string;
+    manifestsConfigMapRefs?: { name: string }[];
   };
   status?: {
     apiVIP?: string;

package/lib/cim/types/models.tsx

@@ -0,0 +1,12 @@
+import { K8sModel } from '@openshift-console/dynamic-plugin-sdk/lib/api/common-types';
+
+export const AgentClusterInstallModel: K8sModel = {
+  label: 'AgentClusterInstall',
+  apiVersion: 'v1beta1',
+  plural: 'agentclusterinstalls',
+  abbr: 'ACI',
+  namespaced: true,
+  kind: 'AgentClusterInstall',
+  labelPlural: 'AgentClusterInstalls',
+  apiGroup: 'extensions.hive.openshift.io',
+};

package/lib/cim/utils.ts

@@ -1,3 +1,5 @@
+import { Patch } from '@openshift-console/dynamic-plugin-sdk';
+import { isEqual } from 'lodash-es';
 import { StatusCondition } from './types';
 
 export function getConditionByType<ConditionType>(
@@ -6,3 +8,13 @@ export function getConditionByType<ConditionType>(
 ): StatusCondition<ConditionType> | undefined {
   return conditions.find((c) => c.type === type);
 }
+
+export const appendPatch = <V>(patches: Patch[], path: string, newVal?: V, existingVal?: V) => {
+  if (!isEqual(newVal, existingVal)) {
+    patches.push({
+      op: existingVal === undefined ? 'add' : 'replace',
+      path,
+      value: newVal,
+    });
+  }
+};

package/lib/common/components/clusterConfiguration/ControlPlaneNodesDropdown.tsx

@@ -12,6 +12,21 @@ import { useTranslation } from '../../hooks/use-translation-wrapper';
 import { getFieldId, StaticField } from '../..';
 import { useField } from 'formik';
 import toNumber from 'lodash-es/toNumber';
+import OcmTNADisclaimer from './OcmTNADisclaimer';
+
+const isItemEnabled = (value: number, allowHighlyAvailable?: boolean, allowTNA?: boolean) => {
+  switch (value) {
+    case 1:
+    case 3:
+      return true;
+    case 2:
+      return !!allowTNA;
+    case 4:
+    case 5:
+      return !!allowHighlyAvailable;
+  }
+  return false;
+};
 
 interface ControlPlaneNodesOption {
   value: number;
@@ -21,9 +36,11 @@ interface ControlPlaneNodesOption {
 const ControlPlaneNodesDropdown = ({
   isDisabled = false,
   allowHighlyAvailable,
+  allowTNA,
 }: {
   isDisabled?: boolean;
   allowHighlyAvailable?: boolean;
+  allowTNA?: boolean;
 }) => {
   const { t } = useTranslation();
   const [{ name, value: selectedValue }, , { setValue }] = useField<number>('controlPlaneCount');
@@ -32,6 +49,7 @@ const ControlPlaneNodesDropdown = ({
 
   const options: ControlPlaneNodesOption[] = [
     { value: 1, label: t('ai:1 (Single Node OpenShift - not highly available cluster)') },
+    { value: 2, label: t('ai:2 (Two-Nodes Arbiter)') },
     { value: 3, label: t('ai:3 (highly available cluster)') },
     { value: 4, label: t('ai:4 (highly available cluster+)') },
     { value: 5, label: t('ai:5 (highly available cluster++)') },
@@ -44,7 +62,8 @@ const ControlPlaneNodesDropdown = ({
   }, [allowHighlyAvailable, selectedValue, setValue]);
 
   const dropdownItems = options.map(({ value, label }) => {
-    const isItemEnabled = [1, 3].includes(value) || allowHighlyAvailable;
+    const isEnabled = isItemEnabled(value, allowHighlyAvailable, allowTNA);
+
     const disabledReason = t('ai:This option is not available with the selected OpenShift version');
     return (
       <DropdownItem
@@ -55,7 +74,7 @@ const ControlPlaneNodesDropdown = ({
         selected={selectedValue === value}
         value={value}
       >
-        <Tooltip hidden={isItemEnabled} content={disabledReason} position="top">
+        <Tooltip hidden={isEnabled} content={disabledReason} position="top">
           <div>{label}</div>
         </Tooltip>
       </DropdownItem>
@@ -70,36 +89,47 @@ const ControlPlaneNodesDropdown = ({
     setControlPlanelOpen(false);
   };
 
-  return !isDisabled ? (
-    <FormGroup isInline fieldId={fieldId} label={t('ai:Number of control plane nodes')} isRequired>
-      <Dropdown
-        isOpen={controlPlanelOpen}
-        onSelect={onControlPlaneSelect}
-        onOpenChange={() => setControlPlanelOpen(!controlPlanelOpen)}
-        toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
-          <MenuToggle
-            className="pf-v5-u-w-100"
-            ref={toggleRef}
-            isFullWidth
-            onClick={() => setControlPlanelOpen(!controlPlanelOpen)}
-            isExpanded={controlPlanelOpen}
+  return (
+    <>
+      {!isDisabled ? (
+        <FormGroup
+          isInline
+          fieldId={fieldId}
+          label={t('ai:Number of control plane nodes')}
+          isRequired
+        >
+          <Dropdown
+            isOpen={controlPlanelOpen}
+            onSelect={onControlPlaneSelect}
+            onOpenChange={() => setControlPlanelOpen(!controlPlanelOpen)}
+            toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
+              <MenuToggle
+                className="pf-v5-u-w-100"
+                ref={toggleRef}
+                isFullWidth
+                onClick={() => setControlPlanelOpen(!controlPlanelOpen)}
+                isExpanded={controlPlanelOpen}
+              >
+                {selectedValue ? selectedValue : '3'}
+              </MenuToggle>
+            )}
+            shouldFocusToggleOnSelect
           >
-            {selectedValue ? selectedValue : '3'}
-          </MenuToggle>
-        )}
-        shouldFocusToggleOnSelect
-      >
-        <DropdownList>{dropdownItems}</DropdownList>
-      </Dropdown>
-    </FormGroup>
-  ) : (
-    <StaticField
-      name={'controlPlaneCount'}
-      label={t('ai:Number of control plane nodes')}
-      isRequired
-    >
-      {selectedValue}
-    </StaticField>
+            <DropdownList>{dropdownItems}</DropdownList>
+          </Dropdown>
+        </FormGroup>
+      ) : (
+        <StaticField
+          name={'controlPlaneCount'}
+          label={t('ai:Number of control plane nodes')}
+          isRequired
+        >
+          {selectedValue}
+        </StaticField>
+      )}
+
+      {selectedValue === 2 && <OcmTNADisclaimer />}
+    </>
   );
 };
 

package/lib/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionControlGroup.tsx

@@ -42,16 +42,20 @@ const DiskEncryptionControlGroup = ({
   const {
     enableDiskEncryptionOnMasters,
     enableDiskEncryptionOnWorkers,
+    enableDiskEncryptionOnArbiters,
     diskEncryptionMode,
     diskEncryptionTangServers,
   } = values;
   const fieldId = 'diskEncryption';
 
-  const hasEnabledDiskEncryption = enableDiskEncryptionOnMasters || enableDiskEncryptionOnWorkers;
+  const hasEnabledDiskEncryption =
+    enableDiskEncryptionOnMasters ||
+    enableDiskEncryptionOnWorkers ||
+    enableDiskEncryptionOnArbiters;
   const { setFieldValue, setFieldTouched } = useFormikContext<ClusterDetailsValues>();
 
   React.useEffect(() => {
-    if (!enableDiskEncryptionOnWorkers && !enableDiskEncryptionOnMasters) {
+    if (!hasEnabledDiskEncryption) {
       if (diskEncryptionMode !== 'tpmv2') {
         setFieldValue('diskEncryptionMode', 'tpmv2');
       }
@@ -61,12 +65,11 @@ const DiskEncryptionControlGroup = ({
       }
     }
   }, [
-    enableDiskEncryptionOnMasters,
-    enableDiskEncryptionOnWorkers,
     diskEncryptionMode,
     diskEncryptionTangServers,
     setFieldTouched,
     setFieldValue,
+    hasEnabledDiskEncryption,
   ]);
 
   React.useEffect(() => {
@@ -102,8 +105,20 @@ const DiskEncryptionControlGroup = ({
             />
           </StackItem>
         </RenderIf>
+        <StackItem>
+          <SwitchField
+            tooltipProps={tooltipProps}
+            name="enableDiskEncryptionOnArbiters"
+            label={t('ai:Arbiter')}
+            isDisabled={isDisabled}
+          />
+        </StackItem>
         <RenderIf
-          condition={enableDiskEncryptionOnMasters || (enableDiskEncryptionOnWorkers && !isSNO)}
+          condition={
+            enableDiskEncryptionOnMasters ||
+            (enableDiskEncryptionOnWorkers && !isSNO) ||
+            enableDiskEncryptionOnArbiters
+          }
         >
           <StackItem>
             <DiskEncryptionMode

package/lib/common/components/clusterConfiguration/DiskEncryptionFields/DiskEncryptionValues.ts

@@ -8,6 +8,7 @@ export type TangServer = {
 export interface DiskEncryptionValues {
   enableDiskEncryptionOnMasters?: boolean;
   enableDiskEncryptionOnWorkers: boolean;
+  enableDiskEncryptionOnArbiters: boolean;
   diskEncryptionMode: DiskEncryption['mode'];
   diskEncryptionTangServers: TangServer[];
 }

package/lib/common/components/clusterConfiguration/ExternalPlatformsDropdown.tsx

@@ -0,0 +1,74 @@
+import * as React from 'react';
+import { StaticField } from '../ui';
+import { useTranslation } from '../../hooks';
+import { TFunction } from 'i18next';
+import { PlatformType } from '@openshift-assisted/types/assisted-installer-service';
+import { Dropdown, DropdownItem, FormGroup, MenuToggle } from '@patternfly/react-core';
+import { useField } from 'formik';
+
+export const getPlatforms = (t: TFunction): { [key in PlatformType]: string } => ({
+  none: t('ai:No platform integration'),
+  baremetal: t('ai:No platform integration'),
+  nutanix: t('ai:Nutanix'),
+  vsphere: t('ai:vSphere'),
+  external: t('ai:External cloud provider'),
+});
+
+export const ExternalPlatformsDropdown = ({ isDisabled }: { isDisabled: boolean }) => {
+  const [isOpen, setIsOpen] = React.useState(false);
+  const [{ value }, , { setValue }] = useField<PlatformType>('platform');
+  const { t } = useTranslation();
+
+  const platforms = getPlatforms(t);
+
+  const options = Object.entries(platforms)
+    .filter(([key]) => key !== 'none')
+    .map(([platform, label]) => (
+      <DropdownItem
+        key={platform}
+        id={platform}
+        value={platform}
+        selected={platform === value}
+        onClick={(e: React.MouseEvent) => e.preventDefault()}
+      >
+        {label}
+      </DropdownItem>
+    ));
+
+  const onSelect = (
+    _event: React.MouseEvent<Element, MouseEvent> | undefined,
+    value: string | number | undefined,
+  ) => {
+    setValue(value as PlatformType);
+    setIsOpen(false);
+  };
+
+  return isDisabled ? (
+    <StaticField
+      name={'platform'}
+      label={t('ai:Integrate with external partner platforms')}
+      isRequired
+    >
+      {platforms[value]}
+    </StaticField>
+  ) : (
+    <FormGroup
+      isInline
+      label={t('ai:Integrate with external partner platforms')}
+      isRequired
+      name={'platform'}
+    >
+      <Dropdown
+        isOpen={isOpen}
+        toggle={(toggleRef) => (
+          <MenuToggle ref={toggleRef} className="pf-v5-u-w-100" onClick={() => setIsOpen(!isOpen)}>
+            {value ? platforms[value] : t('ai:Integrate with external partner platforms')}
+          </MenuToggle>
+        )}
+        onSelect={onSelect}
+      >
+        {options}
+      </Dropdown>
+    </FormGroup>
+  );
+};

package/lib/common/components/clusterConfiguration/OcmTNADisclaimer.tsx

@@ -0,0 +1,23 @@
+import React from 'react';
+import { Alert, AlertVariant, List, ListItem } from '@patternfly/react-core';
+import { useTranslation } from '../../hooks/use-translation-wrapper';
+
+const OcmTNADisclaimer = () => {
+  const { t } = useTranslation();
+
+  return (
+    <Alert
+      variant={AlertVariant.info}
+      title={t('ai:Requirements for Two Node control plane OpenShift')}
+      isInline
+    >
+      <List>
+        <ListItem>
+          {t('ai:Two nodes control plane OpenShift must include an additional arbiter node.')}
+        </ListItem>
+      </List>
+    </Alert>
+  );
+};
+
+export default OcmTNADisclaimer;

package/lib/common/components/clusterConfiguration/index.ts

@@ -1,5 +1,3 @@
-export { default as SNOControlGroup } from './SNOControlGroup';
-export { default as SNODisclaimer } from './SNODisclaimer';
 export { default as UploadSSH } from './UploadSSH';
 export { default as ProxyFields, ProxyInputFields } from './ProxyFields';
 export { default as DownloadIsoModal } from './DownloadIsoModal';
@@ -11,3 +9,4 @@ export { default as SecurityFields } from './SecurityFields';
 export * from './utils';
 export * from './DiscoveryTroubleshootingModal';
 export * from './DiscoveryImageConfigForm';
+export * from './ExternalPlatformsDropdown';

package/lib/common/components/clusterDetail/OperatorsProgressItem.tsx

@@ -80,7 +80,7 @@ type OperatorsPopoverProps = OperatorListProps & {
 
 const OperatorsPopover = ({ operators, children }: OperatorsPopoverProps) => {
   const { t } = useTranslation();
-  const opSpecs = useOperatorSpecs();
+  const { byKey: opSpecs } = useOperatorSpecs();
 
   return (
     <Popover

package/lib/common/components/clusterWizard/clusterDetailsValidation.ts

@@ -15,8 +15,6 @@ import {
   pullSecretValidationSchema,
 } from '../ui';
 import { ClusterDetailsValues } from './types';
-import { FeatureSupportLevelData } from '../featureSupportLevels';
-import toNumber from 'lodash-es/toNumber';
 
 const emptyTangServers = (): TangServer[] => {
   return [
@@ -55,18 +53,16 @@ export const getClusterDetailsInitialValues = ({
 }): ClusterDetailsValues => {
   const {
     name = '',
-    highAvailabilityMode = 'Full',
     baseDnsDomain = baseDomain || '',
     openshiftVersion = getDefaultOpenShiftVersion(ocpVersions),
+    controlPlaneCount = 3,
   } = cluster || {};
-
   return {
     name,
-    highAvailabilityMode,
     openshiftVersion,
     pullSecret: pullSecret || '',
     baseDnsDomain,
-    SNODisclaimer: highAvailabilityMode === 'None',
+    controlPlaneCount,
     useRedHatDnsService:
       !!baseDnsDomain && managedDomains.map((d) => d.domain).includes(baseDnsDomain),
     enableDiskEncryptionOnMasters: ['all', 'masters'].includes(
@@ -79,26 +75,24 @@ export const getClusterDetailsInitialValues = ({
     diskEncryptionTangServers: parseTangServers(cluster?.diskEncryption?.tangServers),
     diskEncryption: cluster?.diskEncryption ?? {},
     cpuArchitecture: cluster?.cpuArchitecture || getDefaultCpuArchitecture(),
-    platform: cluster?.platform?.type || 'none',
+    platform: cluster?.platform?.type || 'baremetal',
     customOpenshiftSelect: null,
     userManagedNetworking: cluster?.userManagedNetworking || false,
-    controlPlaneCount: cluster?.controlPlaneCount || 3,
+    enableDiskEncryptionOnArbiters: ['all', 'arbiters'].includes(
+      cluster?.diskEncryption?.enableOn ?? 'none',
+    ),
   };
 };
 
 export const getClusterDetailsValidationSchema = ({
   usedClusterNames,
-  featureSupportLevels,
   pullSecretSet,
-  ocpVersions,
   validateUniqueName,
   isOcm,
   t,
 }: {
   usedClusterNames: string[];
-  featureSupportLevels?: FeatureSupportLevelData;
   pullSecretSet?: boolean;
-  ocpVersions?: OpenshiftVersionOptionType[];
   validateUniqueName?: boolean;
   isOcm?: boolean;
   t: TFunction;
@@ -120,28 +114,6 @@ export const getClusterDetailsValidationSchema = ({
         ? baseDomainValidationSchema.required('Required')
         : dnsNameValidationSchema.required('Required'),
       pullSecret: pullSecretValidationSchema.required('Required.'),
-      SNODisclaimer: Yup.boolean().when(['controlPlaneCount', 'openshiftVersion'], {
-        // The disclaimer is required only if SNO is enabled and SNO feature is not fully supported in that version
-        is: (
-          controlPlaneCount: Cluster['controlPlaneCount'],
-          openshiftVersion: Cluster['openshiftVersion'],
-        ) => {
-          const selectedVersion = (ocpVersions || []).find((v) => v.value === openshiftVersion);
-          const versionToUse = selectedVersion?.value ?? openshiftVersion;
-          if (featureSupportLevels) {
-            return toNumber(controlPlaneCount) === 1 && versionToUse && featureSupportLevels
-              ? featureSupportLevels.getFeatureSupportLevel(versionToUse, 'SNO') === 'dev-preview'
-              : false;
-          } else {
-            return toNumber(controlPlaneCount) === 1 && versionToUse && values.isSNODevPreview;
-          }
-        },
-        then: () =>
-          Yup.boolean().oneOf(
-            [true],
-            t('ai:Confirm the Single Node OpenShift disclaimer to continue.'),
-          ),
-      }),
       diskEncryptionTangServers: Yup.array().when('diskEncryptionMode', {
         is: (diskEncryptionMode: DiskEncryption['mode']) => {
           return diskEncryptionMode === 'tang';

package/lib/common/components/clusterWizard/types.ts

@@ -15,24 +15,22 @@ import {
 } from '../../types/hosts';
 import { TangServer } from '../clusterConfiguration/DiskEncryptionFields/DiskEncryptionValues';
 import { WizardStepsValidationMap } from './validationsInfoUtils';
-import { OpenshiftVersionOptionType } from '../../types';
 
 export type ClusterDetailsValues = {
   name: string;
-  highAvailabilityMode: 'Full' | 'None';
   openshiftVersion: string;
   pullSecret: string;
   baseDnsDomain: string;
-  SNODisclaimer: boolean;
   useRedHatDnsService: boolean;
   enableDiskEncryptionOnMasters: boolean;
   enableDiskEncryptionOnWorkers: boolean;
+  enableDiskEncryptionOnArbiters: boolean;
   diskEncryptionMode: DiskEncryption['mode'];
   diskEncryptionTangServers: TangServer[];
   diskEncryption: DiskEncryption;
   cpuArchitecture: string;
   platform: PlatformType;
-  customOpenshiftSelect: OpenshiftVersionOptionType | null;
+  customOpenshiftSelect: string | null;
   userManagedNetworking: boolean;
   controlPlaneCount: number;
 };