Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: include modelregistry in the dsc template #1823

Merged
merged 1 commit into from
Sep 24, 2024
Merged

fix: include modelregistry in the dsc template #1823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ods_ci/tasks/Resources/Files/dsc_template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,8 @@ spec:
workbenches:
devFlags: <workbenches_devflags>
managementState: <workbenches_value>
modelregistry:
devFlags: <modelregistry_devflags>
managementState: <modelregistry_value>
registriesNamespace: <modelregistry_namespace>

6 changes: 6 additions & 0 deletions ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ ${DSCI_NAME} = default-dsci
... trainingoperator
... trustyai
... workbenches
... modelregistry
${SERVERLESS_OP_NAME}= serverless-operator
${SERVERLESS_SUB_NAME}= serverless-operator
${SERVERLESS_NS}= openshift-serverless
Expand Down Expand Up @@ -319,6 +320,11 @@ Create DataScienceCluster CustomResource Using Test Variables
ELSE IF '${COMPONENTS.${cmp}}' == 'Removed'
Run sed -i'' -e 's/<${cmp}_value>/Removed/' ${file_path}dsc_apply.yml
END

# The model registry component needs to set the namespace used, so adding this special statement just for it
IF '${cmp}' == 'modelregistry'
Run sed -i'' -e 's/<${cmp}_namespace>/${MODEL_REGISTRY_NAMESPACE}/' ${file_path}dsc_apply.yml
END
END

Apply Custom Manifest in DataScienceCluster CustomResource Using Test Variables
Expand Down
2 changes: 2 additions & 0 deletions ods_ci/tasks/Tasks/rhods_olm.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
IF "${PRODUCT}" == "ODH"
Set Global Variable ${OPERATOR_NAMESPACE} opendatahub-operators
Set Global Variable ${OPERATOR_NAME_LABEL} opendatahub-operator
Set Global Variable ${MODEL_REGISTRY_NAMESPACE} odh-model-registries
IF "${UPDATE_CHANNEL}" == "odh-nightlies"
Set Global Variable ${OPERATOR_NAME} rhods-operator
ELSE
Expand All @@ -32,6 +33,7 @@
ELSE
Set Global Variable ${OPERATOR_NAME} rhods-operator
Set Global Variable ${OPERATOR_NAME_LABEL} rhods-operator
Set Global Variable ${MODEL_REGISTRY_NAMESPACE} rhoai-model-registries
Dismissed Show dismissed Hide dismissed
CFSNM marked this conversation as resolved.
Show resolved Hide resolved
END
Given Selected Cluster Type ${cluster_type}
When Installing RHODS Operator ${image_url}
Expand Down
2 changes: 2 additions & 0 deletions ods_ci/tests/Resources/RHOSi.resource
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
Set Suite Variable ${DASHBOARD_DEPLOYMENT_NAME} rhods-dashboard
Set Suite Variable ${DASHBOARD_LABEL_SELECTOR} app.kubernetes.io/part-of=rhods-dashboard
Set Suite Variable ${APPLICATIONS_NAMESPACE} redhat-ods-applications
Set Suite Variable ${MODEL_REGISTRY_NAMESPACE} rhoai-model-registries
ELSE IF "${PRODUCT}" == "ODH"
Set Suite Variable ${OPERATOR_APPNAME} Open Data Hub Operator
Set Suite Variable ${OPERATOR_NAME} Open Data Hub Operator
Expand All @@ -115,6 +116,7 @@
Set Suite Variable ${DASHBOARD_DEPLOYMENT_NAME} odh-dashboard
Set Suite Variable ${DASHBOARD_LABEL_SELECTOR} app.kubernetes.io/part-of=dashboard
Set Suite Variable ${APPLICATIONS_NAMESPACE} opendatahub
Set Suite Variable ${MODEL_REGISTRY_NAMESPACE} odh-model-registries
END

Gather Release Attributes From DSC And DSCI
Expand Down
Loading