Bump AI Lib to 2.13.0-cim (stolostron#4093)

* Update Assisted Installer UI Lib to 2.13.0-cim

Signed-off-by: jgyselov <jgyselov@redhat.com>

* Allow selecting OpenShift version when creating infraEnv

Signed-off-by: jgyselov <jgyselov@redhat.com>

* Filter OpenShift versions based on availability in AgentServiceConfig

Signed-off-by: jgyselov <jgyselov@redhat.com>

* Fix formatting

Signed-off-by: jgyselov <jgyselov@redhat.com>

---------

Signed-off-by: jgyselov <jgyselov@redhat.com>

Author: jgyselov

frontend/package-lock.json

@@ -43,8 +43,8 @@
     "@mui/material": "^5.11.1",
     "@octokit/rest": "19.0.3",
     "@octokit/types": "6.40.0",
-    "@openshift-assisted/locales": "2.12.1-cim",
-    "@openshift-assisted/ui-lib": "2.12.1-cim",
+    "@openshift-assisted/locales": "2.13.0-cim",
+    "@openshift-assisted/ui-lib": "2.13.0-cim",
     "@patternfly-labs/react-form-wizard": "^1.32.0",
     "@patternfly/patternfly": "4.196.7",
     "@patternfly/react-charts": "^6.74.3",

frontend/package.json

@@ -30,6 +30,7 @@ import {
 import React from 'react'
 import { FieldName } from './types'
 import { getFieldLabels } from './hypershift/utils'
+import { getFirstAgentServiceConfig } from '../../../../../InfraEnvironments/InfraEnvironmentsPage'
 
 type FormControl = {
   active: ClusterDetailsValues & {
@@ -120,7 +121,7 @@ export const getExtensionAfter = ({
 })
 
 const DetailsForm: React.FC<DetailsFormProps> = ({ control, handleChange, controlProps }) => {
-  const { clusterDeploymentsState, clusterImageSetsState } = useSharedAtoms()
+  const { clusterDeploymentsState, clusterImageSetsState, agentServiceConfigsState } = useSharedAtoms()
   const clusterDeployments = useRecoilValue(clusterDeploymentsState)
   const clusterImageSets = useRecoilValue(clusterImageSetsState)
   const formRef = useRef<FormikProps<any>>(null)
@@ -215,6 +216,8 @@ const DetailsForm: React.FC<DetailsFormProps> = ({ control, handleChange, contro
   }, [control])
 
   const clusterImages = useClusterImages()
+  const agentServiceConfigs = useRecoilValue(agentServiceConfigsState)
+  const agentServiceConfig = getFirstAgentServiceConfig(agentServiceConfigs)
 
   const usedClusterNames = useMemo(() => clusterDeployments.map((cd) => cd.metadata.name || ''), [])
 
@@ -285,6 +288,7 @@ const DetailsForm: React.FC<DetailsFormProps> = ({ control, handleChange, contro
           usedClusterNames={usedClusterNames}
           extensionAfter={extensionAfter}
           isNutanix={control.additionalProps?.isNutanix}
+          osImages={agentServiceConfig?.spec.osImages}
         />
       </ACMFeatureSupportLevelProvider>
     </FeatureGateContextProvider>

frontend/src/routes/Infrastructure/Clusters/ManagedClusters/CreateCluster/components/assisted-installer/DetailsForm.tsx

@@ -17,7 +17,11 @@ import {
   Stack,
   StackItem,
 } from '@patternfly/react-core'
-import { InfraEnvFormPage, EnvironmentStepFormValues } from '@openshift-assisted/ui-lib/cim'
+import {
+  InfraEnvFormPage,
+  EnvironmentStepFormValues,
+  AgentServiceConfigK8sResource,
+} from '@openshift-assisted/ui-lib/cim'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { FormikProps } from 'formik'
 
@@ -76,8 +80,11 @@ const InfraEnvForm: React.FC<InfraEnvFormProps> = ({ control, handleChange }) =>
   const { providerConnectionsValue } = useSharedSelectors()
   const allProviderConnections = useRecoilValue(providerConnectionsValue)
   const { projects } = useProjects()
-  const { infraEnvironmentsState } = useSharedAtoms()
+  const { infraEnvironmentsState, agentServiceConfigsState } = useSharedAtoms()
   const infraEnvironments = useRecoilValue(infraEnvironmentsState)
+  const agentServiceConfigs = useRecoilValue(agentServiceConfigsState)
+  const osImages = (agentServiceConfigs?.[0] as AgentServiceConfigK8sResource)?.spec.osImages || []
+
   const formRef = useRef<FormikProps<any>>(null)
 
   const providerConnections = allProviderConnections.filter((p) => {
@@ -139,6 +146,7 @@ const InfraEnvForm: React.FC<InfraEnvFormProps> = ({ control, handleChange }) =>
               pullSecret={currentConnection?.stringData?.['pullSecret']}
               sshPublicKey={currentConnection?.stringData?.['ssh-publickey']}
               docVersion={DOC_VERSION}
+              osImages={osImages}
             >
               <FormGroup fieldId="credentials" label={t('Infrastructure provider credentials')}>
                 <Select

frontend/src/routes/Infrastructure/InfraEnvironments/InfraEnvForm.tsx

@@ -15,7 +15,7 @@ import { nockIgnoreApiPaths, nockIgnoreRBAC } from '../../../lib/nock-util'
 import { waitForTestId, waitForText } from '../../../lib/test-util'
 import { NavigationPath } from '../../../NavigationPath'
 import InfraEnvironmentsPage, {
-  getFirstAgenterviceConfig,
+  getFirstAgentServiceConfig,
   getInfraEnvsOfMatchingPullSecret,
   getPlatform,
   isDeleteDisabled,
@@ -164,10 +164,10 @@ describe('Infrastructure Environments page utility functions', () => {
 
     expect(isDeleteDisabled([{}], [mockAgent1, mockAgent2])).toBe(true)
   })
-  test('getFirstAgenterviceConfig', () => {
-    expect(getFirstAgenterviceConfig(undefined)).toBe(undefined)
-    expect(getFirstAgenterviceConfig([])).toBe(undefined)
-    expect(getFirstAgenterviceConfig([{} as AgentServiceConfigK8sResource])).not.toBe(undefined)
+  test('getFirstAgentServiceConfig', () => {
+    expect(getFirstAgentServiceConfig(undefined)).toBe(undefined)
+    expect(getFirstAgentServiceConfig([])).toBe(undefined)
+    expect(getFirstAgentServiceConfig([{} as AgentServiceConfigK8sResource])).not.toBe(undefined)
   })
   test('getPlatform', () => {
     expect(getPlatform(undefined)).toBe('None')

frontend/src/routes/Infrastructure/InfraEnvironments/InfraEnvironmentsPage.test.tsx

@@ -78,7 +78,7 @@ export const isDeleteDisabled = (infraEnvs: InfraEnvK8sResource[], agents: Agent
   return isDisabled
 }
 
-export const getFirstAgenterviceConfig = (agentServiceConfigs?: AgentServiceConfigK8sResource[]) =>
+export const getFirstAgentServiceConfig = (agentServiceConfigs?: AgentServiceConfigK8sResource[]) =>
   agentServiceConfigs?.[0]
 
 export const getPlatform = (infrastructures?: InfrastructureK8sResource[]) =>
@@ -192,7 +192,7 @@ const InfraEnvironmentsPage: React.FC = () => {
   }, [])
 
   const platform: string = infrastructures?.[0]?.status?.platform || 'None'
-  const agentServiceConfig = getFirstAgenterviceConfig(agentServiceConfigs)
+  const agentServiceConfig = getFirstAgentServiceConfig(agentServiceConfigs)
   const isStorage = isStorageConfigured({ storageClasses: storageClasses as K8sResourceCommon[] | undefined })
 
   return (

frontend/src/routes/Infrastructure/InfraEnvironments/InfraEnvironmentsPage.tsx

@@ -48,6 +48,9 @@ spec:
   {{#if ai.cpuArchitecture}}
   cpuArchitecture: {{{ai.cpuArchitecture}}}
   {{/if}}
+  {{#if ai.osImageVersion}}
+  osImageVersion: '{{{ ai.osImageVersion }}}'
+  {{/if}}
 status:
   agentLabelSelector:
     matchLabels: