Merge remote-tracking branch 'upstream/main' into rhoai-2.16

opendatahub-io · Nov 12, 2024 · be095fa · be095fa
2 parents dceb2a1 + e543210
commit be095fa
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 34 deletions.
diff --git a/frontend/src/concepts/connectionTypes/__tests__/utils.spec.ts b/frontend/src/concepts/connectionTypes/__tests__/utils.spec.ts
@@ -388,7 +388,7 @@ describe('getConnectionModelServingCompatibleTypes', () => {
           },
         }),
       ),
-    ).toEqual([ModelServingCompatibleTypes.OCI, ModelServingCompatibleTypes.URI]);
+    ).toEqual([ModelServingCompatibleTypes.URI]);
     expect(
       getConnectionModelServingCompatibleTypes(
         mockConnection({
@@ -401,11 +401,7 @@ describe('getConnectionModelServingCompatibleTypes', () => {
           },
         }),
       ),
-    ).toEqual([
-      ModelServingCompatibleTypes.S3ObjectStorage,
-      ModelServingCompatibleTypes.OCI,
-      ModelServingCompatibleTypes.URI,
-    ]);
+    ).toEqual([ModelServingCompatibleTypes.S3ObjectStorage, ModelServingCompatibleTypes.URI]);
   });
 });
 
@@ -423,8 +419,6 @@ describe('isModelServingTypeCompatible', () => {
         ModelServingCompatibleTypes.S3ObjectStorage,
       ),
     ).toBe(true);
-    expect(isModelServingTypeCompatible(['invalid'], ModelServingCompatibleTypes.OCI)).toBe(false);
-    expect(isModelServingTypeCompatible(['URI'], ModelServingCompatibleTypes.OCI)).toBe(true);
     expect(isModelServingTypeCompatible(['invalid'], ModelServingCompatibleTypes.URI)).toBe(false);
     expect(isModelServingTypeCompatible(['URI'], ModelServingCompatibleTypes.URI)).toBe(true);
   });

diff --git a/frontend/src/concepts/connectionTypes/utils.ts b/frontend/src/concepts/connectionTypes/utils.ts
@@ -134,7 +134,6 @@ export const S3ConnectionTypeKeys = [
 
 export enum ModelServingCompatibleTypes {
   S3ObjectStorage = 'S3 compatible object storage',
-  OCI = 'OCI compliant registry',
   URI = 'URI',
 }
 
@@ -153,11 +152,6 @@ const modelServingCompatibleTypesMetadata: Record<
     envVars: S3ConnectionTypeKeys,
     managedType: 's3',
   },
-  [ModelServingCompatibleTypes.OCI]: {
-    name: ModelServingCompatibleTypes.OCI,
-    resource: 'oci-compliant-registry-v1',
-    envVars: ['URI'],
-  },
   [ModelServingCompatibleTypes.URI]: {
     name: ModelServingCompatibleTypes.URI,
     resource: 'uri-v1',

diff --git a/frontend/src/pages/modelRegistrySettings/ModelRegistryTableRowStatus.tsx b/frontend/src/pages/modelRegistrySettings/ModelRegistryTableRowStatus.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import { Label, Popover, Stack, StackItem } from '@patternfly/react-core';
 import {
   CheckCircleIcon,
-  DegradedIcon,
   ExclamationCircleIcon,
   ExclamationTriangleIcon,
   InProgressIcon,
@@ -71,8 +70,8 @@ export const ModelRegistryTableRowStatus: React.FC<ModelRegistryTableRowStatusPr
       !popoverMessages.some((message) => message.includes('ContainerCreating'))
     ) {
       statusLabel = ModelRegistryStatusLabel.Unavailable;
-      icon = <ExclamationCircleIcon />;
-      color = 'red';
+      icon = <ExclamationTriangleIcon />;
+      color = 'gold';
     }
     // Available
     else if (availableCondition?.status === ConditionStatus.True) {
@@ -83,14 +82,14 @@ export const ModelRegistryTableRowStatus: React.FC<ModelRegistryTableRowStatusPr
     // Progressing
     else if (progressCondition?.status === ConditionStatus.True) {
       statusLabel = ModelRegistryStatusLabel.Progressing;
-      icon = <InProgressIcon />;
+      icon = <InProgressIcon className="odh-u-spin" />;
       color = 'blue';
     }
     // Degrading
     else if (degradedCondition?.status === ConditionStatus.True) {
       statusLabel = ModelRegistryStatusLabel.Degrading;
-      icon = <DegradedIcon />;
-      color = 'gold';
+      icon = <InProgressIcon className="odh-u-spin" />;
+      color = 'grey';
       popoverTitle = 'Service is degrading';
     }
   }

diff --git a/manifests/common/connection-types/kustomization.yaml b/manifests/common/connection-types/kustomization.yaml
@@ -1,6 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./oci-compliant-registry-v1.yaml
   - ./s3.yaml
   - ./uri-v1.yaml
diff --git a/manifests/common/connection-types/oci-compliant-registry-v1.yaml b/manifests/common/connection-types/oci-compliant-registry-v1.yaml