From 76ee4894f2fd49a0be32e3bd598af501a3b030c1 Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Mon, 31 Jul 2023 11:09:24 +0200 Subject: [PATCH] Fix: version number and add description (#388) Signed-off-by: Wen Zhou --- .../v1alpha1/datasciencecluster_types.go | 6 ++++-- ...ciencecluster.opendatahub.io_datascienceclusters.yaml | 6 ++++-- .../opendatahub-operator.clusterserviceversion.yaml | 9 +++------ ...ciencecluster.opendatahub.io_datascienceclusters.yaml | 6 ++++-- .../datasciencecluster/datasciencecluster_controller.go | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/apis/datasciencecluster/v1alpha1/datasciencecluster_types.go b/apis/datasciencecluster/v1alpha1/datasciencecluster_types.go index 3bfcdccfb85..ff219531ca8 100644 --- a/apis/datasciencecluster/v1alpha1/datasciencecluster_types.go +++ b/apis/datasciencecluster/v1alpha1/datasciencecluster_types.go @@ -53,10 +53,12 @@ type Components struct { // Kserve component configuration Kserve kserve.Kserve `json:"kserve,omitempty"` - // CodeFlare component configuration + // CodeFlare component configuration. + // Require CodeFlare operator to be installed before enable component CodeFlare codeflare.CodeFlare `json:"codeflare,omitempty"` - // Ray component configuration + // Ray component configuration. + // Require CodeFlare operator to be installed before enable component Ray ray.Ray `json:"ray,omitempty"` } diff --git a/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml b/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml index 45fa2c2172d..72759153d0b 100644 --- a/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml +++ b/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml @@ -39,7 +39,8 @@ spec: description: Override and fine tune specific component configurations. properties: codeflare: - description: CodeFlare component configuration + description: CodeFlare component configuration Require CodeFlare + operator to be installed before enable component properties: enabled: description: Set to "true" to enable component, "false" to @@ -89,7 +90,8 @@ spec: - enabled type: object ray: - description: Ray component configuration + description: Ray component configuration Require CodeFlare operator + to be installed before enable component properties: enabled: description: Set to "true" to enable component, "false" to diff --git a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml index efaf73bdd0e..bd33e56c461 100644 --- a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml +++ b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml @@ -9,9 +9,6 @@ metadata: "kind": "OdhQuickStart", "metadata": { "annotations": { - "internal.config.kubernetes.io/previousKinds": "OdhQuickStart", - "internal.config.kubernetes.io/previousNames": "create-jupyter-notebook", - "internal.config.kubernetes.io/previousNamespaces": "default", "opendatahub.io/categories": "Getting started,Notebook environments" }, "labels": { @@ -173,7 +170,7 @@ metadata: operators.operatorframework.io/internal-objects: '[dscinitialization.opendatahub.io]' operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/opendatahub-io/opendatahub-operator - name: opendatahub-operator.v0.0.6 + name: opendatahub-operator.v2.0.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -420,7 +417,7 @@ spec: - --leader-elect command: - /manager - image: quay.io/etirelli/opendatahub-operator:dev-0.0.6 + image: REPLACE_IMAGE:latest imagePullPolicy: Always livenessProbe: httpGet: @@ -512,4 +509,4 @@ spec: maturity: alpha provider: name: ODH - version: 0.0.6 + version: 2.0.0 diff --git a/config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml b/config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml index e0c9af96c2c..58e38a993bf 100644 --- a/config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml +++ b/config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml @@ -40,7 +40,8 @@ spec: description: Override and fine tune specific component configurations. properties: codeflare: - description: CodeFlare component configuration + description: CodeFlare component configuration Require CodeFlare + operator to be installed before enable component properties: enabled: description: Set to "true" to enable component, "false" to @@ -90,7 +91,8 @@ spec: - enabled type: object ray: - description: Ray component configuration + description: Ray component configuration Require CodeFlare operator + to be installed before enable component properties: enabled: description: Set to "true" to enable component, "false" to diff --git a/controllers/datasciencecluster/datasciencecluster_controller.go b/controllers/datasciencecluster/datasciencecluster_controller.go index eeda9876d57..cefd0f1aea8 100644 --- a/controllers/datasciencecluster/datasciencecluster_controller.go +++ b/controllers/datasciencecluster/datasciencecluster_controller.go @@ -115,7 +115,7 @@ func (r *DataScienceClusterReconciler) Reconcile(ctx context.Context, req ctrl.R } } - // // Ensure all ommited components show up as explicitly disabled + // // Ensure all omitted components show up as explicitly disabled // instance, err = r.updateComponents(instance) // if err != nil { // _ = r.reportError(err, instance, "error updating list of components in the CR")