Merge branch 'opendatahub-io:main' into rhai-helm-chart

alexxfan · web-flow · commit 321c93196528 · 2026-03-30T10:04:05.000+01:00
diff --git a/README.md b/README.md
@@ -141,7 +141,7 @@ To add a new dependency, follow the [Contributing](CONTRIBUTING.md#add-a-new-dep
 
 ### Prerequisites
 
-- OpenShift cluster (version 4.19 or later)
+- OpenShift cluster (version 4.19.9 or later)
 - `kubectl` or `oc` CLI installed
 - Cluster admin permissions
 - Kustomize v5 or later (optional - `kubectl` has built-in Kustomize support)
diff --git a/charts/odh-rhoai/Chart.yaml b/charts/odh-rhoai/Chart.yaml
@@ -9,3 +9,4 @@ keywords:
   - rhoai
   - odh
   - ai
+  - rhaii
diff --git a/charts/odh-rhoai/README.md b/charts/odh-rhoai/README.md
@@ -13,12 +13,17 @@ This chart provides a flexible way to install the operators and configurations r
 
 ## Quick Start
 
+> [!NOTE]
+> All commands below assume you are in the repository root directory.
+
 ```bash
 # Install dependencies with default settings. We need to install the dependencies before the operator is installed.
-helm upgrade --install rhoai ./chart -n opendatahub-gitops --create-namespace
+# Set OPERATOR_TYPE to: odh | rhoai
+export OPERATOR_TYPE=${OPERATOR_TYPE:-odh}
+helm upgrade --install ${OPERATOR_TYPE} ./charts/odh-rhoai -n ${OPERATOR_TYPE}-gitops --create-namespace --set operator.type=${OPERATOR_TYPE}
 
 # Wait for CRDs to be created, then run again to create CRs
-helm upgrade --install rhoai ./chart -n opendatahub-gitops
+helm upgrade --install ${OPERATOR_TYPE} ./charts/odh-rhoai -n ${OPERATOR_TYPE}-gitops --create-namespace --set operator.type=${OPERATOR_TYPE}
 ```
 
 ## Installation Flow
@@ -27,7 +32,7 @@ Due to CRD dependencies (operators create CRDs that are needed for CR resources)
 
 ```bash
 for i in {1..5}; do
-  helm upgrade --install rhoai ./chart -n opendatahub-gitops --create-namespace
+  helm upgrade --install ${OPERATOR_TYPE} ./charts/odh-rhoai -n ${OPERATOR_TYPE}-gitops --create-namespace --set operator.type=${OPERATOR_TYPE}
   sleep 60
 done
 ```
diff --git a/charts/odh-rhoai/api-docs.md b/charts/odh-rhoai/api-docs.md
@@ -125,7 +125,7 @@ A Helm chart for installing ODH/RHOAI dependencies and component configurations
 | olm.sourceNamespace | string | `"openshift-marketplace"` | Namespace of the catalog source |
 | operator.enabled | bool | `true` | Enable operator installation |
 | operator.odh | object | `{"applicationsNamespace":"opendatahub","monitoringNamespace":"opendatahub","olm":{"channel":"fast-3","name":"opendatahub-operator","namespace":"opendatahub-operator-system","source":"community-operators"}}` | ODH operator settings |
-| operator.rhoai | object | `{"applicationsNamespace":"redhat-ods-applications","monitoringNamespace":"redhat-ods-monitoring","olm":{"channel":"fast-3.x","name":"rhods-operator","namespace":"redhat-ods-operator","source":"redhat-operators"}}` | RHOAI operator settings |
+| operator.rhoai | object | `{"applicationsNamespace":"redhat-ods-applications","monitoringNamespace":"redhat-ods-monitoring","olm":{"channel":"beta","name":"rhods-operator","namespace":"redhat-ods-operator","source":"redhat-operators"}}` | RHOAI operator settings |
 | operator.type | string | `"odh"` | Operator type: odh (Open Data Hub) or rhoai (Red Hat OpenShift AI) |
 | services.monitoring | object | `{"dependencies":{"clusterObservability":true,"opentelemetry":true,"tempo":true},"dsci":{"alerting":{},"managementState":"Managed","metrics":{},"traces":{}}}` | Monitoring service configuration |
 | skipCrdCheck | bool | `false` | Skip CRD existence check - render all CRs regardless. Set to true for ArgoCD. |
diff --git a/charts/odh-rhoai/templates/NOTES.txt b/charts/odh-rhoai/templates/NOTES.txt
@@ -33,7 +33,7 @@ Namespace: {{ .Release.Namespace }}
 === Next Steps ===
 
 1. Wait for operators to be ready:
-   kubectl get csv -A | grep -E "(rhods|opendatahub|kueue|cert-manager)"
+   kubectl get csv -A | grep -E "(rhods|opendatahub|cert-manager|leader-worker)"
 
 2. If CRs were not created (first install), run again:
    helm upgrade --install {{ .Release.Name }} ./chart -n {{ .Release.Namespace }}
diff --git a/charts/odh-rhoai/test/snapshots/inference-only.snap.yaml b/charts/odh-rhoai/test/snapshots/inference-only.snap.yaml
@@ -266,7 +266,7 @@ metadata:
     helm.sh/chart: HELM_CHART_VERSION_REDACTED
     app.kubernetes.io/managed-by: Helm
 spec:
-  channel: fast-3.x
+  channel: beta
   installPlanApproval: Automatic
   name: rhods-operator
   source: redhat-operators
diff --git a/charts/odh-rhoai/test/snapshots/skip-crd-check-rhoai.snap.yaml b/charts/odh-rhoai/test/snapshots/skip-crd-check-rhoai.snap.yaml
@@ -486,7 +486,7 @@ metadata:
     helm.sh/chart: HELM_CHART_VERSION_REDACTED
     app.kubernetes.io/managed-by: Helm
 spec:
-  channel: fast-3.x
+  channel: beta
   installPlanApproval: Automatic
   name: rhods-operator
   source: redhat-operators
diff --git a/charts/odh-rhoai/values.schema.json b/charts/odh-rhoai/values.schema.json
@@ -134,6 +134,9 @@
         },
         "llamastackoperator": {
           "$ref": "#/definitions/component"
+        },
+        "sparkoperator": {
+          "$ref": "#/definitions/component"
         }
       },
       "additionalProperties": false
