From ffb969de72673d23e2475c27a78c675725ea47ba Mon Sep 17 00:00:00 2001 From: Vaishnavi Hire Date: Tue, 26 Sep 2023 19:27:42 -0400 Subject: [PATCH] ODH Release 1.10 for operator v1.10.0 --- ...rd.opendatahub.io_acceleratorprofiles.yaml | 60 +++++++++++++++++++ ...hboard.opendatahub.io_odhapplications.yaml | 2 + ...atahub-operator.clusterserviceversion.yaml | 17 ++++-- .../opendatahub.io_odhdashboardconfigs.yaml | 8 +++ ...cceleratorprofiles.opendatahub.io.crd.yaml | 53 ++++++++++++++++ ...dhdashboardconfigs.opendatahub.io.crd.yaml | 12 ++-- config/crd/kustomization.yaml | 1 + ...atahub-operator.clusterserviceversion.yaml | 15 +++-- get_all_manifests.sh | 16 +++-- 9 files changed, 163 insertions(+), 21 deletions(-) create mode 100644 bundle/manifests/dashboard.opendatahub.io_acceleratorprofiles.yaml create mode 100644 config/crd/dashboard-crds/acceleratorprofiles.opendatahub.io.crd.yaml diff --git a/bundle/manifests/dashboard.opendatahub.io_acceleratorprofiles.yaml b/bundle/manifests/dashboard.opendatahub.io_acceleratorprofiles.yaml new file mode 100644 index 00000000000..d7d3fb995fc --- /dev/null +++ b/bundle/manifests/dashboard.opendatahub.io_acceleratorprofiles.yaml @@ -0,0 +1,60 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + creationTimestamp: null + name: acceleratorprofiles.dashboard.opendatahub.io +spec: + group: dashboard.opendatahub.io + names: + kind: AcceleratorProfile + plural: acceleratorprofiles + singular: acceleratorprofile + scope: Namespaced + versions: + - name: v1alpha + schema: + openAPIV3Schema: + properties: + spec: + properties: + description: + type: string + displayName: + type: string + enabled: + type: boolean + identifier: + type: string + tolerations: + items: + properties: + effect: + type: string + key: + type: string + operator: + type: string + tolerationSeconds: + type: integer + value: + type: string + required: + - key + type: object + type: array + required: + - displayName + - enabled + - identifier + type: object + required: + - spec + type: object + served: true + storage: true +status: + acceptedNames: + kind: "" + plural: "" + conditions: null + storedVersions: null diff --git a/bundle/manifests/dashboard.opendatahub.io_odhapplications.yaml b/bundle/manifests/dashboard.opendatahub.io_odhapplications.yaml index 0fd7bebe64d..8b0640d6de7 100644 --- a/bundle/manifests/dashboard.opendatahub.io_odhapplications.yaml +++ b/bundle/manifests/dashboard.opendatahub.io_odhapplications.yaml @@ -117,6 +117,8 @@ spec: isEnabled: type: boolean kfdefApplications: + description: (Deprecated) Apps do not rely on other deployments, they + are deployed by those components. items: type: string type: array diff --git a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml index 2f31e46a7b9..7ec66a47bd2 100644 --- a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml +++ b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml @@ -208,20 +208,25 @@ metadata: capabilities: Deep Insights categories: AI/Machine Learning, Big Data certified: "False" - containerImage: quay.io/opendatahub/opendatahub-operator:v1.9.0 - createdAt: "2023-8-23T00:00:00Z" + containerImage: quay.io/opendatahub/opendatahub-operator:v1.10.0 + createdAt: "2023-9-26T00:00:00Z" description: Open Data Hub Operator for deployment and management of Open Data Hub operators.operatorframework.io/builder: operator-sdk-v1.24.1 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/opendatahub-io/opendatahub-operator support: Open Data Hub - name: opendatahub-operator.v1.9.0 + name: opendatahub-operator.v1.10.0 namespace: placeholder spec: apiservicedefinitions: {} customresourcedefinitions: owned: + - description: AcceleratorProfile is the Schema for the acceleratorprofiles + displayName: AcceleratorProfile + kind: AcceleratorProfile + name: acceleratorprofiles.dashboard.opendatahub.io + version: v1alpha - description: KfDef is the Schema for the kfdefs API displayName: Kf Def kind: KfDef @@ -337,7 +342,7 @@ spec: - --leader-elect command: - /manager - image: quay.io/opendatahub/opendatahub-operator:v1.9.0 + image: quay.io/opendatahub/opendatahub-operator:v1.10.0 imagePullPolicy: Always livenessProbe: httpGet: @@ -423,8 +428,8 @@ spec: minKubeVersion: 1.22.0 provider: name: Open Data Hub - replaces: opendatahub-operator.v1.8.0 + replaces: opendatahub-operator.v1.9.0 selector: matchLabels: component: opendatahub-operator - version: 1.9.0 + version: 1.10.0 diff --git a/bundle/manifests/opendatahub.io_odhdashboardconfigs.yaml b/bundle/manifests/opendatahub.io_odhdashboardconfigs.yaml index f6bcc5dab62..ffaef1b1b0d 100644 --- a/bundle/manifests/opendatahub.io_odhdashboardconfigs.yaml +++ b/bundle/manifests/opendatahub.io_odhdashboardconfigs.yaml @@ -21,6 +21,8 @@ spec: properties: disableBYONImageStream: type: boolean + disableBiasMetrics: + type: boolean disableClusterManager: type: boolean disableCustomServingRuntimes: @@ -31,6 +33,8 @@ spec: type: boolean disableModelServing: type: boolean + disablePerformanceMetrics: + type: boolean disablePipelines: type: boolean disableProjectSharing: @@ -138,6 +142,10 @@ spec: - resources type: object type: array + templateDisablement: + items: + type: string + type: array templateOrder: items: type: string diff --git a/config/crd/dashboard-crds/acceleratorprofiles.opendatahub.io.crd.yaml b/config/crd/dashboard-crds/acceleratorprofiles.opendatahub.io.crd.yaml new file mode 100644 index 00000000000..0a053b5080f --- /dev/null +++ b/config/crd/dashboard-crds/acceleratorprofiles.opendatahub.io.crd.yaml @@ -0,0 +1,53 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: acceleratorprofiles.dashboard.opendatahub.io +spec: + group: dashboard.opendatahub.io + scope: Namespaced + names: + plural: acceleratorprofiles + singular: acceleratorprofile + kind: AcceleratorProfile + versions: + - name: v1alpha + served: true + storage: true + schema: + openAPIV3Schema: + type: object + required: + - spec + properties: + spec: + type: object + required: + - displayName + - enabled + - identifier + properties: + displayName: + type: string + enabled: + type: boolean + identifier: + type: string + description: + type: string + tolerations: + type: array + items: + type: object + required: + - key + properties: + key: + type: string + operator: + type: string + value: + type: string + effect: + type: string + tolerationSeconds: + type: integer diff --git a/config/crd/dashboard-crds/odhdashboardconfigs.opendatahub.io.crd.yaml b/config/crd/dashboard-crds/odhdashboardconfigs.opendatahub.io.crd.yaml index 8108ce32aa4..67d76ce3235 100644 --- a/config/crd/dashboard-crds/odhdashboardconfigs.opendatahub.io.crd.yaml +++ b/config/crd/dashboard-crds/odhdashboardconfigs.opendatahub.io.crd.yaml @@ -53,6 +53,10 @@ spec: type: string disablePipelines: type: boolean + disableBiasMetrics: + type: boolean + disablePerformanceMetrics: + type: boolean groupsConfig: type: object required: @@ -134,10 +138,10 @@ spec: notebookTolerationSettings: type: object properties: - enabled: - type: boolean - key: - type: string + enabled: + type: boolean + key: + type: string storageClassName: type: string templateOrder: diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 053964aae28..eb6dd1124eb 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -7,6 +7,7 @@ resources: - dashboard-crds/odhdashboardconfigs.opendatahub.io.crd.yaml - dashboard-crds/odhdocuments.dashboard.opendatahub.io.crd.yaml - dashboard-crds/odhquickstarts.console.openshift.io.crd.yaml + - dashboard-crds/acceleratorprofiles.opendatahub.io.crd.yaml #+kubebuilder:scaffold:crdkustomizeresource patchesStrategicMerge: diff --git a/config/manifests/bases/opendatahub-operator.clusterserviceversion.yaml b/config/manifests/bases/opendatahub-operator.clusterserviceversion.yaml index 3c12f384aa7..856c4909afa 100644 --- a/config/manifests/bases/opendatahub-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/opendatahub-operator.clusterserviceversion.yaml @@ -208,13 +208,13 @@ metadata: capabilities: Deep Insights categories: AI/Machine Learning, Big Data certified: "False" - containerImage: quay.io/opendatahub/opendatahub-operator:v1.8.0 - createdAt: "2023-8-23T00:00:00Z" + containerImage: quay.io/opendatahub/opendatahub-operator:v1.10.0 + createdAt: "2023-9-26T00:00:00Z" description: Open Data Hub Operator for deployment and management of Open Data Hub repository: https://github.com/opendatahub-io/opendatahub-operator support: Open Data Hub - name: opendatahub-operator.v1.8.0 + name: opendatahub-operator.v1.10.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -230,6 +230,11 @@ spec: kind: OdhDashboardConfig name: odhdashboardconfigs.opendatahub.io version: v1alpha + - description: AcceleratorProfile is the Schema for the acceleratorprofiles + displayName: Open Data Hub Dashboard AcceleratorProfile + kind: AcceleratorProfile + name: acceleratorprofiles.dashboard.opendatahub.io + version: v1 - description: OdhDocument is the Schema for the odhdocuments displayName: Open Data Hub Dashboard Documentation kind: OdhDocument @@ -339,8 +344,8 @@ spec: minKubeVersion: 1.22.0 provider: name: Open Data Hub - replaces: opendatahub-operator.v1.8.0 + replaces: opendatahub-operator.v1.9.0 selector: matchLabels: component: opendatahub-operator - version: 1.9.0 + version: 1.10.0 diff --git a/get_all_manifests.sh b/get_all_manifests.sh index 25e644ceb1d..d479465b135 100755 --- a/get_all_manifests.sh +++ b/get_all_manifests.sh @@ -4,11 +4,11 @@ set -e # component: dsp, kserve, dashbaord, cf/ray. in the format of "repo-name:branch-name:source-folder:target-folder" # TODO: workbench, modelmesh, monitoring, etc REPO_LIST=( - "data-science-pipelines-operator:main:config:data-science-pipelines-operator" - "odh-dashboard:incubation:manifests:odh-dashboard" - "notebooks:main:manifests:notebook-images" - "kubeflow:v1.7-branch:components/notebook-controller/config:odh-notebook-controller/kf-notebook-controller" - "kubeflow:v1.7-branch:components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller" + "data-science-pipelines-operator:v1.4.0:config:data-science-pipelines-operator" + "odh-dashboard:v2.15.0-incubation-fixes:manifests:odh-dashboard" + "notebooks:v1.10.0:manifests:notebook-images" + "kubeflow:v1.7.0-3:components/notebook-controller/config:odh-notebook-controller/kf-notebook-controller" + "kubeflow:v1.7.0-3:components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller" ) # pre-cleanup local env @@ -18,7 +18,7 @@ GITHUB_URL="https://github.com/" # update to use different git repo MANIFEST_ORG="opendatahub-io" -MANIFEST_RELEASE="master" +MANIFEST_RELEASE="v1.10.0" MANIFESTS_TARBALL_URL="${GITHUB_URL}/${MANIFEST_ORG}/odh-manifests/tarball/${MANIFEST_RELEASE}" mkdir -p ./.odh-manifests-tmp/ ./odh-manifests/ wget -q -c ${MANIFESTS_TARBALL_URL} -O - | tar -zxv -C ./.odh-manifests-tmp/ --strip-components 1 > /dev/null @@ -28,6 +28,9 @@ cp -r ./.odh-manifests-tmp/modelmesh-monitoring/ ./odh-manifests cp -r ./.odh-manifests-tmp/prometheus ./odh-manifests cp -r ./.odh-manifests-tmp/trustyai-service-operator ./odh-manifests cp -r ./.odh-manifests-tmp/odh-common ./odh-manifests +# This is required, so that base dir under odh-notebook-controller. Overlays are not working with KfDef +mkdir -p ./odh-manifests/odh-notebook-controller/base +cp -r ./.odh-manifests-tmp/odh-notebook-controller/base/ ./odh-manifests/odh-notebook-controller rm -rf ${MANIFEST_RELEASE}.tar.gz ./.odh-manifests-tmp/ for repo_info in ${REPO_LIST[@]}; do @@ -43,3 +46,4 @@ for repo_info in ${REPO_LIST[@]}; do cp -rf ./.${repo_name}/${source_path}/* ./odh-manifests/${target_path} rm -rf ./.${repo_name} done +