Update bundle for ODH 1.5.0 release

* Set default channel to Rolling * Update odhdashboardconfig * Update CSV for ODH 1.5.0 release * Set rolling as the default channel * Remove Kubeflow from CSV metadata * Format config CSV file * Update generated bundle Signed-off-by: Landon LaSmith <[email protected]>
opendatahub-io · Apr 6, 2023 · e37b846 · e37b846
1 parent b8027a2
commit e37b846
Show file tree

Hide file tree

Showing 7 changed files with 661 additions and 48 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ IMG ?= quay.io/opendatahub/opendatahub-operator:dev-$(VERSION)
 IMAGE_BUILDER ?= podman
 OPERATOR_NAMESPACE ?= opendatahub-operator-system
 CHANNELS="stable,rolling"
-DEFAULT_CHANNEL="stable"
+DEFAULT_CHANNEL="rolling"
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
 # To re-generate a bundle for other specific channels without changing the standard setup, you can:

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=opendatahub-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=stable,rolling
-LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
+LABEL operators.operatorframework.io.bundle.channel.default.v1=rolling
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.24.1
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

diff --git a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml
diff --git a/bundle/manifests/opendatahub.io_odhdashboardconfigs.yaml b/bundle/manifests/opendatahub.io_odhdashboardconfigs.yaml
@@ -27,6 +27,10 @@ spec:
                     type: boolean
                   disableInfo:
                     type: boolean
+                  disableModelServing:
+                    type: boolean
+                  disableProjects:
+                    type: boolean
                   disableSupport:
                     type: boolean
                   disableTracking:
@@ -35,6 +39,8 @@ spec:
                     type: boolean
                   enablement:
                     type: boolean
+                  modelMetricsNamespace:
+                    type: string
                 type: object
               groupsConfig:
                 properties:
@@ -46,10 +52,43 @@ spec:
                 - adminGroups
                 - allowedGroups
                 type: object
+              modelServerSizes:
+                items:
+                  properties:
+                    name:
+                      type: string
+                    resources:
+                      properties:
+                        limits:
+                          properties:
+                            cpu:
+                              type: string
+                            memory:
+                              type: string
+                          type: object
+                        requests:
+                          properties:
+                            cpu:
+                              type: string
+                            memory:
+                              type: string
+                          type: object
+                      type: object
+                  required:
+                  - name
+                  - resources
+                  type: object
+                type: array
               notebookController:
                 properties:
                   enabled:
                     type: boolean
+                  gpuSetting:
+                    description: Configure how the GPU field works on the Jupyter
+                      tile. One of 'autodetect' (default, fetches for information),
+                      'hidden' (remove the field) or a number-string (eg '5') to specify
+                      a hardcoded 0 to that number options
+                    type: string
                   notebookNamespace:
                     type: string
                   notebookTolerationSettings:

diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -5,7 +5,7 @@ annotations:
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: opendatahub-operator
   operators.operatorframework.io.bundle.channels.v1: stable,rolling
-  operators.operatorframework.io.bundle.channel.default.v1: stable
+  operators.operatorframework.io.bundle.channel.default.v1: rolling
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.24.1
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

diff --git a/config/crd/dashboard-crds/odhdashboardconfigs.opendatahub.io.crd.yaml b/config/crd/dashboard-crds/odhdashboardconfigs.opendatahub.io.crd.yaml
@@ -45,6 +45,8 @@ spec:
                       type: boolean
                     disableModelServing:
                       type: boolean
+                    modelMetricsNamespace:
+                      type: string
                 groupsConfig:
                   type: object
                   required:

diff --git a/config/manifests/bases/opendatahub-operator.clusterserviceversion.yaml b/config/manifests/bases/opendatahub-operator.clusterserviceversion.yaml