diff --git a/charts/odh-rhoai/values.yaml b/charts/odh-rhoai/values.yaml
@@ -51,7 +51,7 @@ operator:
     applicationsNamespace: redhat-ods-applications
 
     olm:
-      channel: fast-3.x
+      channel: beta
       name: rhods-operator
       namespace: redhat-ods-operator
       source: redhat-operators
diff --git a/charts/rhaii-helm-chart/api-docs.md b/charts/rhaii-helm-chart/api-docs.md
@@ -49,5 +49,5 @@ Red Hat OpenShift AI Operator Helm chart (non-OLM installation)
 | rhaiOperator.image | string | `"quay.io/opendatahub/opendatahub-operator:latest"` |  |
 | rhaiOperator.imagePullPolicy | string | `"Always"` |  |
 | rhaiOperator.namespace | string | `"redhat-ods-operator"` |  |
-| rhaiOperator.relatedImages | object | `{}` |  |
+| rhaiOperator.relatedImages | list | `[]` |  |
 
diff --git a/charts/rhaii-helm-chart/scripts/update-bundle.sh b/charts/rhaii-helm-chart/scripts/update-bundle.sh
@@ -29,7 +29,7 @@ CHART_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
 NAMESPACE="redhat-ods-operator"
 
 # helmtemplate-generator Go module
