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

package/build/cjs/ocm/services/DiskEncryptionService.js

@@ -1,10 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const DiskEncryptionService = {
-    diskEncryptionEnableOn(isEnableOnMasters, isEnableOnWorkers) {
+    diskEncryptionEnableOn(isEnableOnMasters, isEnableOnWorkers, isEnableOnArbiters) {
         let enableOnParam;
-        if (isEnableOnMasters && isEnableOnWorkers)
+        if (isEnableOnMasters && isEnableOnWorkers && isEnableOnArbiters)
             enableOnParam = 'all';
+        else if (isEnableOnMasters && isEnableOnWorkers)
+            enableOnParam = 'masters,workers';
+        else if (isEnableOnMasters && isEnableOnArbiters)
+            enableOnParam = 'masters,arbiters';
+        else if (isEnableOnWorkers && isEnableOnArbiters)
+            enableOnParam = 'arbiters,workers';
+        else if (isEnableOnArbiters)
+            enableOnParam = 'arbiters';
         else if (isEnableOnWorkers)
             enableOnParam = 'workers';
         else if (isEnableOnMasters)
@@ -16,11 +24,11 @@ const DiskEncryptionService = {
     getDiskEncryptionParams(values) {
         return {
             mode: values.diskEncryptionMode,
-            enableOn: values.highAvailabilityMode === 'None'
+            enableOn: values.controlPlaneCount === 1
                 ? values.enableDiskEncryptionOnMasters
                     ? 'all'
                     : 'none'
-                : DiskEncryptionService.diskEncryptionEnableOn(values.enableDiskEncryptionOnMasters, values.enableDiskEncryptionOnWorkers),
+                : DiskEncryptionService.diskEncryptionEnableOn(values.enableDiskEncryptionOnMasters, values.enableDiskEncryptionOnWorkers, values.enableDiskEncryptionOnArbiters),
             tangServers: values.diskEncryptionMode === 'tang'
                 ? JSON.stringify(values.diskEncryptionTangServers)
                 : undefined,

package/build/cjs/ocm/services/DiskEncryptionService.js.map

@@ -1 +1 @@
-{"version":3,"file":"DiskEncryptionService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/DiskEncryptionService.ts"],"names":[],"mappings":";;AAMA,MAAM,qBAAqB,GAAG;IAC5B,sBAAsB,CACpB,iBAA0B,EAC1B,iBAA0B;QAE1B,IAAI,aAAyC,CAAC;QAC9C,IAAI,iBAAiB,IAAI,iBAAiB;YAAE,aAAa,GAAG,KAAK,CAAC;aAC7D,IAAI,iBAAiB;YAAE,aAAa,GAAG,SAAS,CAAC;aACjD,IAAI,iBAAiB;YAAE,aAAa,GAAG,SAAS,CAAC;;YACjD,aAAa,GAAG,MAAM,CAAC;QAC5B,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,uBAAuB,CAAC,MAA4B;QAClD,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,kBAAkB;YAC/B,QAAQ,EACN,MAAM,CAAC,oBAAoB,KAAK,MAAM;gBACpC,CAAC,CAAC,MAAM,CAAC,6BAA6B;oBACpC,CAAC,CAAC,KAAK;oBACP,CAAC,CAAC,MAAM;gBACV,CAAC,CAAC,qBAAqB,CAAC,sBAAsB,CAC1C,MAAM,CAAC,6BAA6B,EACpC,MAAM,CAAC,6BAA6B,CACrC;YACP,WAAW,EACT,MAAM,CAAC,kBAAkB,KAAK,MAAM;gBAClC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,yBAAyB,CAAC;gBAClD,CAAC,CAAC,SAAS;SAChB,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,kBAAe,qBAAqB,CAAC"}
+{"version":3,"file":"DiskEncryptionService.js","sourceRoot":"","sources":["../../../../lib/ocm/services/DiskEncryptionService.ts"],"names":[],"mappings":";;AAMA,MAAM,qBAAqB,GAAG;IAC5B,sBAAsB,CACpB,iBAA0B,EAC1B,iBAA0B,EAC1B,kBAA2B;QAE3B,IAAI,aAAyC,CAAC;QAC9C,IAAI,iBAAiB,IAAI,iBAAiB,IAAI,kBAAkB;YAAE,aAAa,GAAG,KAAK,CAAC;aACnF,IAAI,iBAAiB,IAAI,iBAAiB;YAAE,aAAa,GAAG,iBAAiB,CAAC;aAC9E,IAAI,iBAAiB,IAAI,kBAAkB;YAAE,aAAa,GAAG,kBAAkB,CAAC;aAChF,IAAI,iBAAiB,IAAI,kBAAkB;YAAE,aAAa,GAAG,kBAAkB,CAAC;aAChF,IAAI,kBAAkB;YAAE,aAAa,GAAG,UAAU,CAAC;aACnD,IAAI,iBAAiB;YAAE,aAAa,GAAG,SAAS,CAAC;aACjD,IAAI,iBAAiB;YAAE,aAAa,GAAG,SAAS,CAAC;;YACjD,aAAa,GAAG,MAAM,CAAC;QAC5B,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,uBAAuB,CAAC,MAA4B;QAClD,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,kBAAkB;YAC/B,QAAQ,EACN,MAAM,CAAC,iBAAiB,KAAK,CAAC;gBAC5B,CAAC,CAAC,MAAM,CAAC,6BAA6B;oBACpC,CAAC,CAAC,KAAK;oBACP,CAAC,CAAC,MAAM;gBACV,CAAC,CAAC,qBAAqB,CAAC,sBAAsB,CAC1C,MAAM,CAAC,6BAA6B,EACpC,MAAM,CAAC,6BAA6B,EACpC,MAAM,CAAC,8BAA8B,CACtC;YACP,WAAW,EACT,MAAM,CAAC,kBAAkB,KAAK,MAAM;gBAClC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,yBAAyB,CAAC;gBAClD,CAAC,CAAC,SAAS;SAChB,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,kBAAe,qBAAqB,CAAC"}

package/build/cjs/ocm/store/slices/current-cluster/selectors.js

@@ -7,7 +7,7 @@ const selectCurrentCluster = (state) => state.currentCluster.data;
 exports.selectCurrentCluster = selectCurrentCluster;
 const selectCurrentClusterUIState = (state) => state.currentCluster.uiState;
 exports.selectCurrentClusterUIState = selectCurrentClusterUIState;
-const selectIsCurrentClusterSNO = (state) => { var _a; return ((_a = state.currentCluster.data) === null || _a === void 0 ? void 0 : _a.highAvailabilityMode) === 'None'; };
+const selectIsCurrentClusterSNO = (state) => { var _a; return ((_a = state.currentCluster.data) === null || _a === void 0 ? void 0 : _a.controlPlaneCount) === 1; };
 exports.selectIsCurrentClusterSNO = selectIsCurrentClusterSNO;
 const selectCurrentClusterPermissionsState = (state) => {
     if (state.currentCluster) {

package/build/cjs/ocm/store/slices/current-cluster/selectors.js.map

@@ -1 +1 @@
-{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../../../../lib/ocm/store/slices/current-cluster/selectors.ts"],"names":[],"mappings":";;;AAGO,MAAM,yBAAyB,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC;AAA3E,QAAA,yBAAyB,6BAAkD;AACjF,MAAM,oBAAoB,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC;AAA3E,QAAA,oBAAoB,wBAAuD;AACjF,MAAM,2BAA2B,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC;AAArF,QAAA,2BAA2B,+BAA0D;AAC3F,MAAM,yBAAyB,GAAG,CAAC,KAAoB,EAAE,EAAE,WAChE,OAAA,CAAA,MAAA,KAAK,CAAC,cAAc,CAAC,IAAI,0CAAE,oBAAoB,MAAK,MAAM,CAAA,EAAA,CAAC;AADhD,QAAA,yBAAyB,6BACuB;AACtD,MAAM,oCAAoC,GAAG,CAClD,KAAoB,EACsB,EAAE;IAC5C,IAAI,KAAK,CAAC,cAAc,EAAE;QACxB,OAAO,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC;KACzC;IACD,oFAAoF;IACpF,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AARW,QAAA,oCAAoC,wCAQ/C"}
+{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../../../../lib/ocm/store/slices/current-cluster/selectors.ts"],"names":[],"mappings":";;;AAGO,MAAM,yBAAyB,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC;AAA3E,QAAA,yBAAyB,6BAAkD;AACjF,MAAM,oBAAoB,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC;AAA3E,QAAA,oBAAoB,wBAAuD;AACjF,MAAM,2BAA2B,GAAG,CAAC,KAAoB,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC;AAArF,QAAA,2BAA2B,+BAA0D;AAC3F,MAAM,yBAAyB,GAAG,CAAC,KAAoB,EAAE,EAAE,WAChE,OAAA,CAAA,MAAA,KAAK,CAAC,cAAc,CAAC,IAAI,0CAAE,iBAAiB,MAAK,CAAC,CAAA,EAAA,CAAC;AADxC,QAAA,yBAAyB,6BACe;AAC9C,MAAM,oCAAoC,GAAG,CAClD,KAAoB,EACsB,EAAE;IAC5C,IAAI,KAAK,CAAC,cAAc,EAAE;QACxB,OAAO,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC;KACzC;IACD,oFAAoF;IACpF,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC;AACjC,CAAC,CAAC;AARW,QAAA,oCAAoC,wCAQ/C"}

package/lib/cim/components/Agent/AgentStatus.tsx

@@ -7,7 +7,7 @@ import { getAIHosts } from '../helpers/toAssisted';
 import { getAgentStatus, getWizardStepAgentStatus } from '../helpers/status';
 
 import '@patternfly/react-styles/css/utilities/Text/text.css';
-import { AdditionalNTPSourcesDialogToggle } from '../ClusterDeployment/AdditionalNTPSourcesDialogToggle';
+import { AdditionalNTPSourcesDialogToggle } from '../ClusterDeployment/components';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import ValidationsRunningAlert from '../common/ValidationsRunningAlert';
 import { agentStatus } from '../helpers/agentStatus';

package/lib/cim/components/Agent/tableUtils.tsx

@@ -40,7 +40,7 @@ export const agentHostnameColumn = (
   agents: AgentK8sResource[],
   bareMetalHosts: BareMetalHostK8sResource[],
   onEditHostname?: HostsTableActions['onEditHost'],
-  canEditHostname?: HostsTableActions['canEditHost'],
+  canEditHostname?: HostsTableActions['canEditHostname'],
   canEditBMH?: HostsTableActions['canEditBMH'],
 ): TableRow<Host> => ({
   header: {

package/lib/cim/components/ClusterDeployment/ClusterDeploymentWizard.tsx

@@ -2,17 +2,18 @@ import * as React from 'react';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { Grid, GridItem, Wizard, WizardStep } from '@patternfly/react-core';
 import { AlertsContextProvider, LoadingState } from '../../../common';
-import ClusterDeploymentDetailsStep from './ClusterDeploymentDetailsStep';
-import ClusterDeploymentNetworkingStep from './ClusterDeploymentNetworkingStep';
-import ClusterDeploymentHostSelectionStep from './ClusterDeploymentHostSelectionStep';
 import { ClusterDeploymentWizardProps } from './types';
-import ClusterDeploymentHostsDiscoveryStep from './ClusterDeploymentHostsDiscoveryStep';
 import { ACMFeatureSupportLevelProvider } from '../featureSupportLevels';
-import ClusterDeploymentReviewStep from './ClusterDeploymentReviewStep';
 import { YamlPreview, useYamlPreview } from '../YamlPreview';
 import { wizardStepNames } from './constants';
 import { ClusterDeploymentWizardContextProvider } from './ClusterDeploymentWizardContext';
 import { isCIMFlow } from './helpers';
+import { ClusterDeploymentDetailsStep } from './clusterDetails';
+import { ClusterDeploymentHostSelectionStep } from './hostSelection';
+import { ClusterDeploymentHostsDiscoveryStep } from './hostDiscovery';
+import { ClusterDeploymentNetworkingStep } from './networking';
+import { ClusterDeploymentReviewStep } from './review';
+import { ClusterDeploymentCustomManifestsStep } from './customManifests';
 
 export const ClusterDeploymentWizard = ({
   className,
@@ -76,6 +77,7 @@ export const ClusterDeploymentWizard = ({
                   id={'installation-type'}
                   isDisabled
                 />
+
                 <WizardStep name={stepNames['cluster-details']} id={'cluster-details'}>
                   <ClusterDeploymentDetailsStep
                     clusterImages={clusterImages}
@@ -89,7 +91,9 @@ export const ClusterDeploymentWizard = ({
                     isNutanix={isNutanix}
                   />
                 </WizardStep>
+
                 <WizardStep name={stepNames['automation']} id={'automation'} isDisabled />
+
                 {isCIMFlow(clusterDeployment) ? (
                   <WizardStep name={stepNames['hosts-selection']} id={'host-selection'}>
                     {agentClusterInstall?.metadata?.name ? (
@@ -131,6 +135,7 @@ export const ClusterDeploymentWizard = ({
                     )}
                   </WizardStep>
                 )}
+
                 <WizardStep name={stepNames['networking']} id={'networking'}>
                   <ClusterDeploymentNetworkingStep
                     clusterDeployment={clusterDeployment}
@@ -145,6 +150,11 @@ export const ClusterDeploymentWizard = ({
                     isNutanix={isNutanix}
                   />
                 </WizardStep>
+
+                <WizardStep name={stepNames['custom-manifests']} id={'custom-manifests'}>
+                  <ClusterDeploymentCustomManifestsStep agentClusterInstall={agentClusterInstall} />
+                </WizardStep>
+
                 <WizardStep name={stepNames['review']} id={'review'}>
                   <ClusterDeploymentReviewStep
                     onFinish={onFinish}

package/lib/cim/components/ClusterDeployment/ScaleUpForm.tsx

@@ -3,7 +3,7 @@ import { useFormikContext } from 'formik';
 import { Flex, FlexItem, Form, FormGroup } from '@patternfly/react-core';
 import { getAgentsForSelection } from '../helpers/agents';
 import { AgentK8sResource } from '../../types/k8s/agent';
-import ClusterDeploymentHostsSelectionAdvanced from './ClusterDeploymentHostsSelectionAdvanced';
+import { ClusterDeploymentHostsSelectionAdvanced } from './hostSelection';
 import { ScaleUpFormValues } from './types';
 import SwitchField from '../../../common/components/ui/formik/SwitchField';
 import ClusterScaleUpAutoHostsSelection from './ClusterScaleUpAutoHostsSelection';

package/lib/cim/components/ClusterDeployment/{ACMClusterDeploymentDetailsStep.tsx → clusterDetails/ACMClusterDeploymentDetailsStep.tsx}

@@ -2,13 +2,13 @@ import React from 'react';
 import { Formik, FormikProps, useFormikContext } from 'formik';
 import { Stack } from '@patternfly/react-core';
 import noop from 'lodash-es/noop.js';
-import { ClusterDetailsValues, getRichTextValidation } from '../../../common';
-import { ClusterImageSetK8sResource } from '../../types/k8s/cluster-image-set';
-import ClusterDeploymentDetailsForm from './ClusterDeploymentDetailsForm';
+import { ClusterDetailsValues, getRichTextValidation } from '../../../../common';
+import { ClusterImageSetK8sResource } from '../../../types/k8s/cluster-image-set';
 import { useDetailsFormik } from './ClusterDeploymentDetailsStep';
 import { ClusterDetailsFormFieldsProps } from './ClusterDetailsFormFields';
-import { OsImage } from '../../types';
-import { getOCPVersions } from '../helpers';
+import { OsImage } from '../../../types';
+import { getOCPVersions } from '../../helpers';
+import { ClusterDeploymentDetailsForm } from './ClusterDeploymentDetailsForm';
 
 type DetailsFormBodyProps = {
   clusterImages: ClusterImageSetK8sResource[];
@@ -49,7 +49,7 @@ type ACMClusterDeploymentDetailsStepProps = DetailsFormBodyProps & {
   formRef: React.Ref<FormikProps<ClusterDetailsValues>>;
 };
 
-const ACMClusterDeploymentDetailsStep: React.FC<ACMClusterDeploymentDetailsStepProps> = ({
+export const ACMClusterDeploymentDetailsStep: React.FC<ACMClusterDeploymentDetailsStepProps> = ({
   clusterImages,
   formRef,
   usedClusterNames,
@@ -80,5 +80,3 @@ const ACMClusterDeploymentDetailsStep: React.FC<ACMClusterDeploymentDetailsStepP
     </Formik>
   );
 };
-
-export default ACMClusterDeploymentDetailsStep;

package/lib/cim/components/ClusterDeployment/{ClusterDeploymentDetailsForm.tsx → clusterDetails/ClusterDeploymentDetailsForm.tsx}

@@ -8,18 +8,26 @@ import {
   useWizardFooter,
   WizardFooter,
 } from '@patternfly/react-core';
-import { AgentClusterInstallK8sResource, ClusterDeploymentK8sResource, OsImage } from '../../types';
-import { ClusterImageSetK8sResource } from '../../types/k8s/cluster-image-set';
-import { getOCPVersions, getSelectedVersion } from '../helpers';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import {
+  AgentClusterInstallK8sResource,
+  ClusterDeploymentK8sResource,
+  OsImage,
+} from '../../../types';
+import { ClusterImageSetK8sResource } from '../../../types/k8s/cluster-image-set';
+import { getOCPVersions, getSelectedVersion } from '../../helpers';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 import {
   ClusterDetailsFormFields,
   ClusterDetailsFormFieldsProps,
 } from './ClusterDetailsFormFields';
 import { useFormikContext } from 'formik';
-import { ClusterDetailsValues, CpuArchitecture, SupportedCpuArchitecture } from '../../../common';
-import { ClusterDeploymentWizardContext } from './ClusterDeploymentWizardContext';
-import { ValidationSection } from './components/ValidationSection';
+import {
+  ClusterDetailsValues,
+  CpuArchitecture,
+  SupportedCpuArchitecture,
+} from '../../../../common';
+import { ClusterDeploymentWizardContext } from '../ClusterDeploymentWizardContext';
+import { ValidationSection } from '../components/ValidationSection';
 import { toNumber } from 'lodash-es';
 
 type ClusterDeploymentDetailsFormProps = {
@@ -74,7 +82,7 @@ export const ClusterDeploymentDetailsFormWrapper = ({
       {syncError && (
         <StackItem>
           <ValidationSection currentStepId={'networking'} hosts={[]}>
-            <Alert variant={AlertVariant.danger} title={t('ai:An error occured')} isInline>
+            <Alert variant={AlertVariant.danger} title={t('ai:An error occurred')} isInline>
               {syncError}
             </Alert>
           </ValidationSection>
@@ -84,7 +92,7 @@ export const ClusterDeploymentDetailsFormWrapper = ({
   );
 };
 
-const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps> = ({
+export const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps> = ({
   agentClusterInstall,
   clusterDeployment,
   clusterImages,
@@ -150,5 +158,3 @@ const ClusterDeploymentDetailsForm: React.FC<ClusterDeploymentDetailsFormProps>
     </>
   );
 };
-
-export default ClusterDeploymentDetailsForm;

package/lib/cim/components/ClusterDeployment/{ClusterDeploymentDetailsStep.tsx → clusterDetails/ClusterDeploymentDetailsStep.tsx}

@@ -9,24 +9,24 @@ import {
   getClusterDetailsValidationSchema,
   ClusterWizardStepHeader,
   ClusterDetailsValues,
-  useFeatureSupportLevel,
   getRichTextValidation,
   OpenshiftVersionOptionType,
-} from '../../../common';
+} from '../../../../common';
 
-import { ClusterDeploymentDetailsStepProps, ClusterDeploymentDetailsValues } from './types';
-import { getAICluster, getNetworkType, getOCPVersions } from '../helpers';
+import { ClusterDeploymentDetailsStepProps, ClusterDeploymentDetailsValues } from '../types';
+import { getAICluster, getNetworkType, getOCPVersions } from '../../helpers';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
   ClusterDeploymentK8sResource,
   InfraEnvK8sResource,
-} from '../../types';
-import ClusterDeploymentDetailsForm, {
+} from '../../../types';
+import {
+  ClusterDeploymentDetailsForm,
   ClusterDeploymentDetailsFormWrapper,
 } from './ClusterDeploymentDetailsForm';
-import { getGridSpans } from './helpers';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { getGridSpans } from '../helpers';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 
 type UseDetailsFormikArgs = {
   usedClusterNames: string[];
@@ -49,7 +49,6 @@ export const useDetailsFormik = ({
   Lazy<{ baseDnsDomain: string }>,
 ] => {
   const { t } = useTranslation();
-  const featureSupportLevels = useFeatureSupportLevel();
   const isEdit = !!clusterDeployment || !!agentClusterInstall;
 
   const cluster = React.useMemo(
@@ -88,19 +87,17 @@ export const useDetailsFormik = ({
     () =>
       getClusterDetailsValidationSchema({
         usedClusterNames,
-        featureSupportLevels,
         pullSecretSet: isEdit,
-        ocpVersions,
         validateUniqueName: true,
         t,
       }),
-    [usedClusterNames, ocpVersions, featureSupportLevels, isEdit, t],
+    [usedClusterNames, isEdit, t],
   );
 
   return [initialValues, validationSchema];
 };
 
-const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps> = ({
+export const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps> = ({
   clusterImages,
   clusterDeployment,
   agentClusterInstall,
@@ -163,5 +160,3 @@ const ClusterDeploymentDetailsStep: React.FC<ClusterDeploymentDetailsStepProps>
     </Formik>
   );
 };
-
-export default ClusterDeploymentDetailsStep;

package/lib/cim/components/ClusterDeployment/{ClusterDetailsFormFields.tsx → clusterDetails/ClusterDetailsFormFields.tsx}

@@ -1,21 +1,26 @@
 import * as React from 'react';
-import { Alert, AlertVariant, FlexItem, Form } from '@patternfly/react-core';
+import { Form } from '@patternfly/react-core';
 import { useFormikContext } from 'formik';
 
-import { OpenShiftVersionDropdown, OpenShiftVersionModal } from '../../../common';
-import { StaticTextField } from '../../../common/components/ui/StaticTextField';
-import { PullSecret } from '../../../common/components/clusters';
-import { OpenshiftVersionOptionType, SupportedCpuArchitecture } from '../../../common/types';
+import {
+  ExternalPlatformsDropdown,
+  isMajorMinorVersionEqualOrGreater,
+  OpenShiftVersionDropdown,
+  OpenShiftVersionModal,
+} from '../../../../common';
+import { StaticTextField } from '../../../../common/components/ui/StaticTextField';
+import { PullSecret } from '../../../../common/components/clusters';
+import { OpenshiftVersionOptionType, SupportedCpuArchitecture } from '../../../../common/types';
 import {
   InputField,
   RichInputField,
   acmClusterNameValidationMessages,
-} from '../../../common/components/ui/formik';
-import { ClusterDetailsValues } from '../../../common/components/clusterWizard/types';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
-import CpuArchitectureDropdown from '../common/CpuArchitectureDropdown';
-import ControlPlaneNodesDropdown from '../../../common/components/clusterConfiguration/ControlPlaneNodesDropdown';
-import { getNetworkType } from '../helpers';
+} from '../../../../common/components/ui/formik';
+import { ClusterDetailsValues } from '../../../../common/components/clusterWizard/types';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
+import CpuArchitectureDropdown from '../../common/CpuArchitectureDropdown';
+import ControlPlaneNodesDropdown from '../../../../common/components/clusterConfiguration/ControlPlaneNodesDropdown';
+import { getNetworkType } from '../../helpers';
 
 export type ClusterDetailsFormFieldsProps = {
   isEditFlow: boolean;
@@ -65,7 +70,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   React.useEffect(() => {
     if (!versions.length && !values.openshiftVersion) {
       const fallbackOpenShiftVersion = allVersions.find((version) => version.default);
-      setFieldValue('customOpenshiftSelect', fallbackOpenShiftVersion);
+      setFieldValue('customOpenshiftSelect', fallbackOpenShiftVersion?.value);
       setFieldValue('openshiftVersion', fallbackOpenShiftVersion?.value);
       setFieldValue('networkType', getNetworkType(fallbackOpenShiftVersion));
     }
@@ -85,23 +90,23 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
     [versions],
   );
 
-  const additionalSelectOptions = React.useMemo(() => {
+  const additionalSelectOption = React.useMemo(() => {
     if (
       values.customOpenshiftSelect &&
-      !selectOptions.some((option) => option.value === values.customOpenshiftSelect?.value)
+      !versions.some((version) => version.value === values.customOpenshiftSelect)
     ) {
-      return [
-        {
-          value: values.customOpenshiftSelect.value,
-          label: values.customOpenshiftSelect.label,
-        },
-      ];
+      return allVersions.find((option) => option.value === values.customOpenshiftSelect);
     }
-    return [];
-  }, [selectOptions, values.customOpenshiftSelect]);
+    return undefined;
+  }, [allVersions, values.customOpenshiftSelect, versions]);
+
+  const allowTNA = React.useMemo(() => {
+    const current =
+      values.customOpenshiftSelect ||
+      versions.find((version) => version.value === values.openshiftVersion)?.version;
 
-  const isDiskEncryptionEnabled =
-    values.enableDiskEncryptionOnMasters || values.enableDiskEncryptionOnWorkers;
+    return isMajorMinorVersionEqualOrGreater(current, '4.19') && values.platform === 'baremetal';
+  }, [values.customOpenshiftSelect, values.openshiftVersion, values.platform, versions]);
 
   return (
     <Form id="wizard-cluster-details__form">
@@ -150,7 +155,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
             versions={versions}
             showReleasesLink={false}
             showOpenshiftVersionModal={() => setOpenshiftVersionModalOpen(true)}
-            customItems={additionalSelectOptions}
+            customItem={additionalSelectOption}
           />
           {openshiftVersionModalOpen && (
             <OpenShiftVersionModal
@@ -163,44 +168,19 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
       <ControlPlaneNodesDropdown
         isDisabled={isEditFlow}
         allowHighlyAvailable={allowHighlyAvailable}
+        allowTNA={allowTNA}
       />
       {!isNutanix && (
         <CpuArchitectureDropdown cpuArchitectures={cpuArchitectures} isDisabled={isEditFlow} />
       )}
+
+      <ExternalPlatformsDropdown isDisabled={isEditFlow} />
+
       {extensionAfter?.['openshiftVersion'] && extensionAfter['openshiftVersion']}
+
       {!isEditFlow && <PullSecret />}
+
       {extensionAfter?.['pullSecret'] && extensionAfter['pullSecret']}
-      {/* <DiskEncryptionControlGroup
-        values={values}
-        isDisabled={isPullSecretSet}
-        isSNO={isSNO({ highAvailabilityMode })}
-      /> */}
-      {isDiskEncryptionEnabled && values.diskEncryptionMode === 'tpmv2' && (
-        <Alert
-          variant={AlertVariant.warning}
-          isInline
-          title={
-            <FlexItem>
-              {t(
-                'ai:To use this encryption method, enable TPMv2 encryption in the BIOS of each selected host.',
-              )}
-            </FlexItem>
-          }
-        />
-      )}
-      {isDiskEncryptionEnabled && values.diskEncryptionMode === 'tang' && (
-        <Alert
-          variant={AlertVariant.warning}
-          isInline
-          title={
-            <FlexItem>
-              {t(
-                'ai:The use of Tang encryption mode to encrypt your disks is only supported for bare metal or vSphere installations on user-provisioned infrastructure.',
-              )}
-            </FlexItem>
-          }
-        />
-      )}
     </Form>
   );
 };

package/lib/cim/components/ClusterDeployment/clusterDetails/index.tsx

@@ -0,0 +1,4 @@
+export * from './ClusterDeploymentDetailsStep';
+export * from './ClusterDeploymentDetailsForm';
+export * from './ACMClusterDeploymentDetailsStep';
+export * from './ClusterDetailsFormFields';

package/lib/cim/components/ClusterDeployment/{AdditionalNTPSourcesDialogToggle.tsx → components/AdditionalNTPSourcesDialogToggle.tsx}

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { useTranslation } from '../../../../common/hooks/use-translation-wrapper';
 
 // TODO we should use hostValidationFailureHints instead of passing this 'action' which is actually a hint
 export const AdditionalNTPSourcesDialogToggle: React.FC = () => {

package/lib/cim/components/ClusterDeployment/components/index.tsx

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

package/lib/cim/components/ClusterDeployment/constants.ts

@@ -18,6 +18,7 @@ export const wizardStepNames = (
   'hosts-selection': t('ai:Cluster hosts'),
   'hosts-discovery': t('ai:Cluster hosts'),
   networking: t('ai:Networking'),
+  'custom-manifests': t('ai:Custom manifests'),
   review: t('ai:Review and create'),
 });
 

package/lib/cim/components/ClusterDeployment/customManifests/ClusterDeploymentCustomManifestsStep.tsx

@@ -0,0 +1,121 @@
+import React from 'react';
+import * as Yup from 'yup';
+import { Formik } from 'formik';
+import { k8sPatch, Patch } from '@openshift-console/dynamic-plugin-sdk';
+import { Alert, AlertActionLink, Grid, GridItem, Text, TextVariants } from '@patternfly/react-core';
+import ExternalLinkAltIcon from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon';
+import { ClusterWizardStepHeader, useTranslation } from '../../../../common';
+import { AgentClusterInstallK8sResource, AgentClusterInstallModel } from '../../../types';
+import { ConfigMapForm, CustomManifestFormType } from './ConfigMapForm';
+import { appendPatch } from '../../../utils';
+
+export const ClusterDeploymentCustomManifestsStep = ({
+  agentClusterInstall,
+}: {
+  agentClusterInstall: AgentClusterInstallK8sResource;
+}) => {
+  const { t } = useTranslation();
+
+  const initialValues: CustomManifestFormType = {
+    configMaps:
+      agentClusterInstall.spec?.manifestsConfigMapRefs?.map(({ name }) => ({
+        name,
+        valid: false,
+      })) || [],
+  };
+
+  const validationSchema = Yup.lazy((values: CustomManifestFormType) =>
+    Yup.object<CustomManifestFormType>({
+      configMaps: Yup.array()
+        .of(
+          Yup.object().shape({
+            name: Yup.string().required(t('ai:Config map name is required')),
+            valid: Yup.boolean().isTrue(t('ai:Config map not found')),
+            manifestNames: Yup.array()
+              .of(Yup.string())
+              .test(
+                'unique-manifests',
+                t(
+                  'ai:Manifest names in each config map should be unique across all referenced config maps.',
+                ),
+                (value) =>
+                  // check if another config map has any manifests with the same names as this one
+                  values.configMaps
+                    .flatMap(({ manifestNames }) => manifestNames)
+                    .filter((v) => value?.includes(v)).length === value?.length,
+              ),
+          }),
+        )
+        .min(
+          agentClusterInstall.spec?.platformType === 'External' ? 1 : 0,
+          t('ai:At least one config map is required'),
+        ),
+    }),
+  );
+
+  const onSubmit = async (values: CustomManifestFormType) => {
+    const patches: Patch[] = [];
+    appendPatch(
+      patches,
+      '/spec/manifestsConfigMapRefs',
+      values.configMaps.map(({ name }) => ({ name })),
+      agentClusterInstall.spec?.manifestsConfigMapRefs,
+    );
+
+    if (patches.length > 0) {
+      await k8sPatch({
+        model: AgentClusterInstallModel,
+        resource: agentClusterInstall,
+        data: patches,
+      });
+    }
+  };
+
+  return (
+    <Grid hasGutter>
+      <GridItem>
+        <ClusterWizardStepHeader>{t('ai:Custom manifests')}</ClusterWizardStepHeader>
+      </GridItem>
+      <GridItem>
+        <Alert
+          variant="info"
+          isInline
+          title={t('ai:Add custom manifests')}
+          actionLinks={[
+            <AlertActionLink
+              key="define-config-map"
+              component={'a'}
+              href={`/k8s/ns/${
+                agentClusterInstall.metadata?.namespace as string
+              }/core~v1~ConfigMap`}
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              {t('ai:Define a config map')} <ExternalLinkAltIcon />
+            </AlertActionLink>,
+          ]}
+        >
+          <Text component={TextVariants.p}>
+            {t(
+              'ai:Define a config map with your custom manifests and select it in the form below.',
+            )}
+          </Text>
+          <Text component={TextVariants.p}>
+            {t(
+              'ai:Manifest names in each config map should be unique across all referenced config maps.',
+            )}
+          </Text>
+        </Alert>
+      </GridItem>
+      <GridItem>
+        <Formik
+          initialValues={initialValues}
+          onSubmit={onSubmit}
+          validationSchema={validationSchema}
+        >
+          <ConfigMapForm namespace={agentClusterInstall.metadata?.namespace as string} />
+        </Formik>
+      </GridItem>
+    </Grid>
+  );
+};