Don't crash if modelregistries namespace is not present in the DSC (#…

…3248) * Don't crash if modelregistries namespace is not present in the DSC Signed-off-by: Mike Turley <mike.turley@alum.cs.umass.edu> * Defensively get registriesNamespace in the frontend Signed-off-by: Mike Turley <mike.turley@alum.cs.umass.edu> --------- Signed-off-by: Mike Turley <mike.turley@alum.cs.umass.edu>
opendatahub-io · Sep 24, 2024 · d5938bf · d5938bf
1 parent b83d991
commit d5938bf
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 16 deletions.
diff --git a/backend/src/routes/api/modelRegistries/modelRegistryUtils.ts b/backend/src/routes/api/modelRegistries/modelRegistryUtils.ts
@@ -6,9 +6,20 @@ const MODEL_REGISTRY_API_GROUP = 'modelregistry.opendatahub.io';
 const MODEL_REGISTRY_API_VERSION = 'v1alpha1';
 const MODEL_REGISTRY_PLURAL = 'modelregistries';
 
-export const getModelRegistryNamespace = async (fastify: KubeFastifyInstance): Promise<string> => {
-  const modelRegistryNamespace = await getClusterStatus(fastify);
-  return modelRegistryNamespace.components.modelregistry.registriesNamespace;
+export const getModelRegistryNamespace = async (
+  fastify: KubeFastifyInstance,
+): Promise<string | undefined> => {
+  let registriesNamespace: string | undefined;
+  try {
+    const clusterStatus = await getClusterStatus(fastify);
+    registriesNamespace = clusterStatus.components?.modelregistry?.registriesNamespace;
+  } catch (e) {
+    fastify.log.error(e, 'Failed to fetch DSC status');
+  }
+  if (!registriesNamespace) {
+    fastify.log.warn('Model registry namespace not found in DSC status');
+  }
+  return registriesNamespace;
 };
 
 const base64encode = (value?: string): string => {

diff --git a/backend/src/types.ts b/backend/src/types.ts
@@ -1004,11 +1004,11 @@ type ComponentNames =
   | 'workbenches';
 
 export type DataScienceClusterKindStatus = {
-  components: {
-    modelregistry: {
-      registriesNamespace: string
-    }
-  }
+  components?: {
+    modelregistry?: {
+      registriesNamespace?: string;
+    };
+  };
   conditions: K8sCondition[];
   installedComponents: { [key in ComponentNames]?: boolean };
   phase?: string;

diff --git a/frontend/src/concepts/modelRegistry/context/ModelRegistrySelectorContext.tsx b/frontend/src/concepts/modelRegistry/context/ModelRegistrySelectorContext.tsx
@@ -48,7 +48,7 @@ const EnabledModelRegistrySelectorContextProvider: React.FC<
     isLoaded,
     error,
     refreshRulesReview,
-  } = useModelRegistryServices(dscStatus?.components.modelregistry.registriesNamespace || '');
+  } = useModelRegistryServices(dscStatus?.components?.modelregistry?.registriesNamespace || '');
   const [preferredModelRegistry, setPreferredModelRegistry] = React.useState<
     ServiceKind | undefined
   >(undefined);

diff --git a/frontend/src/k8sTypes.ts b/frontend/src/k8sTypes.ts
@@ -1356,9 +1356,9 @@ export type K8sResourceListResult<TResource extends Partial<K8sResourceCommon>>
 
 /** We don't need or should ever get the full kind, this is the status section */
 export type DataScienceClusterKindStatus = {
-  components: {
-    modelregistry: {
-      registriesNamespace: string;
+  components?: {
+    modelregistry?: {
+      registriesNamespace?: string;
     };
   };
   conditions: K8sCondition[];

diff --git a/frontend/src/pages/modelRegistrySettings/CreateModal.tsx b/frontend/src/pages/modelRegistrySettings/CreateModal.tsx
@@ -76,7 +76,7 @@ const CreateModal: React.FC<CreateModalProps> = ({ isOpen, onClose, refresh }) =
       kind: 'ModelRegistry',
       metadata: {
         name: nameDesc.k8sName || translateDisplayNameForK8s(nameDesc.name),
-        namespace: dscStatus?.components.modelregistry.registriesNamespace || '',
+        namespace: dscStatus?.components?.modelregistry?.registriesNamespace || '',
         annotations: {
           'openshift.io/description': nameDesc.description,
           'openshift.io/display-name': nameDesc.name.trim(),

diff --git a/frontend/src/pages/modelRegistrySettings/ModelRegistriesPermissions.tsx b/frontend/src/pages/modelRegistrySettings/ModelRegistriesPermissions.tsx
@@ -24,7 +24,7 @@ import ProjectsSettingsTab from './ProjectsTab/ProjectsSettingsTab';
 
 const ModelRegistriesManagePermissions: React.FC = () => {
   const { dscStatus } = React.useContext(AreaContext);
-  const modelRegistryNamespace = dscStatus?.components.modelregistry.registriesNamespace;
+  const modelRegistryNamespace = dscStatus?.components?.modelregistry?.registriesNamespace;
   const [activeTabKey, setActiveTabKey] = React.useState('users');
   const [ownerReference, setOwnerReference] = React.useState<ModelRegistryKind>();
   const [groups] = useGroups();

diff --git a/frontend/src/pages/modelRegistrySettings/useModelRegistryRoleBindings.ts b/frontend/src/pages/modelRegistrySettings/useModelRegistryRoleBindings.ts
@@ -10,15 +10,15 @@ const useModelRegistryRoleBindings = (): FetchState<RoleBindingKind[]> => {
   const getRoleBindings = React.useCallback(
     () =>
       listRoleBindings(
-        dscStatus?.components.modelregistry.registriesNamespace,
+        dscStatus?.components?.modelregistry?.registriesNamespace,
         KnownLabels.LABEL_SELECTOR_MODEL_REGISTRY,
       ).catch((e) => {
         if (e.statusObject?.code === 404) {
           throw new Error('No rolebindings found.');
         }
         throw e;
       }),
-    [dscStatus?.components.modelregistry.registriesNamespace],
+    [dscStatus?.components?.modelregistry?.registriesNamespace],
   );
 
   return useFetchState<RoleBindingKind[]>(getRoleBindings, []);