-HELMTEMPLATE_GENERATOR_PKG="github.com/davidebianchi/helmtemplate-generator@64f313ee820134546c77d04c69f5a6cb86f4c737"
+HELMTEMPLATE_GENERATOR_PKG="github.com/davidebianchi/helmtemplate-generator@7d76ac29fe5f7cdc6a6c9b953f8dc715ee348bef"
 
 # Cloud mappings: <cloud_name> <kustomize_subdir> <output_subdir>
 CLOUD_TARGETS=(
diff --git a/charts/rhaii-helm-chart/templates/manager/deployment-rhods-operator.yaml b/charts/rhaii-helm-chart/templates/manager/deployment-rhods-operator.yaml
@@ -93,7 +93,7 @@ spec:
             - name: RHAI_DISABLE_SETUPCONTROLLER_SERVICE
               value: "true"
             - name: RHAI_APPLICATIONS_NAMESPACE
-              value: {{ .Values.rhaiOperator.applicationsNamespace }}
+              value: {{ .Values.rhaiOperator.applicationsNamespace | quote }}
             - name: ODH_PLATFORM_TYPE
               value: XKS
             - name: OPERATOR_NAME
@@ -104,9 +104,9 @@ spec:
                   fieldPath: metadata.namespace
             - name: DEFAULT_MANIFESTS_PATH
               value: /opt/manifests
-            {{- range $name, $value := .Values.rhaiOperator.relatedImages }}
-            - name: {{ $name }}
-              value: {{ $value }}
+            {{- range $item := .Values.rhaiOperator.relatedImages }}
+            - name: {{ $item.name | quote }}
+              value: {{ $item.value | quote }}
             {{- end }}
           image: {{ .Values.rhaiOperator.image }}
           imagePullPolicy: {{ .Values.rhaiOperator.imagePullPolicy }}
diff --git a/charts/rhaii-helm-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml b/charts/rhaii-helm-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml
@@ -3,7 +3,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: redhat-ods-operator/opendatahub-operator-webhook-cert
+    cert-manager.io/inject-ca-from: {{ .Values.rhaiOperator.namespace }}/opendatahub-operator-webhook-cert
   name: rhods-operator-mutating-webhook-configuration
   namespace: {{ .Values.rhaiOperator.namespace }}
 webhooks:
diff --git a/charts/rhaii-helm-chart/test/snapshots/azure-with-pull-secret.snap.yaml b/charts/rhaii-helm-chart/test/snapshots/azure-with-pull-secret.snap.yaml
@@ -2642,7 +2642,7 @@ spec:
             - name: RHAI_DISABLE_SETUPCONTROLLER_SERVICE
               value: "true"
             - name: RHAI_APPLICATIONS_NAMESPACE
-              value: redhat-ods-applications
+              value: "redhat-ods-applications"
             - name: ODH_PLATFORM_TYPE
               value: XKS
             - name: OPERATOR_NAME
diff --git a/charts/rhaii-helm-chart/test/snapshots/azure-with-related-images.snap.yaml b/charts/rhaii-helm-chart/test/snapshots/azure-with-related-images.snap.yaml
@@ -2504,7 +2504,7 @@ spec:
             - name: RHAI_DISABLE_SETUPCONTROLLER_SERVICE
               value: "true"
             - name: RHAI_APPLICATIONS_NAMESPACE
-              value: redhat-ods-applications
+              value: "redhat-ods-applications"
             - name: ODH_PLATFORM_TYPE
               value: XKS
             - name: OPERATOR_NAME
@@ -2515,8 +2515,8 @@ spec:
                   fieldPath: metadata.namespace
             - name: DEFAULT_MANIFESTS_PATH
               value: /opt/manifests
-            - name: RELATED_IMAGE_ODH_KSERVE_CONTROLLER_IMAGE
-              value: quay.io/opendatahub/kserve-controller:latest
+            - name: "RELATED_IMAGE_ODH_KSERVE_CONTROLLER_IMAGE"
+              value: "quay.io/opendatahub/kserve-controller:latest"
           image: quay.io/opendatahub/opendatahub-operator:latest
           imagePullPolicy: Always
           livenessProbe:
diff --git a/charts/rhaii-helm-chart/test/snapshots/coreweave-with-pull-secret.snap.yaml b/charts/rhaii-helm-chart/test/snapshots/coreweave-with-pull-secret.snap.yaml
@@ -2642,7 +2642,7 @@ spec:
             - name: RHAI_DISABLE_SETUPCONTROLLER_SERVICE
               value: "true"
             - name: RHAI_APPLICATIONS_NAMESPACE
-              value: redhat-ods-applications
+              value: "redhat-ods-applications"
             - name: ODH_PLATFORM_TYPE
               value: XKS
             - name: OPERATOR_NAME
diff --git a/charts/rhaii-helm-chart/test/snapshots/coreweave.snap.yaml b/charts/rhaii-helm-chart/test/snapshots/coreweave.snap.yaml
@@ -2504,7 +2504,7 @@ spec:
             - name: RHAI_DISABLE_SETUPCONTROLLER_SERVICE
               value: "true"
             - name: RHAI_APPLICATIONS_NAMESPACE
-              value: redhat-ods-applications
+              value: "redhat-ods-applications"
             - name: ODH_PLATFORM_TYPE
               value: XKS
             - name: OPERATOR_NAME
diff --git a/charts/rhaii-helm-chart/test/snapshots/with-custom-namespace.snap.yaml b/charts/rhaii-helm-chart/test/snapshots/with-custom-namespace.snap.yaml
@@ -2504,7 +2504,7 @@ spec:
             - name: RHAI_DISABLE_SETUPCONTROLLER_SERVICE
               value: "true"
             - name: RHAI_APPLICATIONS_NAMESPACE
-              value: rhai-applications
+              value: "rhai-applications"
             - name: ODH_PLATFORM_TYPE
               value: XKS
             - name: OPERATOR_NAME
@@ -2570,7 +2570,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: redhat-ods-operator/opendatahub-operator-webhook-cert
+    cert-manager.io/inject-ca-from: rhai-operator/opendatahub-operator-webhook-cert
   name: rhods-operator-mutating-webhook-configuration
   namespace: rhai-operator
 webhooks:
diff --git a/charts/rhaii-helm-chart/values.schema.json b/charts/rhaii-helm-chart/values.schema.json
@@ -77,10 +77,20 @@
           "description": "Manager container image"
         },
         "relatedImages": {
-          "type": "object",
+          "type": "array",
           "description": "Related images env vars (RELATED_IMAGE_*) for disconnected environments",
-          "additionalProperties": {
-            "type": "string"
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "name": {
+                "type": "string"
+              },
+              "value": {
+                "type": "string"
+              }
+            },
+            "required": ["name", "value"]
           }
         }
       }
