bug fixes

Author: katieperry4

frontend/src/pages/modelServing/screens/global/ServeModelButton.tsx

@@ -15,7 +15,6 @@ import { byName, ProjectsContext } from '#~/concepts/projects/ProjectsContext';
 import { isProjectNIMSupported } from '#~/pages/modelServing/screens/projects/nimUtils';
 import ManageNIMServingModal from '#~/pages/modelServing/screens/projects/NIMServiceModal/ManageNIMServingModal';
 import useServingPlatformStatuses from '#~/pages/modelServing/useServingPlatformStatuses';
-import { ProjectDetailsContext } from '#~/pages/projects/ProjectDetailsContext';
 
 const ServeModelButton: React.FC = () => {
   const [platformSelected, setPlatformSelected] = React.useState<
@@ -30,7 +29,6 @@ const ServeModelButton: React.FC = () => {
     connections: { data: connections },
   } = React.useContext(ModelServingContext);
   const { projects } = React.useContext(ProjectsContext);
-  const { pvcs } = React.useContext(ProjectDetailsContext);
   const { namespace } = useParams<{ namespace: string }>();
   const servingPlatformStatuses = useServingPlatformStatuses();
   const isNIMAvailable = servingPlatformStatuses.kServeNIM.enabled;
@@ -106,7 +104,6 @@ const ServeModelButton: React.FC = () => {
               currentProject: project,
               connections,
             }}
-            pvcs={pvcs.data}
             servingRuntimeTemplates={templatesEnabled.filter((template) =>
               getTemplateEnabledForPlatform(template, ServingRuntimePlatform.SINGLE),
             )}

frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/ConnectionSection.tsx

