diff --git a/Makefile b/Makefile index 3c58e0a770..7ae4c95a08 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ ifdef NAMESPACE 'oc port-forward -n ${NAMESPACE} svc/ds-pipeline-md-${DSPA_NAME} ${METADATA_ENVOY_SERVICE_PORT}:8443' \ 'oc port-forward -n ${NAMESPACE} svc/ds-pipeline-${DSPA_NAME} ${DS_PIPELINE_DSPA_SERVICE_PORT}:8443' \ 'oc port-forward -n ${NAMESPACE} svc/${TRUSTYAI_NAME}-tls ${TRUSTYAI_TAIS_SERVICE_PORT}:443' \ - 'oc port-forward -n odh-model-registries svc/${MODEL_REGISTRY_NAME} ${MODEL_REGISTRY_SERVICE_PORT}:8080' + 'oc port-forward -n secure-model-registries svc/${MODEL_REGISTRY_NAME} ${MODEL_REGISTRY_SERVICE_PORT}:8080' else $(error Missing NAMESPACE variable) endif diff --git a/backend/src/routes/api/service/modelregistry/index.ts b/backend/src/routes/api/service/modelregistry/index.ts index 5b93e94db0..e65b5bd443 100644 --- a/backend/src/routes/api/service/modelregistry/index.ts +++ b/backend/src/routes/api/service/modelregistry/index.ts @@ -11,7 +11,7 @@ export default proxyService( }, { // Use port forwarding for local development: - // kubectl port-forward -n odh-model-registries svc/ 8085:8080 + // kubectl port-forward -n secure-model-registries svc/ 8085:8080 host: process.env.MODEL_REGISTRY_SERVICE_HOST, port: process.env.MODEL_REGISTRY_SERVICE_PORT, }, diff --git a/backend/src/utils/constants.ts b/backend/src/utils/constants.ts index 1d726d8213..08c504309a 100644 --- a/backend/src/utils/constants.ts +++ b/backend/src/utils/constants.ts @@ -142,7 +142,7 @@ export const THANOS_INSTANCE_NAME = 'thanos-querier'; export const THANOS_NAMESPACE = 'openshift-monitoring'; export const LABEL_SELECTOR_DASHBOARD_RESOURCE = `${KnownLabels.DASHBOARD_RESOURCE}=true`; -export const MODEL_REGISTRY_NAMESPACE = 'odh-model-registries'; +export const MODEL_REGISTRY_NAMESPACE = 'secure-model-registries'; export const SERVICE_ADDRESS_ANNOTATIONS: Record = { [ServiceAddressType.INTERNAL]: null, diff --git a/frontend/src/__mocks__/mockModelRegistryService.ts b/frontend/src/__mocks__/mockModelRegistryService.ts index c90b17e6dc..53b0d62ee2 100644 --- a/frontend/src/__mocks__/mockModelRegistryService.ts +++ b/frontend/src/__mocks__/mockModelRegistryService.ts @@ -7,7 +7,7 @@ type MockServiceType = { export const mockModelRegistryService = ({ name = 'modelregistry-sample', - namespace = 'odh-model-registries', + namespace = 'secure-model-registries', }: MockServiceType): ServiceKind => ({ kind: 'Service', apiVersion: 'v1', diff --git a/frontend/src/__mocks__/mockSelfSubjectRulesReview.ts b/frontend/src/__mocks__/mockSelfSubjectRulesReview.ts index 16dc9dc07f..ab3e2ae7b4 100644 --- a/frontend/src/__mocks__/mockSelfSubjectRulesReview.ts +++ b/frontend/src/__mocks__/mockSelfSubjectRulesReview.ts @@ -4,7 +4,7 @@ export const mockSelfSubjectRulesReview = (): SelfSubjectRulesReviewKind => ({ kind: 'SelfSubjectRulesReview', apiVersion: 'authorization.k8s.io/v1', spec: { - namespace: 'odh-model-registries', + namespace: 'secure-model-registries', }, status: { resourceRules: [ diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistrySettings/modelRegistryPermissions.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistrySettings/modelRegistryPermissions.cy.ts index ddabf8aaff..9eaac62df6 100644 --- a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistrySettings/modelRegistryPermissions.cy.ts +++ b/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistrySettings/modelRegistryPermissions.cy.ts @@ -14,7 +14,7 @@ import { mockModelRegistry } from '~/__mocks__/mockModelRegistry'; import { mockGroup } from '~/__mocks__/mockGroup'; import { modelRegistryPermissions } from '~/__tests__/cypress/cypress/pages/modelRegistryPermissions'; -const MODEL_REGISTRY_DEFAULT_NAMESPACE = 'odh-model-registries'; +const MODEL_REGISTRY_DEFAULT_NAMESPACE = 'secure-model-registries'; const userSubjects: RoleBindingSubject[] = [ { @@ -452,7 +452,7 @@ describe('MR Permissions', () => { cy.wait('@addProject').then((interception) => { expect(interception.request.body).to.containSubset({ metadata: { - namespace: 'odh-model-registries', + namespace: 'secure-model-registries', }, roleRef: { apiGroup: 'rbac.authorization.k8s.io', @@ -498,7 +498,7 @@ describe('MR Permissions', () => { cy.wait('@editProject').then((interception) => { expect(interception.request.body).to.containSubset({ metadata: { - namespace: 'odh-model-registries', + namespace: 'secure-model-registries', }, roleRef: { apiGroup: 'rbac.authorization.k8s.io', diff --git a/frontend/src/concepts/modelRegistry/const.ts b/frontend/src/concepts/modelRegistry/const.ts index ced9db3475..943a650c70 100644 --- a/frontend/src/concepts/modelRegistry/const.ts +++ b/frontend/src/concepts/modelRegistry/const.ts @@ -1,2 +1,2 @@ -export const MODEL_REGISTRY_DEFAULT_NAMESPACE = 'odh-model-registries'; // The default namespace for the model registry service, controlled by the operator. +export const MODEL_REGISTRY_DEFAULT_NAMESPACE = 'secure-model-registries'; // The default namespace for the model registry service, controlled by the operator. export const MODEL_REGISTRY_API_VERSION = 'v1alpha3';