diff --git a/charts/rhaii-helm-chart/values.yaml b/charts/rhaii-helm-chart/values.yaml
@@ -17,10 +17,11 @@ rhaiOperator:
   # Image pull policy
   imagePullPolicy: Always
   # Related images env vars (RELATED_IMAGE_*)
-  relatedImages: {}
+  relatedImages: []
   # Example:
   # relatedImages:
-  #   RELATED_IMAGE_ODH_KSERVE_CONTROLLER_IMAGE: quay.io/opendatahub/kserve-controller:latest
+  #   - name: RELATED_IMAGE_ODH_KSERVE_CONTROLLER_IMAGE
+  #     value: quay.io/opendatahub/kserve-controller:latest
 
 # Components configuration
 components:
diff --git a/docs/examples/values-inference-only.yaml b/docs/examples/values-inference-only.yaml
@@ -10,9 +10,9 @@
 #   - RHCL / Kuadrant     (API management / Authorino)
 #
 # Usage:
-#   helm upgrade --install rhoai ./charts/odh-rhoai \
+#   helm upgrade --install rhaii ./charts/odh-rhoai \
 #     -f docs/examples/values-inference-only.yaml \
-#     -n opendatahub-gitops --create-namespace
+#     -n rhaii-gitops --create-namespace
 # =============================================================================
 
 # -- Set skipCrdCheck to true for ArgoCD (see docs/inference-only-stack.md)
@@ -21,7 +21,7 @@
 # -- Operator configuration
 operator:
   enabled: true
-  type: rhoai  # Change to "odh" for Open Data Hub
+  type: rhoai
 
 # -- Disable monitoring (not needed for inference-only)
 services:
@@ -51,6 +51,8 @@ components:
         managementState: Removed
       nim:
         managementState: Removed
+      wva:
+        managementState: Removed
 
   # -- Disable all non-inference components
   aipipelines:
@@ -100,3 +102,7 @@ components:
   llamastackoperator:
     dsc:
       managementState: Removed
+
+  sparkoperator:
+    dsc:
+      managementState: Removed
diff --git a/docs/inference-only-stack.md b/docs/inference-only-stack.md
@@ -28,7 +28,7 @@ The stack installs a minimal set of dependency operators required by KServe:
 
 ## Prerequisites
 
