update: add wva and spark into exmpale for xKS (opendatahub-io#57)

- correct docs
- fix MWC annotation namespace value

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

Author: zdtsw

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)

charts/odh-rhoai/Chart.yaml

@@ -9,3 +9,4 @@ keywords:
   - rhoai
   - odh
   - ai
+  - rhaii

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
 ```

charts/odh-rhoai/values.schema.json

@@ -134,6 +134,9 @@
         },
         "llamastackoperator": {
           "$ref": "#/definitions/component"
+        },
+        "sparkoperator": {
+          "$ref": "#/definitions/component"
         }
       },
       "additionalProperties": false

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=(

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:

charts/rhaii-helm-chart/test/snapshots/with-custom-namespace.snap.yaml

@@ -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:

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

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

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"