@openshift-assisted/ui-lib 2.46.3 → 2.47.0

package/build/cjs/ocm/components/clusterDetail/ClusterProperties.test.js

@@ -0,0 +1,180 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const ClusterProperties_1 = require("./ClusterProperties");
+const createCluster = (overrides = {}) => (Object.assign({ id: 'test-cluster', name: 'test-cluster', kind: 'Cluster', href: '/api/assisted-install/v2/clusters/test-cluster', openshiftVersion: '4.11', status: 'ready', statusInfo: 'Cluster is ready', machineNetworks: [], clusterNetworks: [], serviceNetworks: [] }, overrides));
+const createMachineNetwork = (cidr) => ({ cidr, clusterId: 'test' });
+const createClusterNetwork = (cidr, hostPrefix) => ({
+    cidr,
+    hostPrefix,
+    clusterId: 'test',
+});
+const createServiceNetwork = (cidr) => ({ cidr, clusterId: 'test' });
+(0, vitest_1.describe)('getStackTypeLabel', () => {
+    (0, vitest_1.describe)('OCP < 4.12 (legacy behavior)', () => {
+        (0, vitest_1.test)('returns "Dual-stack" for valid dual stack with IPv4 primary', () => {
+            const cluster = createCluster({
+                openshiftVersion: '4.11',
+                machineNetworks: [
+                    createMachineNetwork('192.168.1.0/24'),
+                    createMachineNetwork('2001:db8::/64'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('10.128.0.0/14', 23),
+                    createClusterNetwork('fd01::/48', 64),
+                ],
+                serviceNetworks: [
+                    createServiceNetwork('172.30.0.0/16'),
+                    createServiceNetwork('fd02::/112'),
+                ],
+            });
+            (0, vitest_1.expect)((0, ClusterProperties_1.getStackTypeLabel)(cluster)).toBe('Dual-stack');
+        });
+        (0, vitest_1.test)('returns "IPv4" for single stack', () => {
+            const cluster = createCluster({
+                openshiftVersion: '4.11',
+                machineNetworks: [createMachineNetwork('192.168.1.0/24')],
+                clusterNetworks: [createClusterNetwork('10.128.0.0/14', 23)],
+                serviceNetworks: [createServiceNetwork('172.30.0.0/16')],
+            });
+            (0, vitest_1.expect)((0, ClusterProperties_1.getStackTypeLabel)(cluster)).toBe('IPv4');
+        });
+        (0, vitest_1.test)('returns "IPv4" for IPv6 primary (invalid for OCP < 4.12)', () => {
+            const cluster = createCluster({
+                openshiftVersion: '4.11',
+                machineNetworks: [
+                    createMachineNetwork('2001:db8::/64'),
+                    createMachineNetwork('192.168.1.0/24'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('fd01::/48', 64),
+                    createClusterNetwork('10.128.0.0/14', 23),
+                ],
+                serviceNetworks: [
+                    createServiceNetwork('fd02::/112'),
+                    createServiceNetwork('172.30.0.0/16'),
+                ],
+            });
+            (0, vitest_1.expect)((0, ClusterProperties_1.getStackTypeLabel)(cluster)).toBe('IPv4');
+        });
+    });
+    (0, vitest_1.describe)('OCP >= 4.12 (new behavior)', () => {
+        (0, vitest_1.test)('returns "Dual-stack" for IPv4 primary and IPv6 secondary', () => {
+            const cluster = createCluster({
+                openshiftVersion: '4.12',
+                machineNetworks: [
+                    createMachineNetwork('192.168.1.0/24'),
+                    createMachineNetwork('2001:db8::/64'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('10.128.0.0/14', 23),
+                    createClusterNetwork('fd01::/48', 64),
+                ],
+                serviceNetworks: [
+                    createServiceNetwork('172.30.0.0/16'),
+                    createServiceNetwork('fd02::/112'),
+                ],
+            });
+            (0, vitest_1.expect)((0, ClusterProperties_1.getStackTypeLabel)(cluster)).toBe('Dual-stack');
+        });
+        (0, vitest_1.test)('returns "Dual-stack" for IPv6 primary and IPv4 secondary', () => {
+            const cluster = createCluster({
+                openshiftVersion: '4.12',
+                machineNetworks: [
+                    createMachineNetwork('2001:db8::/64'),
+                    createMachineNetwork('192.168.1.0/24'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('fd01::/48', 64),
+                    createClusterNetwork('10.128.0.0/14', 23),
+                ],
+                serviceNetworks: [
+                    createServiceNetwork('fd02::/112'),
+                    createServiceNetwork('172.30.0.0/16'),
+                ],
+            });
+            (0, vitest_1.expect)((0, ClusterProperties_1.getStackTypeLabel)(cluster)).toBe('Dual-stack');
+        });
+        (0, vitest_1.test)('returns "IPv4" for IPv6 primary and IPv6 secondary (not dual-stack)', () => {
+            const cluster = createCluster({
+                openshiftVersion: '4.12',
+                machineNetworks: [
+                    createMachineNetwork('2001:db8::/64'),
+                    createMachineNetwork('2001:db9::/64'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('fd01::/48', 64),
+                    createClusterNetwork('fd02::/48', 64),
+                ],
+                serviceNetworks: [createServiceNetwork('fd03::/112'), createServiceNetwork('fd04::/112')],
+            });
+            (0, vitest_1.expect)((0, ClusterProperties_1.getStackTypeLabel)(cluster)).toBe('IPv4');
+        });
+        (0, vitest_1.test)('returns "IPv4" for IPv4 primary and IPv4 secondary (not dual-stack)', () => {
+            const cluster = createCluster({
+                openshiftVersion: '4.12',
+                machineNetworks: [
+                    createMachineNetwork('192.168.1.0/24'),
+                    createMachineNetwork('10.0.0.0/24'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('10.128.0.0/14', 23),
+                    createClusterNetwork('172.16.0.0/14', 23),
+                ],
+                serviceNetworks: [
+                    createServiceNetwork('172.30.0.0/16'),
+                    createServiceNetwork('172.31.0.0/16'),
+                ],
+            });
+            (0, vitest_1.expect)((0, ClusterProperties_1.getStackTypeLabel)(cluster)).toBe('IPv4');
+        });
+        (0, vitest_1.test)('returns "IPv4" for single stack', () => {
+            const cluster = createCluster({
+                openshiftVersion: '4.12',
+                machineNetworks: [createMachineNetwork('192.168.1.0/24')],
+                clusterNetworks: [createClusterNetwork('10.128.0.0/14', 23)],
+                serviceNetworks: [createServiceNetwork('172.30.0.0/16')],
+            });
+            (0, vitest_1.expect)((0, ClusterProperties_1.getStackTypeLabel)(cluster)).toBe('IPv4');
+        });
+    });
+    (0, vitest_1.describe)('edge cases', () => {
+        (0, vitest_1.test)('handles undefined openshiftVersion', () => {
+            const cluster = createCluster({
+                openshiftVersion: undefined,
+                machineNetworks: [
+                    createMachineNetwork('192.168.1.0/24'),
+                    createMachineNetwork('2001:db8::/64'),
+                ],
+                clusterNetworks: [
+                    createClusterNetwork('10.128.0.0/14', 23),
+                    createClusterNetwork('fd01::/48', 64),
+                ],
+                serviceNetworks: [
+                    createServiceNetwork('172.30.0.0/16'),
+                    createServiceNetwork('fd02::/112'),
+                ],
+            });
+            (0, vitest_1.expect)((0, ClusterProperties_1.getStackTypeLabel)(cluster)).toBe('Dual-stack');
+        });
+        (0, vitest_1.test)('handles empty networks', () => {
+            const cluster = createCluster({
+                openshiftVersion: '4.12',
+                machineNetworks: [],
+                clusterNetworks: [],
+                serviceNetworks: [],
+            });
+            (0, vitest_1.expect)((0, ClusterProperties_1.getStackTypeLabel)(cluster)).toBe('IPv4');
+        });
+        (0, vitest_1.test)('handles undefined networks', () => {
+            const cluster = createCluster({
+                openshiftVersion: '4.12',
+                machineNetworks: undefined,
+                clusterNetworks: undefined,
+                serviceNetworks: undefined,
+            });
+            (0, vitest_1.expect)((0, ClusterProperties_1.getStackTypeLabel)(cluster)).toBe('IPv4');
+        });
+    });
+});
+//# sourceMappingURL=ClusterProperties.test.js.map

package/build/cjs/ocm/components/clusterDetail/ClusterProperties.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClusterProperties.test.js","sourceRoot":"","sources":["../../../../../lib/ocm/components/clusterDetail/ClusterProperties.test.ts"],"names":[],"mappings":"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"}

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

@@ -1,8 +1,12 @@
 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 {
+  isMajorMinorVersionEqualOrGreater,
+  OpenShiftVersionDropdown,
+  OpenShiftVersionModal,
+} from '../../../common';
 import { StaticTextField } from '../../../common/components/ui/StaticTextField';
 import { PullSecret } from '../../../common/components/clusters';
 import { OpenshiftVersionOptionType, SupportedCpuArchitecture } from '../../../common/types';
@@ -100,8 +104,13 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
     return [];
   }, [selectOptions, values.customOpenshiftSelect]);
 
-  const isDiskEncryptionEnabled =
-    values.enableDiskEncryptionOnMasters || values.enableDiskEncryptionOnWorkers;
+  const allowTNA = React.useMemo(() => {
+    const current =
+      values.customOpenshiftSelect?.version ||
+      versions.find((version) => version.value === values.openshiftVersion)?.version;
+
+    return isMajorMinorVersionEqualOrGreater(current, '4.19') && values.platform === 'baremetal';
+  }, [values.customOpenshiftSelect?.version, values.openshiftVersion, values.platform, versions]);
 
   return (
     <Form id="wizard-cluster-details__form">
@@ -163,44 +172,17 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
       <ControlPlaneNodesDropdown
         isDisabled={isEditFlow}
         allowHighlyAvailable={allowHighlyAvailable}
+        allowTNA={allowTNA}
       />
       {!isNutanix && (
         <CpuArchitectureDropdown cpuArchitectures={cpuArchitectures} isDisabled={isEditFlow} />
       )}
+
       {extensionAfter?.['openshiftVersion'] && extensionAfter['openshiftVersion']}
+
       {!isEditFlow && <PullSecret />}
+
       {extensionAfter?.['pullSecret'] && extensionAfter['pullSecret']}
-      {/* <DiskEncryptionControlGroup
-        values={values}
-        isDisabled={isPullSecretSet}
-        isSNO={isSNO({ controlPlaneCount })}
-      /> */}
-      {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/types/k8s/agent-cluster-install.ts

@@ -42,6 +42,7 @@ export type AgentClusterInstallK8sResource = K8sResourceCommon & {
     provisionRequirements: {
       controlPlaneAgents: number;
       workerAgents?: number;
+      arbiterAgents?: number;
     };
     networking: {
       clusterNetwork?: {

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-v6-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/DownloadIso.tsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import { saveAs } from 'file-saver';
 import {
   Alert,
   Button,
@@ -119,9 +118,13 @@ const DownloadIso = ({
       <ModalFooter>
         <Button
           variant={ButtonVariant.primary}
-          onClick={() => downloadUrl && saveAs(downloadUrl)}
           data-testid="download-iso-btn"
           isDisabled={!downloadUrl}
+          component={'a'}
+          target="_blank"
+          href={downloadUrl}
+          download
+          rel="noopener noreferrer"
         >
           {t('ai:Download Discovery ISO')}
         </Button>

package/lib/{ocm → common}/components/clusterConfiguration/OcmTNADisclaimer.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Alert, AlertVariant, List, ListItem } from '@patternfly/react-core';
-import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { useTranslation } from '../../hooks/use-translation-wrapper';
 
 const OcmTNADisclaimer = () => {
   const { t } = useTranslation();