-- OpenShift cluster (version 4.19 or later)
+- OpenShift cluster (version 4.19.9 or later)
 - `kubectl` or `oc` CLI installed
 - Cluster admin permissions
 - Helm v4
@@ -43,7 +43,7 @@ The values override configures the chart to install:
 4. **DataScienceCluster** (DSC) with only KServe set to `Managed`
 
 All other components (AI Pipelines, Dashboard, Feast, Kueue, Model Registry, Ray, Trainer, Training Operator, TrustyAI,
-Workbenches, MLflow, LlamaStack) are set to `Removed`.
+Workbenches, MLflow, LlamaStack, Spark Operator) are set to `Removed`.
 
 ## Values Override
 
@@ -86,6 +86,8 @@ components:
         managementState: Removed
       nim:
         managementState: Removed
+      wva:
+        managementState: Removed
 
   # -- Disable all non-inference components
   aipipelines:
@@ -135,6 +137,10 @@ components:
   llamastackoperator:
     dsc:
       managementState: Removed
+
+  sparkoperator:
+    dsc:
+      managementState: Removed
 ```
 
 > [!NOTE]
@@ -157,9 +163,9 @@ The first run installs the OLM subscriptions (Namespace, OperatorGroup, Subscrip
 CRDs do not exist yet.
 
 ```bash
-helm upgrade --install rhoai ./charts/odh-rhoai \
+helm upgrade --install rhaii ./charts/odh-rhoai \
   -f docs/examples/values-inference-only.yaml \
-  -n opendatahub-gitops --create-namespace
+  -n rhaii-gitops --create-namespace
 ```
 
 ### 3. Wait for CRDs
@@ -189,9 +195,9 @@ Now that CRDs exist, the second run creates the CR resources (DSCInitialization,
 LeaderWorkerSetOperator, etc.):
 
 ```bash
-helm upgrade --install rhoai ./charts/odh-rhoai \
+helm upgrade --install rhaii ./charts/odh-rhoai \
   -f docs/examples/values-inference-only.yaml \
-  -n opendatahub-gitops
+  -n rhaii-gitops
 ```
 
 ### 5. Enable Authorino TLS (post-install)
@@ -278,9 +284,9 @@ install:
 2. Run `helm upgrade` again. CRs are skipped until their CRDs exist:
 
    ```bash
-   helm upgrade --install rhoai ./charts/odh-rhoai \
+   helm upgrade --install rhaii ./charts/odh-rhoai \
      -f docs/examples/values-inference-only.yaml \
-     -n opendatahub-gitops
+     -n rhaii-gitops
    ```
 
 ### Authorino TLS issues
diff --git a/scripts/extract-olm-bundle.sh b/scripts/extract-olm-bundle.sh
@@ -36,7 +36,7 @@ trap 'echo "ERROR: Script failed at line $LINENO" >&2; exit 1' ERR
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # helmtemplate-generator Go module (used via go run)
-HELMTEMPLATE_GENERATOR_PKG="github.com/davidebianchi/helmtemplate-generator@3bc347fc1affd320b7829e64d262c9c5c6f4c40f"
+HELMTEMPLATE_GENERATOR_PKG="github.com/davidebianchi/helmtemplate-generator@7d76ac29fe5f7cdc6a6c9b953f8dc715ee348bef"
 
 # OLM extractor image
 OLM_EXTRACTOR_IMAGE="quay.io/lburgazzoli/olm-extractor:main"
diff --git a/scripts/snapshot-config.yaml b/scripts/snapshot-config.yaml
@@ -72,7 +72,8 @@ charts:
       - name: azure-with-related-images
         setFlags:
           - azure.enabled=true
-          - rhaiOperator.relatedImages.RELATED_IMAGE_ODH_KSERVE_CONTROLLER_IMAGE=quay.io/opendatahub/kserve-controller:latest
+          - rhaiOperator.relatedImages[0].name=RELATED_IMAGE_ODH_KSERVE_CONTROLLER_IMAGE
+          - rhaiOperator.relatedImages[0].value=quay.io/opendatahub/kserve-controller:latest
 
       - name: with-custom-namespace
         setFlags:

-Original file line number
+Diff line change
   - rhoai
   - odh
   - ai
 +  - rhaii