@openshift-assisted/ui-lib 2.14.1-cim → 2.14.3-cim

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

@@ -17,14 +17,13 @@ import { BMCFormProps } from '../Agent/types';
 import { AgentMachineK8sResource } from '../Hypershift/types';
 import { AddHostDropdownProps, ProvisioningConfigResult } from '../InfraEnv/types';
 import { AddHostModalProps, EditBMHModalProps, UploadActionModalProps } from '../modals/types';
+import { Host } from '@openshift-assisted/types/assisted-installer-service';
 
 export type EditAgentModalProps = {
-  agent: AgentK8sResource | undefined;
-  isOpen: boolean;
+  agent: AgentK8sResource;
   usedHostnames: string[] | undefined;
   onClose: () => void;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  onSave: (agent: AgentK8sResource, hostname: string) => Promise<any>;
+  onSave: (host: Host, hostname: string) => Promise<unknown>;
 };
 
 export type AgentTableActions = {
@@ -85,7 +84,6 @@ export type ScaleUpFormValues = Omit<
 
 export type ClusterDeploymentDetailsStepProps = ClusterDeploymentDetailsProps & {
   onSaveDetails: (values: ClusterDeploymentDetailsValues) => Promise<unknown>;
-  onClose: () => void;
   isPreviewOpen: boolean;
   isNutanix: boolean;
 };
@@ -98,7 +96,6 @@ export type ClusterDeploymentDetailsNetworkingProps = Pick<
   agentClusterInstall: AgentClusterInstallK8sResource;
   agents: AgentK8sResource[];
   onSaveNetworking: (values: ClusterDeploymentNetworkingValues) => Promise<string | void>;
-  onClose: () => void;
   fetchInfraEnv: (name: string, namespace: string) => Promise<InfraEnvK8sResource>;
   isPreviewOpen: boolean;
   isNutanix: boolean;
@@ -115,7 +112,6 @@ export type ClusterDeploymentHostSelectionStepProps = Omit<
   'onHostSelect' | 'onAutoSelectChange'
 > & {
   onSaveHostsSelection: (values: ClusterDeploymentHostsSelectionValues) => Promise<string | void>;
-  onClose: () => void;
 };
 
 export type ClusterDeploymentHostsDiscoveryStepProps = Omit<
@@ -123,7 +119,6 @@ export type ClusterDeploymentHostsDiscoveryStepProps = Omit<
   'usedHostnames'
 > & {
   onSaveHostsDiscovery: () => Promise<void>;
-  onClose: () => void;
 };
 
 export type ClusterDeploymentWizardProps = {
@@ -146,6 +141,7 @@ export type ClusterDeploymentWizardProps = {
   clusterDeployment: ClusterDeploymentK8sResource;
   agentClusterInstall: AgentClusterInstallK8sResource;
   agents: AgentK8sResource[];
+  bareMetalHosts: BareMetalHostK8sResource[];
   aiConfigMap?: ConfigMapK8sResource;
   infraEnv?: InfraEnvK8sResource;
   infraNMStates: NMStateK8sResource[];
@@ -155,7 +151,8 @@ export type ClusterDeploymentWizardProps = {
   setPreviewOpen: (open: boolean) => void;
   fetchManagedClusters: () => Promise<K8sResourceCommon[]>;
   fetchKlusterletAddonConfig: () => Promise<K8sResourceCommon[]>;
-  onSaveAgent: EditAgentModalProps['onSave'];
+  onChangeHostname: ClusterDeploymentHostsDiscoveryStepProps['onChangeHostname'];
+  onChangeBMHHostname: ClusterDeploymentHostsDiscoveryStepProps['onChangeBMHHostname'];
   onSaveBMH: EditBMHModalProps['onEdit'];
   onSaveISOParams?: AddHostModalProps['onSaveISOParams'];
   onSaveHostsDiscovery: ClusterDeploymentHostsDiscoveryStepProps['onSaveHostsDiscovery'];
@@ -225,7 +222,7 @@ export type ClusterDeploymentHostsDiscoveryProps = AddHostDropdownProps & {
   aiConfigMap?: ConfigMapK8sResource;
   infraNMStates: NMStateK8sResource[];
 
-  onSaveAgent: EditAgentModalProps['onSave'];
+  onChangeHostname: InfraEnvAgentTableProps['onChangeHostname'];
   onEditRole: ClusterDeploymentHostDiscoveryTableProps['onEditRole'];
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
   onSaveBMH: EditBMHModalProps['onEdit'];

package/lib/cim/components/ClusterDeployment/use-networking-formik.ts

@@ -17,7 +17,7 @@ import {
   HostSubnets,
   hostPrefixValidationSchema,
   ipBlockValidationSchema,
-  vipValidationSchema,
+  vipArrayValidationSchema,
   sshPublicKeyValidationSchema,
   hostSubnetValidationSchema,
   httpProxyValidationSchema,
@@ -50,8 +50,8 @@ const getNetworkConfigurationValidationSchema = (
       clusterNetworkHostPrefix: hostPrefixValidationSchema(values.clusterNetworkCidr),
       clusterNetworkCidr: ipBlockValidationSchema(values.serviceNetworkCidr),
       serviceNetworkCidr: ipBlockValidationSchema(values.clusterNetworkCidr),
-      apiVip: vipValidationSchema(hostSubnets, values, initialValues.apiVip),
-      ingressVip: vipValidationSchema(hostSubnets, values, initialValues.ingressVip),
+      apiVips: vipArrayValidationSchema(hostSubnets, values, initialValues.apiVips),
+      ingressVips: vipArrayValidationSchema(hostSubnets, values, initialValues.ingressVips),
       sshPublicKey: sshPublicKeyValidationSchema,
       hostSubnet: hostSubnetValidationSchema,
       httpProxy: httpProxyValidationSchema({ values, pairValueName: 'httpsProxy' }),

package/lib/cim/components/Hypershift/DetailsPage/HypershiftKubeconfigDownload.tsx

@@ -15,8 +15,10 @@ const HypershiftKubeconfigDownload = ({
   fetchSecret,
 }: HypershiftKubeconfigDownloadProps) => {
   const { t } = useTranslation();
+  const kubeconfigSecretName = hostedCluster.status?.customkubeconfig
+    ? hostedCluster.status.customkubeconfig?.name
+    : hostedCluster.status?.kubeconfig?.name;
   const handleKubeconfigDownload = async () => {
-    const kubeconfigSecretName = hostedCluster.status?.kubeconfig?.name;
     const kubeconfigSecretNamespace = hostedCluster.metadata?.namespace;
 
     if (kubeconfigSecretName && kubeconfigSecretNamespace) {
@@ -41,7 +43,7 @@ const HypershiftKubeconfigDownload = ({
       variant={ButtonVariant.secondary}
       // eslint-disable-next-line @typescript-eslint/no-misused-promises
       onClick={handleKubeconfigDownload}
-      isDisabled={!hostedCluster.status?.kubeconfig?.name}
+      isDisabled={!kubeconfigSecretName}
     >
       {t('ai:Download kubeconfig')}
     </Button>

package/lib/cim/components/Hypershift/types.ts

@@ -133,11 +133,11 @@ export type HostedClusterK8sResource = K8sResourceCommon & {
         endpointAccess: 'Public';
         kubeCloudControllerCreds: { name?: string };
         nodePoolManagementCreds: { name?: string };
-        region: 'us-west-2';
+        region: string;
         resourceTags: [
           {
-            key: 'kubernetes.io/cluster/feng-hs-scale-74zxh';
-            value: 'owned';
+            key: string;
+            value: string;
           },
         ];
       };
@@ -157,6 +157,9 @@ export type HostedClusterK8sResource = K8sResourceCommon & {
     kubeconfig?: {
       name: string;
     };
+    customkubeconfig?: {
+      name: string;
+    };
     kubeadminPassword?: {
       name: string;
     };

package/lib/cim/components/InfraEnv/InfraEnvAgentTable.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { Button, Stack, StackItem } from '@patternfly/react-core';
 import { DropdownItem } from '@patternfly/react-core/deprecated';
-import noop from 'lodash-es/noop.js';
 
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
 import {
@@ -33,12 +32,12 @@ import {
 } from '../../../common';
 import { InfraEnvAgentTableProps } from '../ClusterDeployment/types';
 import { MassApproveAgentModal, MassDeleteAgentModal } from '../modals';
-import { MassChangeHostnameModalProps } from '../../../common/components/hosts/MassChangeHostnameModal';
 import MassApproveAction from '../modals/MassApproveAction';
 import { usePagination } from '../../../common/components/hosts/usePagination';
 import InfraTableToolbar from './InfraTableToolbar';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import { agentStatus, bmhStatus } from '../helpers/agentStatus';
+import { onAgentChangeHostname } from '../helpers';
 
 type NoFilterMatchStateProps = {
   onClearFilters: VoidFunction;
@@ -205,19 +204,6 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
     <DeleteHostAction key="delete" onDeleteHost={() => setMassDeleteOpen(!isMassDeleteOpen)} />,
   ];
 
-  const onAgentChangeHostname: MassChangeHostnameModalProps['onChangeHostname'] = async (
-    host,
-    hostname,
-  ) => {
-    const agent = agents.find((a) => a.metadata?.uid === host.id);
-    if (agent) {
-      return onChangeHostname(agent, hostname);
-    } else {
-      const bmh = bareMetalHosts.find((bmh) => bmh.metadata?.uid === host.id);
-      return bmh ? onChangeBMHHostname(bmh, hostname) : noop;
-    }
-  };
-
   const paginationProps = usePagination(hosts.length);
 
   return (
@@ -272,7 +258,12 @@ const InfraEnvAgentTable: React.FC<InfraEnvAgentTableProps> = ({
           isOpen={isMassChangeHostOpen}
           hosts={hosts}
           selectedHostIDs={selectedHostIDs}
-          onChangeHostname={onAgentChangeHostname}
+          onChangeHostname={onAgentChangeHostname(
+            agents,
+            bareMetalHosts,
+            onChangeHostname,
+            onChangeBMHHostname,
+          )}
           onClose={() => setMassChangeHostOpen(false)}
           canChangeHostname={canChangeHostname(agents, agentStatuses, bareMetalHosts, t)}
         />

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

@@ -1,7 +1,7 @@
 import { AgentStatus, getAgentStatusKey } from './status';
 import { Host } from '@openshift-assisted/types/assisted-installer-service';
 import { AgentK8sResource, BareMetalHostK8sResource } from '../../types';
-import { INFRAENV_AGENTINSTALL_LABEL_KEY } from '../common/constants';
+import { AGENT_BMH_NAME_LABEL_KEY, INFRAENV_AGENTINSTALL_LABEL_KEY } from '../common/constants';
 
 const AGENT_FOR_SELECTION_STATUSES: AgentStatus[] = [
   'known',
@@ -33,3 +33,32 @@ export const getInfraEnvNameOfAgent = (resource?: AgentK8sResource | BareMetalHo
 
 export const getClusterNameOfAgent = (agent?: AgentK8sResource) =>
   agent?.spec?.clusterDeploymentName?.name;
+
+type OnAgentChangeHostname<A = AgentK8sResource, B = BareMetalHostK8sResource> = (
+  agents: A[],
+  bmhs: B[],
+  onChangeHostname: (agent: A, hostname: string) => Promise<unknown>,
+  onChangeBMHHostname: (bmh: B, hostname: string) => Promise<unknown>,
+) => (host: Host, hostname: string) => Promise<unknown>;
+
+export const onAgentChangeHostname: OnAgentChangeHostname<
+  AgentK8sResource,
+  BareMetalHostK8sResource
+> = (agents, bmhs, onChangeHostname, onChangeBMHHostname) => (host, hostname) => {
+  const agent = agents.find((a) => a.metadata?.uid === host.id);
+  let bmh: BareMetalHostK8sResource | undefined;
+  if (agent) {
+    const bmhName = agent.metadata?.labels?.[AGENT_BMH_NAME_LABEL_KEY];
+    if (!bmhName) {
+      return onChangeHostname(agent, hostname);
+    }
+    // If Agent is backed by BMH, we need to update hostname on BMH
+    bmh = bmhs.find(
+      (bmh) =>
+        bmh.metadata?.namespace === agent.metadata?.namespace && bmh.metadata?.name === bmhName,
+    );
+  } else {
+    bmh = bmhs.find((bmh) => bmh.metadata?.uid === host.id);
+  }
+  return bmh ? onChangeBMHHostname(bmh, hostname) : Promise.resolve(undefined);
+};

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

@@ -135,14 +135,18 @@ export const getAICluster = ({
     name: clusterDeployment.spec?.clusterName,
     baseDnsDomain: clusterDeployment.spec?.baseDomain,
     openshiftVersion: installVersion,
-    apiVips: [
-      {
-        ip: agentClusterInstall?.status?.apiVIP || agentClusterInstall?.spec?.apiVIP,
-      },
-    ],
-    ingressVips: [
-      { ip: agentClusterInstall?.status?.ingressVIP || agentClusterInstall?.spec?.apiVIP },
-    ],
+    apiVips:
+      agentClusterInstall?.status?.apiVIP || agentClusterInstall?.spec?.apiVIP
+        ? [
+            {
+              ip: agentClusterInstall?.status?.apiVIP || agentClusterInstall?.spec?.apiVIP,
+            },
+          ]
+        : [],
+    ingressVips:
+      agentClusterInstall?.status?.ingressVIP || agentClusterInstall?.spec?.ingressVIP
+        ? [{ ip: agentClusterInstall?.status?.ingressVIP || agentClusterInstall?.spec?.ingressVIP }]
+        : [],
     highAvailabilityMode:
       agentClusterInstall?.spec?.provisionRequirements?.controlPlaneAgents === 1 ? 'None' : 'Full',
     status,

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

@@ -7,11 +7,12 @@ const EditAgentModal: React.FC<EditAgentModalProps> = ({ agent, onSave, ...rest
   const [host] = agent ? getAIHosts([agent]) : [];
   return (
     <EditHostModal
+      isOpen
       host={host}
       inventory={agent?.status?.inventory}
       {...rest}
       onSave={async ({ hostname }) => {
-        agent && (await onSave(agent, hostname));
+        agent && (await onSave(host, hostname));
         rest.onClose();
       }}
     />

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

@@ -25,6 +25,8 @@ import EditAgentModal from './EditAgentModal';
 import { getAgentsHostsNames } from '../ClusterDeployment/helpers';
 import { getErrorMessage } from '../../../common/utils';
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
+import { onAgentChangeHostname } from '../helpers';
+import { BareMetalHostK8sResource } from '../../types';
 
 const getAgentsToAdd = (
   selectedHostIds: ScaleUpFormValues['selectedHostIds'] | ScaleUpFormValues['autoSelectedHostIds'],
@@ -56,7 +58,9 @@ type ScaleUpModalProps = {
   addHostsToCluster: (agentsToAdd: AgentK8sResource[]) => Promise<void>;
   clusterDeployment: ClusterDeploymentK8sResource;
   agents: AgentK8sResource[];
+  bareMetalHosts: BareMetalHostK8sResource[];
   onChangeHostname: (agent: AgentK8sResource, hostname: string) => Promise<AgentK8sResource>;
+  onChangeBMHHostname: (bmh: BareMetalHostK8sResource, hostname: string) => Promise<unknown>;
   onSetInstallationDiskId: AgentTableActions['onSetInstallationDiskId'];
   isNutanix: boolean;
 };
@@ -67,7 +71,9 @@ const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
   addHostsToCluster,
   clusterDeployment,
   agents,
+  bareMetalHosts,
   onChangeHostname,
+  onChangeBMHHostname,
   onSetInstallationDiskId,
   isNutanix,
 }) => {
@@ -176,9 +182,13 @@ const ScaleUpModal: React.FC<ScaleUpModalProps> = ({
       {editAgent && (
         <EditAgentModal
           agent={editAgent}
-          isOpen
           onClose={() => setEditAgent(undefined)}
-          onSave={onChangeHostname}
+          onSave={onAgentChangeHostname(
+            agents,
+            bareMetalHosts,
+            onChangeHostname,
+            onChangeBMHHostname,
+          )}
           usedHostnames={getAgentsHostsNames(clusterAgents)}
         />
       )}

package/lib/common/components/clusterWizard/networkingSteps/AvailableSubnetsControl.tsx

@@ -1,68 +1,11 @@
 import React from 'react';
 import { Alert, AlertActionLink, AlertVariant, Popover } from '@patternfly/react-core';
-import { HostSubnet, HostSubnets } from '../../../types/clusters';
-import { Cluster, Host } from '@openshift-assisted/types/assisted-installer-service';
+import { HostSubnets } from '../../../types/clusters';
+import { Host } from '@openshift-assisted/types/assisted-installer-service';
 import { SelectField } from '../../ui';
 import { NO_SUBNET_SET } from '../../../config';
 import { useTranslation } from '../../../hooks/use-translation-wrapper';
 
-interface SubnetHelperTextProps {
-  matchingSubnet: HostSubnet;
-  hosts: Cluster['hosts'];
-}
-
-const SubnetHelperText = ({ matchingSubnet, hosts }: SubnetHelperTextProps) => {
-  const { t } = useTranslation();
-  const excludedHosts =
-    hosts?.filter(
-      (host) =>
-        !['disabled', 'disconnected'].includes(host.status) &&
-        !matchingSubnet.hostIDs.includes(host.requestedHostname || ''),
-    ) || [];
-
-  // Workaround for bug in CIM backend. hostIDs are empty
-  if (excludedHosts.length === 0 || !matchingSubnet.hostIDs.length) {
-    return null;
-  }
-
-  const actionLinks = (
-    <Popover
-      position="right"
-      bodyContent={
-        <ul>
-          {excludedHosts
-            .sort(
-              (hostA, hostB) =>
-                hostA.requestedHostname?.localeCompare(hostB.requestedHostname || '') || 0,
-            )
-            .map((host) => (
-              <li key={host.id}>{host.requestedHostname || host.id}</li>
-            ))}
-        </ul>
-      }
-      minWidth="30rem"
-      maxWidth="50rem"
-    >
-      <AlertActionLink id="form-input-hostSubnet-field-helper-view-excluded">
-        {t('ai:View {{count}} affected host', {
-          count: excludedHosts.length,
-        })}
-      </AlertActionLink>
-    </Popover>
-  );
-
-  return (
-    <Alert
-      title={t('ai:This subnet range is not available on all hosts')}
-      variant={AlertVariant.warning}
-      actionLinks={actionLinks}
-      isInline
-    >
-      {t('ai:Hosts outside of this range will not be included in the new cluster.')}
-    </Alert>
-  );
-};
-
 export interface AvailableSubnetsControlProps {
   hostSubnets: HostSubnets;
   hosts: Host[];
@@ -79,14 +22,60 @@ export const AvailableSubnetsControl = ({
   const { t } = useTranslation();
   const getHelperText = (value: string) => {
     const matchingSubnet = hostSubnets.find((hn) => hn.subnet === value);
-    if (matchingSubnet) {
+    if (matchingSubnet && isMultiNodeCluster) {
+      const excludedHosts =
+        hosts?.filter(
+          (host) =>
+            !['disabled', 'disconnected'].includes(host.status) &&
+            !matchingSubnet.hostIDs.includes(host.requestedHostname || ''),
+        ) || [];
+
+      // Workaround for bug in CIM backend. hostIDs are empty
+      if (excludedHosts.length === 0 || !matchingSubnet.hostIDs.length) {
+        return undefined;
+      }
+
+      const actionLinks = (
+        <Popover
+          position="right"
+          bodyContent={
+            <ul>
+              {excludedHosts
+                .sort(
+                  (hostA, hostB) =>
+                    hostA.requestedHostname?.localeCompare(hostB.requestedHostname || '') || 0,
+                )
+                .map((host) => (
+                  <li key={host.id}>{host.requestedHostname || host.id}</li>
+                ))}
+            </ul>
+          }
+          minWidth="30rem"
+          maxWidth="50rem"
+        >
+          <AlertActionLink id="form-input-hostSubnet-field-helper-view-excluded">
+            {t('ai:View {{count}} affected host', {
+              count: excludedHosts.length,
+            })}
+          </AlertActionLink>
+        </Popover>
+      );
+
       return (
-        isMultiNodeCluster && <SubnetHelperText matchingSubnet={matchingSubnet} hosts={hosts} />
+        <Alert
+          title={t('ai:This subnet range is not available on all hosts')}
+          variant={AlertVariant.warning}
+          actionLinks={actionLinks}
+          isInline
+        >
+          {t('ai:Hosts outside of this range will not be included in the new cluster.')}
+        </Alert>
       );
     }
 
     return undefined;
   };
+
   const hostSubnetLength = hostSubnets.length;
   return (
     <SelectField

package/lib/common/components/clusterWizard/networkingSteps/VirtualIPControlGroup.tsx

@@ -122,7 +122,7 @@ export const VirtualIPControlGroup = ({
         <>
           <FormikStaticField
             label={t('ai:API IP')}
-            name="apiVip"
+            name="apiVips.0.ip"
             helperText={apiVipHelperText}
             value={selectApiVip(cluster)}
             isValid={!apiVipFailedValidationMessage}
@@ -136,7 +136,7 @@ export const VirtualIPControlGroup = ({
           </FormikStaticField>
           <FormikStaticField
             label={t('ai:Ingress IP')}
-            name="ingressVip"
+            name="ingressVips.0.ip"
             helperText={ingressVipHelperText}
             value={selectIngressVip(cluster)}
             isValid={!ingressVipFailedValidationMessage}
@@ -153,13 +153,13 @@ export const VirtualIPControlGroup = ({
         <>
           <InputField
             label={t('ai:API IP')}
-            name="apiVip"
+            name="apiVips.0.ip"
             helperText={apiVipHelperText}
             isRequired
             isDisabled={!hostSubnets.length || values.hostSubnet === NO_SUBNET_SET}
           />
           <InputField
-            name="ingressVip"
+            name="ingressVips.0.ip"
             label={t('ai:Ingress IP')}
             helperText={ingressVipHelperText}
             isRequired

package/lib/common/components/hosts/EditHostForm.tsx

@@ -56,6 +56,7 @@ const EditHostForm = ({
   onHostSaveError,
   getEditErrorMessage,
 }: EditHostFormProps) => {
+  const { t } = useTranslation();
   const hostnameInputRef = React.useRef<HTMLInputElement>();
   const [isSaveInProgress, setIsSaveInProgress] = React.useState<boolean>(false);
 
@@ -71,7 +72,7 @@ const EditHostForm = ({
     hostId: host.id,
     hostname: requestedHostname || '',
   };
-  const { t } = useTranslation();
+
   return (
     <Formik
       validateOnMount
@@ -110,11 +111,19 @@ const EditHostForm = ({
                 status={status as StatusErrorType}
                 onClose={() => setStatus({ error: null })}
               />
-              <Alert
-                variant={AlertVariant.info}
-                title={t('ai:This name will replace the original discovered hostname.')}
-                isInline
-              />
+              {canHostnameBeChanged(host.status) ? (
+                <Alert
+                  variant={AlertVariant.info}
+                  title={t('ai:This name will replace the original discovered hostname.')}
+                  isInline
+                />
+              ) : (
+                <Alert
+                  variant={AlertVariant.warning}
+                  title={t('ai:The hostname cannot be changed.')}
+                  isInline
+                />
+              )}
               <StaticTextField name="discoveredHostname" label={t('ai:Discovered hostname')}>
                 {hostname || ''}
               </StaticTextField>
@@ -134,6 +143,7 @@ const EditHostForm = ({
               data-testid="change-hostname-form__button-change"
               type={ButtonType.submit}
               isDisabled={isSubmitting || !isValid || !dirty}
+              isLoading={isSubmitting}
             >
               {t('ai:Change')}
             </Button>

package/lib/common/components/ui/formik/validationSchemas.ts

@@ -3,6 +3,8 @@ import { Address4, Address6 } from 'ip-address';
 import isCIDR from 'is-cidr';
 import { isInSubnet } from 'is-in-subnet';
 import * as Yup from 'yup';
+import { head } from 'lodash-es';
+import parseUrl from 'parse-url';
 
 import { TFunction } from 'i18next';
 import {
@@ -27,7 +29,6 @@ import {
 } from './constants';
 import { allSubnetsIPv4, getAddress, trimCommaSeparatedList, trimSshPublicKey } from './utils';
 import { selectApiVip, selectIngressVip } from '../../../selectors';
-import { head } from 'lodash-es';
 import { ClusterDetailsValues } from '../../clusterWizard/types';
 
 const ALPHANUMERIC_REGEX = /^[a-zA-Z0-9]+$/;
@@ -45,10 +46,6 @@ const IP_V4_ZERO = '0.0.0.0';
 const IP_V6_ZERO = '0000:0000:0000:0000:0000:0000:0000:0000';
 const MAC_REGEX = /^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$/;
 const HOST_NAME_REGEX = /^[^.]{1,63}(?:[.][^.]{1,63})*$/;
-
-// Source of information: https://github.com/metal3-io/baremetal-operator/blob/main/docs/api.md#baremetalhost-spec
-const BMC_REGEX =
-  /^((redfish-virtualmedia|idrac-virtualmedia)(\+https?)?:(\/\/([a-z0-9\-._~%!$&'()*+,;=]+@)?([a-z0-9\-._~%]+|\[[a-f0-9:.]+\]|\[v[a-f0-9][a-z0-9\-._~%!$&'()*+,;=:]+\])(:[0-9]+)?(\/[a-z0-9\-._~%!$&'()*+,;=:@]+)*\/?|(\/?[a-z0-9\-._~%!$&'()*+,;=:@]+(\/[a-z0-9\-._~%!$&'()*+,;=:@]+)*\/?)?)|([a-z0-9\-._~%!$&'()*+,;=@]+(\/[a-z0-9\-._~%!$&'()*+,;=:@]+)*\/?|(\/[a-z0-9\-._~%!$&'()*+,;=:@]+)+\/?))(\?[a-z0-9\-._~%!$&'()*+,;=:@/?]*)?(#[a-z0-9\-._~%!$&'()*+,;=:@/?]*)?$/i;
 const LOCATION_CHARS_REGEX = /^[a-zA-Z0-9-._]*$/;
 
 export const nameValidationSchema = (
@@ -318,7 +315,7 @@ export const vipArrayValidationSchema = <T extends Yup.Maybe<Yup.AnyObject>>(
   values: NetworkConfigurationValues,
   initialValues?: ApiVip[] | IngressVip[],
 ) =>
-  (values.apiVips?.length && values.managedNetworkingType === 'clusterManaged'
+  (values.managedNetworkingType === 'clusterManaged'
     ? Yup.array<T>().of(
         Yup.object({
           clusterId: Yup.string(),
@@ -643,10 +640,16 @@ export const day2ApiVipValidationSchema = Yup.string().test(
 export const bmcAddressValidationSchema = (t: TFunction) => {
   const bmcAddressValidationMessagesList = bmcAddressValidationMessages(t);
 
-  return Yup.string().required().matches(BMC_REGEX, {
-    message: bmcAddressValidationMessagesList.INVALID_VALUE,
-    excludeEmptyString: true,
-  });
+  return Yup.string()
+    .required()
+    .test('valid-bmc-address', bmcAddressValidationMessagesList.INVALID_VALUE, (val) => {
+      try {
+        const url = parseUrl(val);
+        return ['redfish-virtualmedia', 'idrac-virtualmedia'].includes(url.protocol as string);
+      } catch (error) {
+        return false;
+      }
+    });
 };
 export const locationValidationSchema = (t: TFunction) => {
   const locationValidationMessagesList = locationValidationMessages(t);

package/lib/common/config/constants.ts

@@ -33,7 +33,7 @@ export const hostRoles = (t: TFunction): HostRole[] => [
   },
   {
     value: 'worker',
-    label: t('ai:Worker'),
+    label: t('ai:Worker', { count: 1 }),
     description: t(
       'ai:Runs application workloads. Connect at least 5 hosts to enable dedicated workers.',
     ),

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@openshift-assisted/locales": "2.14.1-cim",
-    "@openshift-assisted/types": "2.14.1-cim",
+    "@openshift-assisted/locales": "2.14.3-cim",
+    "@openshift-assisted/types": "2.14.3-cim",
     "@openshift-console/dynamic-plugin-sdk": "0.0.3",
     "@patternfly/patternfly": "5.2.0",
     "@patternfly/react-code-editor": "5.2.0",
@@ -25,6 +25,7 @@
     "is-in-subnet": "^4",
     "js-yaml": "^4.1.0",
     "lodash-es": "^4.17.21",
+    "parse-url": "^9.2.0",
     "prism-react-renderer": "^1.1.1",
     "react-error-boundary": "^3.1.4",
     "react-measure": "^2.5.2",
@@ -139,5 +140,5 @@
       ]
     }
   },
-  "version": "2.14.1-cim"
+  "version": "2.14.3-cim"
 }

package/build/@types/cim/components/ClusterDeployment/ClusterDeploymentCreateProgress.d.ts

@@ -1,10 +0,0 @@
-import * as React from 'react';
-import { AgentClusterInstallK8sResource } from '../../types';
-type ClusterDeploymentCreateProgressProps = {
-    agentClusterInstall: AgentClusterInstallK8sResource;
-    toDetails: VoidFunction;
-    toListView: VoidFunction;
-};
-declare const ClusterDeploymentCreateProgress: React.FC<ClusterDeploymentCreateProgressProps>;
-export default ClusterDeploymentCreateProgress;
-//# sourceMappingURL=ClusterDeploymentCreateProgress.d.ts.map

package/build/@types/cim/components/ClusterDeployment/ClusterDeploymentCreateProgress.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ClusterDeploymentCreateProgress.d.ts","sourceRoot":"","sources":["../../../../../lib/cim/components/ClusterDeployment/ClusterDeploymentCreateProgress.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAc/B,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAO7D,KAAK,oCAAoC,GAAG;IAC1C,mBAAmB,EAAE,8BAA8B,CAAC;IACpD,SAAS,EAAE,YAAY,CAAC;IACxB,UAAU,EAAE,YAAY,CAAC;CAC1B,CAAC;AAEF,QAAA,MAAM,+BAA+B,EAAE,KAAK,CAAC,EAAE,CAAC,oCAAoC,CAiDnF,CAAC;AAEF,eAAe,+BAA+B,CAAC"}