From 1a85b76aaae1c9d41ae4bfaa139f88e7e63769b1 Mon Sep 17 00:00:00 2001 From: Davide Bianchi <10374360+davidebianchi@users.noreply.github.com> Date: Thu, 2 Apr 2026 14:41:32 +0200 Subject: [PATCH 1/4] fix: rename secret name in manager values to match the new name --- charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml | 3 +++ .../templates/manager/deployment-rhods-operator.yaml | 2 +- .../test/snapshots/azure-with-pull-secret.snap.yaml | 2 +- .../test/snapshots/azure-with-related-images.snap.yaml | 2 +- .../test/snapshots/coreweave-with-pull-secret.snap.yaml | 2 +- charts/rhai-on-xks-chart/test/snapshots/coreweave.snap.yaml | 2 +- .../test/snapshots/with-custom-namespace.snap.yaml | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml b/charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml index 76d97708..c1dc768e 100644 --- a/charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml +++ b/charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml @@ -116,6 +116,9 @@ rules: # Update serviceAccountName reference - path: .spec.template.spec.serviceAccountName value: rhai-operator-controller-manager + # Rename webhook cert secret in volume (rhods-operator to rhai-operator) + - path: .spec.template.spec.volumes[name=cert].secret.secretName + value: rhai-operator-controller-webhook-cert # Rename ServiceAccount - match: diff --git a/charts/rhai-on-xks-chart/templates/manager/deployment-rhods-operator.yaml b/charts/rhai-on-xks-chart/templates/manager/deployment-rhods-operator.yaml index 2f25b293..788a3ce1 100644 --- a/charts/rhai-on-xks-chart/templates/manager/deployment-rhods-operator.yaml +++ b/charts/rhai-on-xks-chart/templates/manager/deployment-rhods-operator.yaml @@ -156,5 +156,5 @@ spec: - name: cert secret: defaultMode: 420 - secretName: redhat-ods-operator-controller-webhook-cert + secretName: rhai-operator-controller-webhook-cert {{- end }} diff --git a/charts/rhai-on-xks-chart/test/snapshots/azure-with-pull-secret.snap.yaml b/charts/rhai-on-xks-chart/test/snapshots/azure-with-pull-secret.snap.yaml index 8103a073..e5b61de1 100644 --- a/charts/rhai-on-xks-chart/test/snapshots/azure-with-pull-secret.snap.yaml +++ b/charts/rhai-on-xks-chart/test/snapshots/azure-with-pull-secret.snap.yaml @@ -2701,7 +2701,7 @@ spec: - name: cert secret: defaultMode: 420 - secretName: redhat-ods-operator-controller-webhook-cert + secretName: rhai-operator-controller-webhook-cert --- # Source: rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml apiVersion: admissionregistration.k8s.io/v1 diff --git a/charts/rhai-on-xks-chart/test/snapshots/azure-with-related-images.snap.yaml b/charts/rhai-on-xks-chart/test/snapshots/azure-with-related-images.snap.yaml index cd0948c1..cec00e65 100644 --- a/charts/rhai-on-xks-chart/test/snapshots/azure-with-related-images.snap.yaml +++ b/charts/rhai-on-xks-chart/test/snapshots/azure-with-related-images.snap.yaml @@ -2565,7 +2565,7 @@ spec: - name: cert secret: defaultMode: 420 - secretName: redhat-ods-operator-controller-webhook-cert + secretName: rhai-operator-controller-webhook-cert --- # Source: rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml apiVersion: admissionregistration.k8s.io/v1 diff --git a/charts/rhai-on-xks-chart/test/snapshots/coreweave-with-pull-secret.snap.yaml b/charts/rhai-on-xks-chart/test/snapshots/coreweave-with-pull-secret.snap.yaml index dec6e943..68291217 100644 --- a/charts/rhai-on-xks-chart/test/snapshots/coreweave-with-pull-secret.snap.yaml +++ b/charts/rhai-on-xks-chart/test/snapshots/coreweave-with-pull-secret.snap.yaml @@ -2701,7 +2701,7 @@ spec: - name: cert secret: defaultMode: 420 - secretName: redhat-ods-operator-controller-webhook-cert + secretName: rhai-operator-controller-webhook-cert --- # Source: rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml apiVersion: admissionregistration.k8s.io/v1 diff --git a/charts/rhai-on-xks-chart/test/snapshots/coreweave.snap.yaml b/charts/rhai-on-xks-chart/test/snapshots/coreweave.snap.yaml index ca6bc0a8..fd2051a4 100644 --- a/charts/rhai-on-xks-chart/test/snapshots/coreweave.snap.yaml +++ b/charts/rhai-on-xks-chart/test/snapshots/coreweave.snap.yaml @@ -2563,7 +2563,7 @@ spec: - name: cert secret: defaultMode: 420 - secretName: redhat-ods-operator-controller-webhook-cert + secretName: rhai-operator-controller-webhook-cert --- # Source: rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml apiVersion: admissionregistration.k8s.io/v1 diff --git a/charts/rhai-on-xks-chart/test/snapshots/with-custom-namespace.snap.yaml b/charts/rhai-on-xks-chart/test/snapshots/with-custom-namespace.snap.yaml index 51ae8c3f..7258f0c8 100644 --- a/charts/rhai-on-xks-chart/test/snapshots/with-custom-namespace.snap.yaml +++ b/charts/rhai-on-xks-chart/test/snapshots/with-custom-namespace.snap.yaml @@ -2563,7 +2563,7 @@ spec: - name: cert secret: defaultMode: 420 - secretName: redhat-ods-operator-controller-webhook-cert + secretName: rhai-operator-controller-webhook-cert --- # Source: rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml apiVersion: admissionregistration.k8s.io/v1 From 7f88a917a3577d3fb963d25b44e7455b0759591f Mon Sep 17 00:00:00 2001 From: Davide Bianchi <10374360+davidebianchi@users.noreply.github.com> Date: Thu, 2 Apr 2026 15:26:18 +0200 Subject: [PATCH 2/4] fix: cert name in mutation webhook --- charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml | 5 +++-- ...ration-rhods-operator-mutating-webhook-configuration.yaml | 2 +- .../test/snapshots/azure-with-pull-secret.snap.yaml | 2 +- .../test/snapshots/azure-with-related-images.snap.yaml | 2 +- .../test/snapshots/coreweave-with-pull-secret.snap.yaml | 2 +- charts/rhai-on-xks-chart/test/snapshots/coreweave.snap.yaml | 2 +- .../test/snapshots/with-custom-namespace.snap.yaml | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml b/charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml index c1dc768e..566b85c4 100644 --- a/charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml +++ b/charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml @@ -224,8 +224,9 @@ rules: changes: - path: .metadata.name value: rhai-operator-mutating-webhook-configuration - - path: .metadata.annotations["cert-manager.io/inject-ca-from"] - value: '{{ .Values.rhaiOperator.namespace }}/rhai-operator-webhook-cert' + # TODO: Uncomment this when the webhook cert secret is renamed + # - path: .metadata.annotations["cert-manager.io/inject-ca-from"] + # value: '{{ .Values.rhaiOperator.namespace }}/rhai-operator-controller-webhook-cert' - path: .webhooks[*].clientConfig.service.name value: rhai-operator-webhook-service - path: .metadata.labels["app.kubernetes.io/created-by"] diff --git a/charts/rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml b/charts/rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml index 78fc2575..35f8bb2e 100644 --- a/charts/rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml +++ b/charts/rhai-on-xks-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: {{ .Values.rhaiOperator.namespace }}/rhai-operator-webhook-cert + cert-manager.io/inject-ca-from: {{ .Values.rhaiOperator.namespace }}/opendatahub-operator-webhook-cert name: rhai-operator-mutating-webhook-configuration namespace: {{ .Values.rhaiOperator.namespace }} labels: diff --git a/charts/rhai-on-xks-chart/test/snapshots/azure-with-pull-secret.snap.yaml b/charts/rhai-on-xks-chart/test/snapshots/azure-with-pull-secret.snap.yaml index e5b61de1..a8a3bac4 100644 --- a/charts/rhai-on-xks-chart/test/snapshots/azure-with-pull-secret.snap.yaml +++ b/charts/rhai-on-xks-chart/test/snapshots/azure-with-pull-secret.snap.yaml @@ -2708,7 +2708,7 @@ apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: annotations: - cert-manager.io/inject-ca-from: redhat-ods-operator/rhai-operator-webhook-cert + cert-manager.io/inject-ca-from: redhat-ods-operator/opendatahub-operator-webhook-cert name: rhai-operator-mutating-webhook-configuration namespace: redhat-ods-operator labels: diff --git a/charts/rhai-on-xks-chart/test/snapshots/azure-with-related-images.snap.yaml b/charts/rhai-on-xks-chart/test/snapshots/azure-with-related-images.snap.yaml index cec00e65..a0d6fdf7 100644 --- a/charts/rhai-on-xks-chart/test/snapshots/azure-with-related-images.snap.yaml +++ b/charts/rhai-on-xks-chart/test/snapshots/azure-with-related-images.snap.yaml @@ -2572,7 +2572,7 @@ apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: annotations: - cert-manager.io/inject-ca-from: redhat-ods-operator/rhai-operator-webhook-cert + cert-manager.io/inject-ca-from: redhat-ods-operator/opendatahub-operator-webhook-cert name: rhai-operator-mutating-webhook-configuration namespace: redhat-ods-operator labels: diff --git a/charts/rhai-on-xks-chart/test/snapshots/coreweave-with-pull-secret.snap.yaml b/charts/rhai-on-xks-chart/test/snapshots/coreweave-with-pull-secret.snap.yaml index 68291217..395d154c 100644 --- a/charts/rhai-on-xks-chart/test/snapshots/coreweave-with-pull-secret.snap.yaml +++ b/charts/rhai-on-xks-chart/test/snapshots/coreweave-with-pull-secret.snap.yaml @@ -2708,7 +2708,7 @@ apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: annotations: - cert-manager.io/inject-ca-from: redhat-ods-operator/rhai-operator-webhook-cert + cert-manager.io/inject-ca-from: redhat-ods-operator/opendatahub-operator-webhook-cert name: rhai-operator-mutating-webhook-configuration namespace: redhat-ods-operator labels: diff --git a/charts/rhai-on-xks-chart/test/snapshots/coreweave.snap.yaml b/charts/rhai-on-xks-chart/test/snapshots/coreweave.snap.yaml index fd2051a4..1a5648eb 100644 --- a/charts/rhai-on-xks-chart/test/snapshots/coreweave.snap.yaml +++ b/charts/rhai-on-xks-chart/test/snapshots/coreweave.snap.yaml @@ -2570,7 +2570,7 @@ apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: annotations: - cert-manager.io/inject-ca-from: redhat-ods-operator/rhai-operator-webhook-cert + cert-manager.io/inject-ca-from: redhat-ods-operator/opendatahub-operator-webhook-cert name: rhai-operator-mutating-webhook-configuration namespace: redhat-ods-operator labels: diff --git a/charts/rhai-on-xks-chart/test/snapshots/with-custom-namespace.snap.yaml b/charts/rhai-on-xks-chart/test/snapshots/with-custom-namespace.snap.yaml index 7258f0c8..47af5ce4 100644 --- a/charts/rhai-on-xks-chart/test/snapshots/with-custom-namespace.snap.yaml +++ b/charts/rhai-on-xks-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: rhai-operator/rhai-operator-webhook-cert + cert-manager.io/inject-ca-from: rhai-operator/opendatahub-operator-webhook-cert name: rhai-operator-mutating-webhook-configuration namespace: rhai-operator labels: From 900d327fe061d5a3ec60fa3c946c5f3af3ee941c Mon Sep 17 00:00:00 2001 From: Davide Bianchi <10374360+davidebianchi@users.noreply.github.com> Date: Thu, 2 Apr 2026 15:41:18 +0200 Subject: [PATCH 3/4] fix: helmtemplate-config --- charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml b/charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml index 566b85c4..09149a68 100644 --- a/charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml +++ b/charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml @@ -80,7 +80,7 @@ rules: changes: # Replace RHAI_APPLICATIONS_NAMESPACE with templated value - path: .spec.template.spec.containers[name=rhods-operator].env[name=RHAI_APPLICATIONS_NAMESPACE].value - value: '{{ .Values.rhaiOperator.applicationsNamespace }}' + value: '{{ .Values.rhaiOperator.applicationsNamespace | quote }}' # Add related images env vars - path: .spec.template.spec.containers[name=rhods-operator].env appendWith: | @@ -224,9 +224,8 @@ rules: changes: - path: .metadata.name value: rhai-operator-mutating-webhook-configuration - # TODO: Uncomment this when the webhook cert secret is renamed - # - path: .metadata.annotations["cert-manager.io/inject-ca-from"] - # value: '{{ .Values.rhaiOperator.namespace }}/rhai-operator-controller-webhook-cert' + - path: .metadata.annotations["cert-manager.io/inject-ca-from"] + value: '{{ .Values.rhaiOperator.namespace }}/opendatahub-operator-webhook-cert' - path: .webhooks[*].clientConfig.service.name value: rhai-operator-webhook-service - path: .metadata.labels["app.kubernetes.io/created-by"] From f6f8dd0cfe08499c2df585b3fc2404a43a8f6a8d Mon Sep 17 00:00:00 2001 From: Davide Bianchi <10374360+davidebianchi@users.noreply.github.com> Date: Wed, 8 Apr 2026 12:46:35 +0200 Subject: [PATCH 4/4] fix(rhai-on-openshift-chart): update jobset operator channel --- charts/rhai-on-openshift-chart/api-docs.md | 6 +++++- .../test/snapshots/all-components-managed.snap.yaml | 2 +- .../test/snapshots/enable-llm-d-wva.snap.yaml | 2 +- charts/rhai-on-openshift-chart/values.yaml | 11 ++++++++++- .../operators/job-set-operator/subscription.yaml | 2 +- docs/examples/values-all-components-managed.yaml | 4 ++++ 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/charts/rhai-on-openshift-chart/api-docs.md b/charts/rhai-on-openshift-chart/api-docs.md index e5c354f8..93db84bf 100644 --- a/charts/rhai-on-openshift-chart/api-docs.md +++ b/charts/rhai-on-openshift-chart/api-docs.md @@ -61,6 +61,10 @@ A Helm chart for installing ODH/RHOAI dependencies and component configurations | components.ray.dependencies | object | `{"certManager":true}` | Dependencies required by Ray | | components.ray.dsc | object | `{"managementState":"Removed"}` | DSC configuration for Ray | | components.ray.dsc.managementState | string | `"Removed"` | Management state for Ray (Managed or Removed) | +| components.sparkoperator | object | `{"dependencies":{},"dsc":{"managementState":"Removed"}}` | Spark Operator component | +| components.sparkoperator.dependencies | object | `{}` | Dependencies required by Spark Operator | +| components.sparkoperator.dsc | object | `{"managementState":"Removed"}` | DSC configuration for Spark Operator | +| components.sparkoperator.dsc.managementState | string | `"Removed"` | Management state for Spark Operator (Managed or Removed) | | components.trainer | object | `{"dependencies":{"certManager":true,"jobSet":true},"dsc":{"managementState":"Removed"}}` | Trainer component | | components.trainer.dependencies | object | `{"certManager":true,"jobSet":true}` | Dependencies required by Trainer | | components.trainer.dsc | object | `{"managementState":"Removed"}` | DSC configuration for Trainer | @@ -89,7 +93,7 @@ A Helm chart for installing ODH/RHOAI dependencies and component configurations | dependencies.customMetricsAutoscaler | object | `{"dependencies":{},"enabled":"auto","olm":{"channel":"stable","name":"openshift-custom-metrics-autoscaler-operator","namespace":"openshift-keda"}}` | Custom Metrics Autoscaler (KEDA) operator | | dependencies.customMetricsAutoscaler.dependencies | object | `{}` | Dependencies required by custom-metrics-autoscaler | | dependencies.customMetricsAutoscaler.enabled | string | `"auto"` | Enable custom-metrics-autoscaler: auto (if needed), true (always), false (never) | -| dependencies.jobSet | object | `{"config":{"spec":{"logLevel":"Normal","operatorLogLevel":"Normal"}},"dependencies":{"certManager":true},"enabled":"auto","olm":{"channel":"tech-preview-v0.1","name":"job-set","namespace":"openshift-jobset-operator","targetNamespaces":["openshift-jobset-operator"]}}` | Job Set operator | +| dependencies.jobSet | object | `{"config":{"spec":{"logLevel":"Normal","operatorLogLevel":"Normal"}},"dependencies":{"certManager":true},"enabled":"auto","olm":{"channel":"stable-v1.0","name":"job-set","namespace":"openshift-jobset-operator","targetNamespaces":["openshift-jobset-operator"]}}` | Job Set operator | | dependencies.jobSet.config.spec | object | `{"logLevel":"Normal","operatorLogLevel":"Normal"}` | JobSetOperator CR spec (user can add any fields supported by the CR) | | dependencies.jobSet.dependencies | object | `{"certManager":true}` | Dependencies required by job-set | | dependencies.jobSet.enabled | string | `"auto"` | Enable job-set: auto (if needed), true (always), false (never) | diff --git a/charts/rhai-on-openshift-chart/test/snapshots/all-components-managed.snap.yaml b/charts/rhai-on-openshift-chart/test/snapshots/all-components-managed.snap.yaml index 9bf95deb..5d03ce0f 100644 --- a/charts/rhai-on-openshift-chart/test/snapshots/all-components-managed.snap.yaml +++ b/charts/rhai-on-openshift-chart/test/snapshots/all-components-managed.snap.yaml @@ -469,7 +469,7 @@ metadata: helm.sh/chart: HELM_CHART_VERSION_REDACTED app.kubernetes.io/managed-by: Helm spec: - channel: tech-preview-v0.1 + channel: stable-v1.0 installPlanApproval: Automatic name: job-set source: redhat-operators diff --git a/charts/rhai-on-openshift-chart/test/snapshots/enable-llm-d-wva.snap.yaml b/charts/rhai-on-openshift-chart/test/snapshots/enable-llm-d-wva.snap.yaml index a133d770..464d8c5a 100644 --- a/charts/rhai-on-openshift-chart/test/snapshots/enable-llm-d-wva.snap.yaml +++ b/charts/rhai-on-openshift-chart/test/snapshots/enable-llm-d-wva.snap.yaml @@ -306,7 +306,7 @@ metadata: helm.sh/chart: HELM_CHART_VERSION_REDACTED app.kubernetes.io/managed-by: Helm spec: - channel: tech-preview-v0.1 + channel: stable-v1.0 installPlanApproval: Automatic name: job-set source: redhat-operators diff --git a/charts/rhai-on-openshift-chart/values.yaml b/charts/rhai-on-openshift-chart/values.yaml index e3c9a837..ec9ea92e 100644 --- a/charts/rhai-on-openshift-chart/values.yaml +++ b/charts/rhai-on-openshift-chart/values.yaml @@ -342,6 +342,15 @@ components: # -- Management state for LlamaStack Operator (Managed or Removed) managementState: Removed + # -- Spark Operator component + sparkoperator: + # -- Dependencies required by Spark Operator + dependencies: {} + # -- DSC configuration for Spark Operator + dsc: + # -- Management state for Spark Operator (Managed or Removed) + managementState: Removed + # ============================================================================= # DEPENDENCIES - Operators required by components # @@ -393,7 +402,7 @@ dependencies: dependencies: certManager: true olm: - channel: tech-preview-v0.1 + channel: stable-v1.0 name: job-set namespace: openshift-jobset-operator targetNamespaces: diff --git a/components/operators/job-set-operator/subscription.yaml b/components/operators/job-set-operator/subscription.yaml index 0e3df545..faf175cd 100644 --- a/components/operators/job-set-operator/subscription.yaml +++ b/components/operators/job-set-operator/subscription.yaml @@ -4,7 +4,7 @@ metadata: name: job-set namespace: openshift-jobset-operator spec: - channel: tech-preview-v0.1 # To be updated once JobSet is GA + channel: stable-v1.0 installPlanApproval: Automatic name: job-set source: redhat-operators diff --git a/docs/examples/values-all-components-managed.yaml b/docs/examples/values-all-components-managed.yaml index 096615ec..e42ed3cb 100644 --- a/docs/examples/values-all-components-managed.yaml +++ b/docs/examples/values-all-components-managed.yaml @@ -80,6 +80,10 @@ components: dsc: managementState: Managed + sparkoperator: + dsc: + managementState: Managed + llamastackoperator: dsc: managementState: Managed