Skip to content

Commit

Permalink
Merge pull request #59 from red-hat-data-services/update_actual_operator
Browse files Browse the repository at this point in the history
Update actual operator
  • Loading branch information
anishasthana authored May 6, 2021
2 parents fd64ed0 + c537f01 commit 654984f
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 18 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@
* Update ODH operator to reconcile updated objects (#119)
### Features
* Implement initial KfDef status (#113)

## Release 1.0.11 (2021-05-05T19:58:47)
### Improvements
* Add community operator release v1.0.10
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: kfdefs.kfdef.apps.kubeflow.org
labels:
component: opendatahub-operator
spec:
group: kfdef.apps.kubeflow.org
names:
kind: KfDef
listKind: KfDefList
plural: kfdefs
singular: kfdef
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: KfDef is the Schema for the kfdefs API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: KfDefSpec defines the desired state of KfDef
type: object
status:
description: KfDefStatus defines the observed state of KfDef
type: object
type: object
version: v1
versions:
- name: v1
served: true
storage: true
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: operators.coreos.com/v1alpha1
kind: ClusterServiceVersion
metadata:
annotations:
operatorframework.io/suggested-namespace: opendatahub
alm-examples: |-
[
{
Expand Down Expand Up @@ -196,7 +195,7 @@ metadata:
},
{
"name": "manifests",
"uri": "https://github.com/opendatahub-io/odh-manifests/tarball/v1.0.0"
"uri": "https://github.com/opendatahub-io/odh-manifests/tarball/v1.0.10"
}
]
}
Expand All @@ -207,10 +206,10 @@ metadata:
description: "Open Data Hub Operator for deployment and management of Open Data Hub and Kubeflow on OpenShift"
support: Open Data Hub
repository: https://github.com/opendatahub-io/opendatahub-operator
createdAt: '2021-01-27T00:00:00Z'
containerImage: quay.io/opendatahub/opendatahub-operator:v1.0.0
createdAt: '2021-04-25T00:00:00Z'
containerImage: quay.io/opendatahub/opendatahub-operator:v1.0.10
certified: 'False'
name: opendatahub-operator.v1.0.0
name: opendatahub-operator.v1.0.10
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand All @@ -229,11 +228,11 @@ spec:
projects share some components, but can be mostly seen as an extension of each other to provide a complete solution for both novice and skilled enterprise users.
### Components
* Spark Thrift Server - **NEW** A service that allows JDBC clients run Spark SQL queries.
* Hue v4.8.0 - **NEW** A service that provides data exploration on Hive and S3 buckets.
* Open Data Hub Dashboard v0.9 - A web dashboard that displays installed Open Data Hub components with easy access to component UIs and documentation
* JupyterHub v0.1.5 - **NEW** spawner User Interface. Open source multi-user notebook platform w/ GPU support.
* Elyra v0.0.5 - JupyterLab notebooks with support for AI workflows
* Spark Thrift Server - A service that allows JDBC clients run Spark SQL queries.
* Hue v4.8.0 - A service that provides data exploration on Hive and S3 buckets.
* Open Data Hub Dashboard v1.0 - A web dashboard that displays installed Open Data Hub components with easy access to component UIs and documentation
* JupyterHub v0.2.8 - Open source multi-user notebook platform w/ GPU support.
* Elyra v0.0.7 - JupyterLab notebooks with support for AI workflows
* Ceph Nano v0.7 - Minimal Object Storage provided by Ceph for development use
* Apache Spark v2.4.5 - Unified analytics engine for large-scale data processing
* Prometheus v2.16.0 - Monitoring and alerting tool
Expand All @@ -242,19 +241,19 @@ spec:
* Seldon v1.2.0 - Open source platform for deploying machine learning models
* Argo v2.12.5 - Container-native Workflow Engine
* Apache Superset v0.30.0 - Open source application for data exploration and visualization
* Apache Kafka v2.4.0 - The open source stream processing platform
* Apache Kafka v2.7.0 - The open source stream processing platform
To install one or multiple of these components use the default KfDef provided with the operator.
### Kubeflow Components
ODH 1.0 supports Kubeflow v1.2.0 and some components such as KF Serving and KFP on Tekton from master branch. This will be updated when Kubeflow v1.3.0 is released. To install Kubeflow v1.2.0 components with KFP using Argo please use this example [KfDef](https://raw.githubusercontent.com/kubeflow/manifests/master/kfdef/kfctl_openshift.v1.2.0.yaml). To install KF Serving with KFP on Tekton please use this example [KfDef](https://raw.githubusercontent.com/kubeflow/manifests/master/kfdef/kfctl_openshift.master.kfptekton.yaml)
ODH 1.0.10 supports Kubeflow v1.2.0 and some components such as KF Serving and KFP on Tekton from master branch. This will be updated when Kubeflow v1.3.0 is released. To install Kubeflow v1.2.0 components with KFP using Argo please use this example [KfDef](https://raw.githubusercontent.com/kubeflow/manifests/v1.2-branch/kfdef/kfctl_openshift.v1.2.0.yaml). To install KF Serving with KFP on Tekton please use this example [KfDef](https://raw.githubusercontent.com/kubeflow/manifests/v1.3-branch/distributions/kfdef/kfctl_openshift.master.kfptekton.yaml)
### Available Channels
#### Beta
Channel `beta` offers the latest version of Open Data Hub operator. It is based on Kubeflow Operator and Kustomize for deployment configuration. This version is compatible with [Open Data Hub manifests](https://github.com/opendatahub-io/odh-manifests/) as well as [Kubeflow manifests](https://github.com/opendatahub-io/manifests). This channel will offer new components and features.
To deploy Kubeflow, use [this example](https://github.com/kubeflow/manifests/blob/master/kfdef/kfctl_openshift.v1.2.0.yaml).
To deploy Kubeflow, use [this example](https://raw.githubusercontent.com/kubeflow/manifests/v1.2-branch/kfdef/kfctl_openshift.v1.2.0.yaml).
displayName: Open Data Hub Operator
icon:
Expand Down Expand Up @@ -302,7 +301,7 @@ spec:
fieldPath: metadata.name
- name: OPERATOR_NAME
value: opendatahub-operator
image: quay.io/opendatahub/opendatahub-operator:v1.0.0
image: quay.io/opendatahub/opendatahub-operator:v1.0.10
imagePullPolicy: Always
name: opendatahub-operator
resources: {}
Expand All @@ -317,7 +316,7 @@ spec:
type: MultiNamespace
- supported: true
type: AllNamespaces
maturity: beta
maturity: stable
links:
- name: Open Data Hub
url: https://opendatahub.io
Expand All @@ -338,8 +337,8 @@ spec:
- OpenShift
- Open Data Hub
- opendatahub
version: 1.0.0
replaces: opendatahub-operator.v0.9.0
version: 1.0.10
replaces: opendatahub-operator.v1.0.0
selector:
matchLabels:
component: opendatahub-operator
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
annotations:
operators.operatorframework.io.bundle.mediatype.v1: "registry+v1"
operators.operatorframework.io.bundle.manifests.v1: "manifests/"
operators.operatorframework.io.bundle.metadata.v1: "metadata/"
operators.operatorframework.io.bundle.package.v1: "opendatahub-operator"
operators.operatorframework.io.bundle.channels.v1: "beta"
operators.operatorframework.io.bundle.channel.default.v1: "beta"
3 changes: 3 additions & 0 deletions deploy/olm-catalog/opendatahub/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
# Use `replaces-mode` or `semver-mode`. Once you switch to `semver-mode`, there is no easy way back.
updateGraph: replaces-mode
2 changes: 1 addition & 1 deletion version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"""opendatahub operator."""


__version__ = "1.0.10"
__version__ = "1.0.11"

0 comments on commit 654984f

Please sign in to comment.