@@ -39,8 +39,9 @@ import {
 import { isModelPathValid } from '#~/pages/modelServing/screens/projects/utils';
 import DashboardPopupIconButton from '#~/concepts/dashboard/DashboardPopupIconButton';
 import { AccessTypes } from '#~/pages/projects/dataConnections/const';
-import { SupportedArea, useIsAreaAvailable } from '#~/concepts/areas/index.ts';
+import { SupportedArea, useIsAreaAvailable } from '#~/concepts/areas/index';
 import { PersistentVolumeClaimKind } from '#~/k8sTypes.ts';
+import { ServingRuntimePlatform } from '#~/types';
 import ConnectionS3FolderPathField from './ConnectionS3FolderPathField';
 import ConnectionOciPathField from './ConnectionOciPathField';
 import { ConnectionOciAlert } from './ConnectionOciAlert';
@@ -247,6 +248,7 @@ type Props = {
   connections?: LabeledConnection[];
   pvcs?: PersistentVolumeClaimKind[];
   connectionTypeFilter?: (ct: ConnectionTypeConfigMapObj) => boolean;
+  platform?: ServingRuntimePlatform;
 };
 
 // todo convert 'data' into a generic 'modelLocation' obj
@@ -264,8 +266,10 @@ export const ConnectionSection: React.FC<Props> = ({
   connections,
   pvcs,
   connectionTypeFilter = () => true,
+  platform,
 }) => {
   const [modelServingConnectionTypes] = useWatchConnectionTypes(true);
+
   const connectionTypes = React.useMemo(
     () => modelServingConnectionTypes.filter(connectionTypeFilter),
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -306,7 +310,7 @@ export const ConnectionSection: React.FC<Props> = ({
 
   return (
     <>
-      {pvcServingEnabled && (
+      {pvcServingEnabled && platform === ServingRuntimePlatform.SINGLE && (
         <Radio
           label="Existing cluster storage"
           name="pvc-serving-radio"

frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/ManageInferenceServiceModal.tsx

@@ -12,6 +12,7 @@ import {
 import { EitherOrNone } from '@openshift/dynamic-plugin-sdk';
 import {
   getCreateInferenceServiceLabels,
+  getProjectModelServingPlatform,
   submitInferenceServiceResourceWithDryRun,
   useCreateInferenceServiceObject,
 } from '#~/pages/modelServing/screens/projects/utils';
@@ -32,6 +33,7 @@ import {
   ModelServingCompatibleTypes,
 } from '#~/concepts/connectionTypes/utils';
 import { useModelDeploymentNotification } from '#~/pages/modelServing/screens/projects/useModelDeploymentNotification';
+import useServingPlatformStatuses from '#~/pages/modelServing/useServingPlatformStatuses';
 import ProjectSection from './ProjectSection';
 import InferenceServiceFrameworkSection from './InferenceServiceFrameworkSection';
 import InferenceServiceServingRuntimeSection from './InferenceServiceServingRuntimeSection';
@@ -72,6 +74,11 @@ const ManageInferenceServiceModal: React.FC<ManageInferenceServiceModalProps> =
     createData.k8sName,
     false,
   );
+  const currentProject = projectContext?.currentProject;
+  const platformStatuses = useServingPlatformStatuses();
+  const { platform } = currentProject
+    ? getProjectModelServingPlatform(currentProject, platformStatuses)
+    : { platform: undefined };
 
   const currentProjectName = projectContext?.currentProject.metadata.name || '';
   const currentServingRuntimeName = projectContext?.currentServingRuntime?.metadata.name || '';
@@ -237,6 +244,7 @@ const ManageInferenceServiceModal: React.FC<ManageInferenceServiceModalProps> =
                   connectionTypeFilter={(ct) =>
                     !isModelServingCompatible(ct, ModelServingCompatibleTypes.OCI)
                   }
+                  platform={platform}
                 />
               </FormSection>
             </>

frontend/src/pages/modelServing/screens/projects/InferenceServiceModal/PVCSelect.tsx

@@ -3,11 +3,9 @@ import { Alert, FormGroup, Label, Stack, StackItem } from '@patternfly/react-cor
 import TypeaheadSelect, { TypeaheadSelectOption } from '#~/components/TypeaheadSelect';
 import { PersistentVolumeClaimKind } from '#~/k8sTypes';
 import { getDisplayNameFromK8sResource } from '#~/concepts/k8s/utils';
-import {
-  getModelServingPVCAccessMode,
-  getModelServingPVCAnnotations,
-} from '#~/pages/modelServing/utils';
-import { PVCAccessMode } from '#~/types';
+import { getModelServingPVCAnnotations } from '#~/pages/modelServing/utils';
+import { AccessMode } from '#~/pages/storageClasses/storageEnums';
+import { getPvcAccessMode } from '#~/pages/projects/utils';
 import { PVCFields } from './PVCFields';
 
 type PvcSelectProps = {
@@ -82,7 +80,7 @@ export const PvcSelect: React.FC<PvcSelectProps> = ({
     [pvcs, selectedPVC],
   );
 
-  const accessMode = selectedPVC ? getModelServingPVCAccessMode(selectedPVC) : undefined;
+  const accessMode = selectedPVC ? getPvcAccessMode(selectedPVC) : undefined;
 
   return (
     <FormGroup label="Cluster storage" isRequired>
@@ -100,7 +98,7 @@ export const PvcSelect: React.FC<PvcSelectProps> = ({
             }}
           />
         </StackItem>
-        {selectedPVC && accessMode !== PVCAccessMode.READ_WRITE_MANY && (
+        {selectedPVC && accessMode !== AccessMode.RWX && (
           <StackItem>
             <Alert variant="warning" title="Warning" isInline>
               This cluster storage access mode is not ReadWriteMany.

frontend/src/pages/modelServing/screens/projects/kServeModal/ManageKServeModal.tsx

@@ -11,6 +11,7 @@ import {
 import { EitherOrNone } from '@openshift/dynamic-plugin-sdk';
 import {
   getCreateInferenceServiceLabels,
+  getProjectModelServingPlatform,
   getSubmitInferenceServiceResourceFn,
   getSubmitServingRuntimeResourcesFn,
   useCreateInferenceServiceObject,
@@ -67,6 +68,7 @@ import { useKServeDeploymentMode } from '#~/pages/modelServing/useKServeDeployme
 import { SERVING_RUNTIME_SCOPE } from '#~/pages/modelServing/screens/const';
 import { useModelDeploymentNotification } from '#~/pages/modelServing/screens/projects/useModelDeploymentNotification';
 import { getDashboardPvcs } from '#~/api/k8s/pvcs';
+import useServingPlatformStatuses from '#~/pages/modelServing/useServingPlatformStatuses';
 import KServeAutoscalerReplicaSection from './KServeAutoscalerReplicaSection';
 import EnvironmentVariablesSection from './EnvironmentVariablesSection';
 import ServingRuntimeArgsSection from './ServingRuntimeArgsSection';
@@ -141,13 +143,19 @@ const ManageKServeModal: React.FC<ManageKServeModalProps> = ({
     createDataInferenceService.isKServeRawDeployment;
   const currentProjectName = projectContext?.currentProject.metadata.name;
   const namespace = currentProjectName || createDataInferenceService.project;
+  const currentProject = projectContext?.currentProject;
+  const platformStatuses = useServingPlatformStatuses();
+  const { platform } = currentProject
+    ? getProjectModelServingPlatform(currentProject, platformStatuses)
+    : { platform: undefined };
 
   const projectTemplates = useTemplates(namespace);
   const [fallbackPvcs, setFallbackPvcs] = React.useState<PersistentVolumeClaimKind[]>([]);
   React.useEffect(() => {
     getDashboardPvcs(namespace)
       .then((data) => {
-        setFallbackPvcs(data.filter((pvc) => pvc.metadata.namespace === namespace));
+        //setFallbackPvcs(data.filter((pvc) => pvc.metadata.namespace === namespace));
+        setFallbackPvcs(data);
       })
       .catch(() => {
         setFallbackPvcs([]);
@@ -488,6 +496,7 @@ const ManageKServeModal: React.FC<ManageKServeModalProps> = ({
                 setIsConnectionValid={setIsConnectionValid}
                 connections={connections}
                 pvcs={pvcs?.length && pvcs.length > 0 ? pvcs : fallbackPvcs}
+                platform={platform}
               />
             </FormSection>
           )}

frontend/src/pages/modelServing/utils.ts

@@ -390,8 +390,3 @@ export const getModelServingPVCAnnotations = (
 
   return { modelName, modelPath };
 };
-
-export const getModelServingPVCAccessMode = (pvc: PersistentVolumeClaimKind): string | null => {
-  const accessMode = pvc.spec.accessModes[0];
-  return accessMode;
-};