From fd2a63c1f662d20e9dabc46df13e5041c975af7f Mon Sep 17 00:00:00 2001 From: Emily Samoylov <93456589+emilys314@users.noreply.github.com> Date: Mon, 11 Nov 2024 15:43:14 -0500 Subject: [PATCH 1/2] Remove explicit support for OCI model serving compatibility (#3459) --- .../connectionTypes/__tests__/utils.spec.ts | 10 ++-------- frontend/src/concepts/connectionTypes/utils.ts | 6 ------ .../common/connection-types/kustomization.yaml | 1 - .../connection-types/oci-compliant-registry-v1.yaml | 13 ------------- 4 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 manifests/common/connection-types/oci-compliant-registry-v1.yaml diff --git a/frontend/src/concepts/connectionTypes/__tests__/utils.spec.ts b/frontend/src/concepts/connectionTypes/__tests__/utils.spec.ts index afaaccfda2..fe603ad839 100644 --- 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 index 372310ba37..9a46394cfe 100644 --- 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/manifests/common/connection-types/kustomization.yaml b/manifests/common/connection-types/kustomization.yaml index 1b341f5c81..c3e0865caa 100644 --- 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 deleted file mode 100644 index a074238ffa..0000000000 --- a/manifests/common/connection-types/oci-compliant-registry-v1.yaml +++ /dev/null @@ -1,13 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: oci-compliant-registry-v1 - labels: - opendatahub.io/connection-type: 'true' - opendatahub.io/dashboard: 'true' - annotations: - openshift.io/description: 'Connect to an OCI-compliant container registry, enabling integration with containerized applications and services. Use this connection type to pull and manage container images and artifacts that adhere to the Open Container Initiative (OCI) standards, ensuring compatibility with OCI-compliant tools and workflows.' - openshift.io/display-name: OCI compliant registry - v1 -data: - category: '["URI"]' - fields: '[{"type":"uri","name":"URI","envVar":"URI","required":true,"properties":{}}]' From 8743ba6a2fef8e34344de4282104afb033472e18 Mon Sep 17 00:00:00 2001 From: Manaswini Das Date: Tue, 12 Nov 2024 02:35:07 +0530 Subject: [PATCH 2/2] Model registry settings table icon updates (#3461) --- .../ModelRegistryTableRowStatus.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/frontend/src/pages/modelRegistrySettings/ModelRegistryTableRowStatus.tsx b/frontend/src/pages/modelRegistrySettings/ModelRegistryTableRowStatus.tsx index 29e555163f..e93a3d7440 100644 --- 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 message.includes('ContainerCreating')) ) { statusLabel = ModelRegistryStatusLabel.Unavailable; - icon = ; - color = 'red'; + icon = ; + color = 'gold'; } // Available else if (availableCondition?.status === ConditionStatus.True) { @@ -83,14 +82,14 @@ export const ModelRegistryTableRowStatus: React.FC; + icon = ; color = 'blue'; } // Degrading else if (degradedCondition?.status === ConditionStatus.True) { statusLabel = ModelRegistryStatusLabel.Degrading; - icon = ; - color = 'gold'; + icon = ; + color = 'grey'; popoverTitle = 'Service is degrading'; } }