From 164d7dcde82fbf22555aa713805bca8614bcf380 Mon Sep 17 00:00:00 2001 From: Tony Davidson Date: Thu, 28 Mar 2024 10:36:02 +0000 Subject: [PATCH] Added DSCI config (#35) * Added DSCI config * This commit corrects the order in which the DSCI is applied uses the correct default dsci needed for correct application --- .../model-registry-DSCInitialization.yaml | 31 +++++++++++++++++++ .../scripts/oci-model-registry-deploy.sh | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 openshift-ci/resources/model-registry-DSCInitialization.yaml diff --git a/openshift-ci/resources/model-registry-DSCInitialization.yaml b/openshift-ci/resources/model-registry-DSCInitialization.yaml new file mode 100644 index 00000000..279393a1 --- /dev/null +++ b/openshift-ci/resources/model-registry-DSCInitialization.yaml @@ -0,0 +1,31 @@ +apiVersion: dscinitialization.opendatahub.io/v1 +kind: DSCInitialization +metadata: + creationTimestamp: '2024-03-27T16:16:55Z' + finalizers: + - dscinitialization.opendatahub.io/finalizer + generation: 1 + labels: + app.kubernetes.io/created-by: opendatahub-operator + app.kubernetes.io/instance: default + app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: dscinitialization + app.kubernetes.io/part-of: opendatahub-operator + name: default-dsci +spec: + applicationsNamespace: opendatahub + monitoring: + managementState: Managed + namespace: opendatahub + serviceMesh: + auth: + audiences: + - 'https://kubernetes.default.svc' + controlPlane: + metricsCollection: Istio + name: data-science-smcp + namespace: istio-system + managementState: Managed + trustedCABundle: + customCABundle: '' + managementState: Managed diff --git a/openshift-ci/scripts/oci-model-registry-deploy.sh b/openshift-ci/scripts/oci-model-registry-deploy.sh index f42edcf8..befe982b 100755 --- a/openshift-ci/scripts/oci-model-registry-deploy.sh +++ b/openshift-ci/scripts/oci-model-registry-deploy.sh @@ -2,6 +2,7 @@ # Define variables for ODH deployment deployment OPENDATAHUB_SUBSCRIPTION="openshift-ci/resources/opendatahub-subscription.yaml" +DSC_INITIALIZATION_MANIFEST="openshift-ci/resources/model-registry-DSCInitialization.yaml" DATA_SCIENCE_CLUSTER_MANIFEST="openshift-ci/resources/opendatahub-data-science-cluster.yaml" MODEL_REGISTRY_OPERATOR_GIT_URL="https://github.com/opendatahub-io/model-registry-operator.git" source "openshift-ci/scripts/colour_text_variables.sh" @@ -157,8 +158,9 @@ run_deployment_tests() { # Main function for orchestrating deployments main() { deploy_and_wait $OPENDATAHUB_SUBSCRIPTION + deploy_and_wait $DSC_INITIALIZATION_MANIFEST check_pod_status "opendatahub" "-l component.opendatahub.io/name=model-registry-operator" 2 - deploy_and_wait $DATA_SCIENCE_CLUSTER_MANIFEST + deploy_and_wait $DATA_SCIENCE_CLUSTER_MANIFEST clone_deploy_model_registry_operator_crd_files run_deployment_tests }