@openshift-assisted/ui-lib 2.9.7-cim → 2.9.9-cim

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

@@ -19,7 +19,7 @@ import {
 } from '../../types';
 import ClusterDeploymentCredentials from './ClusterDeploymentCredentials';
 import { shouldShowClusterCredentials, shouldShowClusterInstallationProgress } from './helpers';
-import { EventsModalButton } from '../../../common/components/ui/eventsModal';
+import { EventsModal } from '../../../common/components/ui/eventsModal';
 import ClusterDeploymentDetailsTable from './ClusterDeploymentDetailsTable';
 import { FetchSecret } from './types';
 import { getClusterProperties, getConsoleUrl } from '../helpers/clusterDeployment';
@@ -45,6 +45,7 @@ const ClusterDeploymentDetails: React.FC<ClusterDeploymentDetailsProps> = ({
   const [progressCardExpanded, setProgressCardExpanded] = React.useState(true);
   const [inventoryCardExpanded, setInventoryCardExpanded] = React.useState(true);
   const [detailsCardExpanded, setDetailsCardExpanded] = React.useState(true);
+  const [isEventsModalOpen, setIsEventsModalOpen] = React.useState(false);
 
   const clusterAgents = agents.filter(
     (a) =>
@@ -60,120 +61,129 @@ const ClusterDeploymentDetails: React.FC<ClusterDeploymentDetailsProps> = ({
   );
   const { t } = useTranslation();
   return (
-    <Stack hasGutter>
-      {shouldShowClusterInstallationProgress(agentClusterInstall) && (
+    <>
+      <Stack hasGutter>
+        {shouldShowClusterInstallationProgress(agentClusterInstall) && (
+          <StackItem>
+            <Card id="cluster-installation-progress-card" isExpanded={progressCardExpanded}>
+              <CardHeader
+                onExpand={() => setProgressCardExpanded(!progressCardExpanded)}
+                toggleButtonProps={{
+                  id: 'progress-card-toggle-button',
+                  'aria-label': 'Cluster installation process',
+                  'aria-labelledby': 'titleId progress-card-toggle-button',
+                  'aria-expanded': progressCardExpanded,
+                }}
+              >
+                <CardTitle id="titleId">{t('ai:Cluster installation process')}</CardTitle>
+              </CardHeader>
+              <CardExpandableContent>
+                <CardBody>
+                  <Stack hasGutter>
+                    {shouldShowClusterCredentials(agentClusterInstall) && (
+                      <StackItem>
+                        <ClusterDeploymentCredentials
+                          clusterDeployment={clusterDeployment}
+                          agentClusterInstall={agentClusterInstall}
+                          agents={clusterAgents}
+                          fetchSecret={fetchSecret}
+                          consoleUrl={getConsoleUrl(clusterDeployment)}
+                        />
+                      </StackItem>
+                    )}
+                    <StackItem>
+                      <ClusterDeploymentKubeconfigDownload
+                        clusterDeployment={clusterDeployment}
+                        agentClusterInstall={agentClusterInstall}
+                        fetchSecret={fetchSecret}
+                      />{' '}
+                      <Button
+                        id="cluster-events-button"
+                        variant={ButtonVariant.link}
+                        style={{ textAlign: 'right' }}
+                        onClick={() => setIsEventsModalOpen(true)}
+                      >
+                        {t('ai:View cluster events')}
+                      </Button>
+                    </StackItem>
+                  </Stack>
+                </CardBody>
+              </CardExpandableContent>
+            </Card>
+          </StackItem>
+        )}
         <StackItem>
-          <Card id="cluster-installation-progress-card" isExpanded={progressCardExpanded}>
+          <Card id="cluster-inventory-card" isExpanded={inventoryCardExpanded}>
             <CardHeader
-              onExpand={() => setProgressCardExpanded(!progressCardExpanded)}
+              onExpand={() => setInventoryCardExpanded(!inventoryCardExpanded)}
               toggleButtonProps={{
-                id: 'progress-card-toggle-button',
-                'aria-label': 'Cluster installation process',
-                'aria-labelledby': 'titleId progress-card-toggle-button',
-                'aria-expanded': progressCardExpanded,
+                id: 'inventory-card-toggle-button',
+                'aria-label': 'Hosts inventory',
+                'aria-labelledby': 'titleId inventory-card-toggle-button',
+                'aria-expanded': inventoryCardExpanded,
               }}
             >
-              <CardTitle id="titleId">{t('ai:Cluster installation process')}</CardTitle>
+              <CardTitle id="titleId">{t('ai:Hosts inventory')}</CardTitle>
             </CardHeader>
             <CardExpandableContent>
               <CardBody>
-                <Stack hasGutter>
-                  {shouldShowClusterCredentials(agentClusterInstall) && (
-                    <StackItem>
-                      <ClusterDeploymentCredentials
-                        clusterDeployment={clusterDeployment}
-                        agentClusterInstall={agentClusterInstall}
-                        agents={clusterAgents}
-                        fetchSecret={fetchSecret}
-                        consoleUrl={getConsoleUrl(clusterDeployment)}
-                      />
-                    </StackItem>
-                  )}
-                  <StackItem>
-                    <ClusterDeploymentKubeconfigDownload
-                      clusterDeployment={clusterDeployment}
-                      agentClusterInstall={agentClusterInstall}
-                      fetchSecret={fetchSecret}
-                    />{' '}
-                    <EventsModalButton
-                      id="cluster-events-button"
-                      entityKind="cluster"
-                      cluster={cluster}
-                      title={t('ai:Cluster Events')}
-                      variant={ButtonVariant.link}
-                      style={{ textAlign: 'right' }}
-                      onFetchEvents={onFetchEvents}
-                      ButtonComponent={Button}
-                      disablePagination
-                    >
-                      {t('ai:View cluster events')}
-                    </EventsModalButton>
-                  </StackItem>
-                </Stack>
+                <ClusterDeploymentDetailsTable
+                  agents={clusterAgents}
+                  agentClusterInstall={agentClusterInstall}
+                />
+              </CardBody>
+            </CardExpandableContent>
+          </Card>
+        </StackItem>
+        <StackItem>
+          <Card id="cluster-details-card" isExpanded={detailsCardExpanded}>
+            <CardHeader
+              onExpand={() => setDetailsCardExpanded(!detailsCardExpanded)}
+              toggleButtonProps={{
+                id: 'details-card-toggle-button',
+                'aria-label': 'Details',
+                'aria-labelledby': 'titleId details-card-toggle-button',
+                'aria-expanded': detailsCardExpanded,
+              }}
+            >
+              <CardTitle id="titleId">{t('ai:Details')}</CardTitle>
+            </CardHeader>
+            <CardExpandableContent>
+              <CardBody>
+                <ClusterPropertiesList
+                  leftItems={[
+                    clusterProperties.name,
+                    clusterProperties.openshiftVersion,
+                    clusterProperties.clusterId,
+                    clusterProperties.installedTimestamp,
+                    clusterProperties.baseDnsDomain,
+                  ]}
+                  rightItems={[
+                    clusterProperties.apiVip,
+                    clusterProperties.ingressVip,
+                    clusterProperties.clusterNetworkCidr,
+                    clusterProperties.clusterNetworkHostPrefix,
+                    clusterProperties.serviceNetworkCidr,
+                  ]}
+                />
               </CardBody>
             </CardExpandableContent>
           </Card>
         </StackItem>
+      </Stack>
+      {isEventsModalOpen && (
+        <EventsModal
+          entityKind="cluster"
+          cluster={cluster}
+          title={t('ai:Cluster Events')}
+          onFetchEvents={onFetchEvents}
+          hostId={undefined}
+          disablePagination
+          isOpen
+          onClose={() => setIsEventsModalOpen(false)}
+        />
       )}
-      <StackItem>
-        <Card id="cluster-inventory-card" isExpanded={inventoryCardExpanded}>
-          <CardHeader
-            onExpand={() => setInventoryCardExpanded(!inventoryCardExpanded)}
-            toggleButtonProps={{
-              id: 'inventory-card-toggle-button',
-              'aria-label': 'Hosts inventory',
-              'aria-labelledby': 'titleId inventory-card-toggle-button',
-              'aria-expanded': inventoryCardExpanded,
-            }}
-          >
-            <CardTitle id="titleId">{t('ai:Hosts inventory')}</CardTitle>
-          </CardHeader>
-          <CardExpandableContent>
-            <CardBody>
-              <ClusterDeploymentDetailsTable
-                agents={clusterAgents}
-                agentClusterInstall={agentClusterInstall}
-              />
-            </CardBody>
-          </CardExpandableContent>
-        </Card>
-      </StackItem>
-      <StackItem>
-        <Card id="cluster-details-card" isExpanded={detailsCardExpanded}>
-          <CardHeader
-            onExpand={() => setDetailsCardExpanded(!detailsCardExpanded)}
-            toggleButtonProps={{
-              id: 'details-card-toggle-button',
-              'aria-label': 'Details',
-              'aria-labelledby': 'titleId details-card-toggle-button',
-              'aria-expanded': detailsCardExpanded,
-            }}
-          >
-            <CardTitle id="titleId">{t('ai:Details')}</CardTitle>
-          </CardHeader>
-          <CardExpandableContent>
-            <CardBody>
-              <ClusterPropertiesList
-                leftItems={[
-                  clusterProperties.name,
-                  clusterProperties.openshiftVersion,
-                  clusterProperties.clusterId,
-                  clusterProperties.installedTimestamp,
-                  clusterProperties.baseDnsDomain,
-                ]}
-                rightItems={[
-                  clusterProperties.apiVip,
-                  clusterProperties.ingressVip,
-                  clusterProperties.clusterNetworkCidr,
-                  clusterProperties.clusterNetworkHostPrefix,
-                  clusterProperties.serviceNetworkCidr,
-                ]}
-              />
-            </CardBody>
-          </CardExpandableContent>
-        </Card>
-      </StackItem>
-    </Stack>
+    </>
   );
 };
 

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

@@ -17,7 +17,7 @@ import { ClusterDeploymentDetailsStepProps, ClusterDeploymentDetailsValues } fro
 import ClusterDeploymentWizardFooter from './ClusterDeploymentWizardFooter';
 import ClusterDeploymentWizardContext from './ClusterDeploymentWizardContext';
 import ClusterDeploymentWizardStep from './ClusterDeploymentWizardStep';
-import { getAICluster, getOCPVersions } from '../helpers';
+import { getAICluster, getNetworkType, getOCPVersions } from '../helpers';
 import {
   AgentClusterInstallK8sResource,
   AgentK8sResource,
@@ -47,7 +47,10 @@ export const useDetailsFormik = ({
   usedClusterNames,
   infraEnv,
   isNutanix,
-}: UseDetailsFormikArgs): [ClusterDetailsValues, Lazy] => {
+}: UseDetailsFormikArgs): [
+  ClusterDetailsValues & { networkType: 'OpenShiftSDN' | 'OVNKubernetes' },
+  Lazy,
+] => {
   const { t } = useTranslation();
   const featureSupportLevels = useFeatureSupportLevel();
   const ocpVersions = getOCPVersions(clusterImages, isNutanix);
@@ -64,12 +67,21 @@ export const useDetailsFormik = ({
     [agentClusterInstall, clusterDeployment, agents, infraEnv],
   );
   const initialValues = React.useMemo(
-    () =>
-      getClusterDetailsInitialValues({
+    () => {
+      const initValues = getClusterDetailsInitialValues({
         managedDomains: [], // not supported
         cluster,
         ocpVersions,
-      }),
+      });
+
+      const ocpVersion = ocpVersions.find(
+        (ocpVersion) => ocpVersion.value === initValues.openshiftVersion,
+      );
+      return {
+        ...initValues,
+        networkType: getNetworkType(ocpVersion),
+      };
+    },
     [], // eslint-disable-line react-hooks/exhaustive-deps
   );
 

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

@@ -15,6 +15,7 @@ import { ClusterDetailsValues } from '../../../common/components/clusterWizard/t
 import { useTranslation } from '../../../common/hooks/use-translation-wrapper';
 import ArmCheckbox from './ArmCheckbox';
 import { SNOControlGroup } from '../../../common';
+import { getNetworkType } from '../helpers';
 
 export type ClusterDetailsFormFieldsProps = {
   isEditFlow: boolean;
@@ -49,7 +50,7 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
   extensionAfter,
   isNutanix,
 }) => {
-  const { values } = useFormikContext<ClusterDetailsValues>();
+  const { values, setFieldValue } = useFormikContext<ClusterDetailsValues>();
   const { name, baseDnsDomain, highAvailabilityMode } = values;
   const nameInputRef = React.useRef<HTMLInputElement>();
   React.useEffect(() => {
@@ -99,7 +100,13 @@ export const ClusterDetailsFormFields: React.FC<ClusterDetailsFormFieldsProps> =
           {t('ai:OpenShift')} {forceOpenshiftVersion}
         </StaticTextField>
       ) : (
-        <OpenShiftVersionSelect versions={versions} />
+        <OpenShiftVersionSelect
+          versions={versions}
+          onChange={(value) => {
+            const ocpVersion = versions.find((v) => v.value === value);
+            setFieldValue('networkType', getNetworkType(ocpVersion));
+          }}
+        />
       )}
       {!isNutanix && (
         <>

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

@@ -38,16 +38,19 @@ export const shouldShowClusterInstallationProgress = (
   agentClusterInstall?: AgentClusterInstallK8sResource,
 ) => {
   const [clusterStatus] = getClusterStatus(agentClusterInstall);
-  return [
-    'preparing-for-installation',
-    'installing',
-    'installing-pending-user-action',
-    'finalizing',
-    'installed',
-    'error',
-    'cancelled',
-    'adding-hosts',
-  ].includes(clusterStatus);
+  return (
+    [
+      'preparing-for-installation',
+      'installing',
+      'installing-pending-user-action',
+      'finalizing',
+      'installed',
+      'error',
+      'cancelled',
+      'adding-hosts',
+      'ready',
+    ].includes(clusterStatus) && !agentClusterInstall?.spec?.holdInstallation
+  );
 };
 
 export const isInstallationInProgress = (agentClusterInstall: AgentClusterInstallK8sResource) => {

package/lib/cim/components/Hypershift/utils/nodepool.ts

@@ -2,7 +2,7 @@ import { AgentK8sResource } from '../../../types';
 import { AgentMachineK8sResource, HostedClusterK8sResource, NodePoolK8sResource } from '../types';
 
 const CLUSTER_NAME_LABEL = 'cluster.x-k8s.io/cluster-name';
-const NODEPOOL_NAME_ANNOTATION = 'cluster.x-k8s.io/cloned-from-name';
+const NODEPOOL_NAME_ANNOTATION = 'hypershift.openshift.io/nodePool';
 
 export const getNodepoolAgents = (
   nodePool: NodePoolK8sResource,
@@ -16,7 +16,8 @@ export const getNodepoolAgents = (
         am.metadata?.namespace ===
           `${hostedCluster.metadata?.namespace || ''}-${hostedCluster.metadata?.name || ''}` &&
         am.metadata?.labels?.[CLUSTER_NAME_LABEL] === hostedCluster.spec.infraID &&
-        am.metadata?.annotations?.[NODEPOOL_NAME_ANNOTATION] === nodePool.metadata?.name &&
+        am.metadata?.annotations?.[NODEPOOL_NAME_ANNOTATION] ===
+          `${nodePool.metadata?.namespace || ''}/${nodePool.metadata?.name || ''}` &&
         am.status?.agentRef?.name &&
         am.status?.agentRef?.namespace,
     )

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

@@ -31,7 +31,6 @@ import {
   RadioField,
   PopoverIcon,
   pullSecretValidationSchema,
-  OCP_STATIC_IP_DOC,
   CheckboxField,
   AdditionalNTPSourcesField,
   richNameValidationSchema,
@@ -42,6 +41,7 @@ import {
   locationValidationMessages,
   ntpSourceValidationSchema,
   CpuArchitecture,
+  getOCPStaticIPDocLink,
 } from '../../../common';
 
 import './infra-env.css';
@@ -118,6 +118,7 @@ type InfraEnvFormProps = {
   onValuesChanged?: (values: EnvironmentStepFormValues) => void;
   pullSecret?: string;
   sshPublicKey?: string;
+  docVersion: string;
 };
 
 const InfraEnvForm: React.FC<InfraEnvFormProps> = ({
@@ -125,6 +126,7 @@ const InfraEnvForm: React.FC<InfraEnvFormProps> = ({
   children,
   pullSecret,
   sshPublicKey,
+  docVersion,
 }) => {
   const { values, setFieldValue } = useFormikContext<EnvironmentStepFormValues>();
   const { t } = useTranslation();
@@ -194,7 +196,13 @@ const InfraEnvForm: React.FC<InfraEnvFormProps> = ({
                                 icon={<ExternalLinkAltIcon />}
                                 iconPosition="right"
                                 isInline
-                                onClick={() => window.open(OCP_STATIC_IP_DOC, '_blank', 'noopener')}
+                                onClick={() =>
+                                  window.open(
+                                    getOCPStaticIPDocLink(docVersion),
+                                    '_blank',
+                                    'noopener',
+                                  )
+                                }
                               >
                                 {t('ai:View documentation')}
                               </Button>
@@ -282,6 +290,7 @@ type InfraEnvFormPageProps = InfraEnvFormProps & {
   formRef: React.Ref<FormikProps<EnvironmentStepFormValues>>;
   pullSecret?: string;
   sshPublicKey?: string;
+  docVersion: string;
 };
 
 export const InfraEnvFormPage: React.FC<InfraEnvFormPageProps> = ({

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

@@ -88,3 +88,8 @@ export const getMajorMinorVersion = (version = '') => {
   const match = /[0-9].[0-9][0-9]?/g.exec(version);
   return match?.[0] || '';
 };
+
+export const getNetworkType = (
+  ocpVersion: OpenshiftVersionOptionType | undefined,
+): 'OVNKubernetes' | 'OpenShiftSDN' =>
+  parseFloat(getMajorMinorVersion(ocpVersion?.version)) >= 4.12 ? 'OVNKubernetes' : 'OpenShiftSDN';

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

@@ -74,6 +74,7 @@ const AddHostModal: React.FC<AddHostModalProps> = ({
             hasDHCP={hasDHCP}
             isIPXE={isIPXE}
             allowEmpty
+            docVersion={docVersion}
           />
         )}
         {dialogType === 'download' && (
@@ -90,6 +91,7 @@ const AddHostModal: React.FC<AddHostModalProps> = ({
                 infraEnv={infraEnv}
                 onReset={agentClusterInstall ? () => setDialogType('config') : undefined}
                 hasDHCP={hasDHCP}
+                docVersion={docVersion}
               />
             )}
           </>
@@ -104,11 +106,13 @@ const GeneratingIsoDownload = ({
   onClose,
   onReset,
   hasDHCP,
+  docVersion,
 }: {
   infraEnv: InfraEnvK8sResource;
   onClose: VoidFunction;
   onReset?: VoidFunction;
   hasDHCP: boolean;
+  docVersion: string;
 }) => {
   const { t } = useTranslation();
   return infraEnv.status?.isoDownloadURL ? (
@@ -117,6 +121,7 @@ const GeneratingIsoDownload = ({
       downloadUrl={infraEnv.status.isoDownloadURL}
       onReset={onReset}
       hasDHCP={hasDHCP}
+      docVersion={docVersion}
     />
   ) : (
     <EmptyState>

package/lib/common/api/accounts-management-service/access-token-api.ts

@@ -3,7 +3,7 @@ import { AccessTokenCfg } from '@openshift-assisted/types/accounts-management-se
 
 export const AccessTokenAPI = {
   makeBaseURI() {
-    return `/api/accounts_mgmt/v1/access_token`;
+    return '/api/accounts_mgmt/v1/access_token';
   },
 
   async fetchPullSecret() {

package/lib/common/api/accounts-management-service/current-account-api.ts

@@ -0,0 +1,13 @@
+import { ocmClient as client } from '../axiosClient';
+import { Account } from '@openshift-assisted/types/accounts-management-service';
+
+export const CurrentAccountApi = {
+  makeBaseURI() {
+    return '/api/accounts_mgmt/v1/current_account';
+  },
+
+  async getCurrentAccount() {
+    const response = await client?.get<Account>(CurrentAccountApi.makeBaseURI());
+    return response?.data;
+  },
+};

package/lib/common/api/accounts-management-service/organizations-api.ts

@@ -0,0 +1,15 @@
+import { ocmClient as client } from '../axiosClient';
+import { Organization } from '@openshift-assisted/types/accounts-management-service';
+
+export const OrganizationsApi = {
+  makeBaseURI() {
+    return '/api/accounts_mgmt/v1/organizations';
+  },
+
+  async getOrganization(orgId: string, fetchCapabilities = true, fetchLabels = false) {
+    const response = await client?.get<Organization>(`${OrganizationsApi.makeBaseURI()}/${orgId}`, {
+      params: { fetchCapabilities, fetchLabels },
+    });
+    return response?.data;
+  },
+};

package/lib/common/api/assisted-service/NewFeatureSupportLevelsAPI.ts

@@ -9,12 +9,16 @@ const NewFeatureSupportLevelsAPI = {
     return `/v2/support-levels`;
   },
 
-  featuresSupportLevel(openshiftVersion: string, cpuArchitecture?: string) {
-    let queryParams = '?';
-    queryParams += openshiftVersion ? `openshift_version=${openshiftVersion}&` : '';
-    queryParams += cpuArchitecture ? `cpu_architecture=${cpuArchitecture}` : '';
+  featuresSupportLevel(openshiftVersion: string, cpuArchitecture?: string, platformType?: string) {
     return clientWithoutCaseConverter.get<FeaturesSupportsLevel>(
-      `${NewFeatureSupportLevelsAPI.makeBaseURI()}/features${queryParams}`,
+      `${NewFeatureSupportLevelsAPI.makeBaseURI()}/features`,
+      {
+        params: {
+          openshift_version: openshiftVersion,
+          cpu_architecture: cpuArchitecture,
+          platform_type: platformType,
+        },
+      },
     );
   },
 

package/lib/common/api/assisted-service/UISettingsAPI.ts

@@ -0,0 +1,24 @@
+import { clientWithoutCaseConverter as client } from '../../api/axiosClient';
+import { Cluster } from '@openshift-assisted/types/./assisted-installer-service';
+
+const config = {
+  headers: {
+    'Content-Type': 'application/json',
+  },
+};
+
+const UISettingsAPI = {
+  makeBaseURI(clusterId: Cluster['id']) {
+    return `/v2/clusters/${clusterId ? clusterId : ''}/ui-settings`;
+  },
+
+  get(clusterId: Cluster['id']) {
+    return client.get<string>(UISettingsAPI.makeBaseURI(clusterId));
+  },
+
+  put(clusterId: Cluster['id'], data: string) {
+    return client.put<string>(UISettingsAPI.makeBaseURI(clusterId), data, config);
+  },
+};
+
+export default UISettingsAPI;

package/lib/common/api/assisted-service/index.ts

@@ -6,3 +6,4 @@ export { default as HostsAPI } from './HostsAPI';
 export { default as InfraEnvsAPI } from './InfraEnvsAPI';
 export { default as EventsAPI } from './EventsAPI';
 export { default as NewFeatureSupportLevelsAPI } from './NewFeatureSupportLevelsAPI';
+export { default as UISettingsAPI } from './UISettingsAPI';

package/lib/common/api/authorization-service/all-apis.ts

@@ -0,0 +1,28 @@
+import { ocmClient as client } from '../axiosClient';
+import {
+  AccessReviewResponse,
+  FeatureReviewResponse,
+  SelfAccessReview,
+} from '@openshift-assisted/types/authorization-service';
+
+export const AuthorizationApi = {
+  makeBaseURI() {
+    return '/api/authorizations/v1/';
+  },
+
+  async selfFeatureReview(featureId: string) {
+    const response = await client?.post<FeatureReviewResponse>(
+      `${AuthorizationApi.makeBaseURI()}/self_feature_review`,
+      { feature: featureId },
+    );
+    return response?.data;
+  },
+
+  async selfAccessReview(params: SelfAccessReview) {
+    const response = await client?.post<AccessReviewResponse>(
+      `${AuthorizationApi.makeBaseURI()}/self_access_review`,
+      params,
+    );
+    return response?.data;
+  },
+};

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

@@ -27,10 +27,10 @@ import { ProxyFieldsType, StatusErrorType } from '../../types';
 import ProxyFields from './ProxyFields';
 import UploadSSH from './UploadSSH';
 import DiscoveryImageTypeControlGroup from './DiscoveryImageTypeControlGroup';
-import { OCP_STATIC_IP_DOC } from '../../config/constants';
+import { getOCPStaticIPDocLink } from '../../config/constants';
 import { useTranslation } from '../../hooks/use-translation-wrapper';
 
-export const StaticIPInfo: React.FC = () => {
+export const StaticIPInfo = ({ docVersion }: { docVersion?: string }) => {
   const { t } = useTranslation();
   return (
     <Alert
@@ -45,7 +45,7 @@ export const StaticIPInfo: React.FC = () => {
         icon={<ExternalLinkAltIcon />}
         iconPosition="right"
         isInline
-        onClick={() => window.open(OCP_STATIC_IP_DOC, '_blank', 'noopener')}
+        onClick={() => window.open(getOCPStaticIPDocLink(docVersion), '_blank', 'noopener')}
       >
         {t('ai:View documentation')}
       </Button>
@@ -77,6 +77,7 @@ type DiscoveryImageConfigFormProps = Proxy & {
   imageType?: ImageType;
   isIPXE?: boolean;
   allowEmpty?: boolean;
+  docVersion: string;
 };
 
 export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> = ({
@@ -91,6 +92,7 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
   hasDHCP,
   isIPXE,
   allowEmpty,
+  docVersion,
 }) => {
   const initialValues: DiscoveryImageFormValues = {
     sshPublicKey: sshPublicKey || '',
@@ -127,7 +129,7 @@ export const DiscoveryImageConfigForm: React.FC<DiscoveryImageConfigFormProps> =
                 </StackItem>
                 {hasDHCP === false && (
                   <StackItem>
-                    <StaticIPInfo />
+                    <StaticIPInfo docVersion={docVersion} />
                   </StackItem>
                 )}
                 <StackItem>

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

@@ -104,7 +104,11 @@ const DiskEncryptionControlGroup = ({
           condition={enableDiskEncryptionOnMasters || (enableDiskEncryptionOnWorkers && !isSNO)}
         >
           <StackItem>
-            <DiskEncryptionMode diskEncryptionMode={diskEncryptionMode} isDisabled={isDisabled} />
+            <DiskEncryptionMode
+              diskEncryptionMode={diskEncryptionMode}
+              isDisabled={isDisabled}
+              tooltipProps={tooltipProps}
+            />
           </StackItem>
         </RenderIf>
       </Stack>