Skip to content

Commit

Permalink
Merge pull request #565 from VaishnaviHire/release_1.10
Browse files Browse the repository at this point in the history
ODH Release 1.10 for operator v1.10.0
  • Loading branch information
VaishnaviHire authored Sep 27, 2023
2 parents 8e03b1b + ffb969d commit d9fdcc9
Show file tree
Hide file tree
Showing 9 changed files with 163 additions and 21 deletions.
60 changes: 60 additions & 0 deletions bundle/manifests/dashboard.opendatahub.io_acceleratorprofiles.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 11 additions & 6 deletions bundle/manifests/opendatahub-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
8 changes: 8 additions & 0 deletions bundle/manifests/opendatahub.io_odhdashboardconfigs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ spec:
properties:
disableBYONImageStream:
type: boolean
disableBiasMetrics:
type: boolean
disableClusterManager:
type: boolean
disableCustomServingRuntimes:
Expand All @@ -31,6 +33,8 @@ spec:
type: boolean
disableModelServing:
type: boolean
disablePerformanceMetrics:
type: boolean
disablePipelines:
type: boolean
disableProjectSharing:
Expand Down Expand Up @@ -138,6 +142,10 @@ spec:
- resources
type: object
type: array
templateDisablement:
items:
type: string
type: array
templateOrder:
items:
type: string
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ spec:
type: string
disablePipelines:
type: boolean
disableBiasMetrics:
type: boolean
disablePerformanceMetrics:
type: boolean
groupsConfig:
type: object
required:
Expand Down Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand All @@ -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
Expand Down Expand Up @@ -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
16 changes: 10 additions & 6 deletions get_all_manifests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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

0 comments on commit d9fdcc9

Please sign in to comment.