Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion charts/rhai-on-openshift-chart/api-docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down Expand Up @@ -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) |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 10 additions & 1 deletion charts/rhai-on-openshift-chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down Expand Up @@ -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:
Expand Down
7 changes: 5 additions & 2 deletions charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -222,7 +225,7 @@ rules:
- 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'
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"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,5 @@ spec:
- name: cert
secret:
defaultMode: 420
secretName: redhat-ods-operator-controller-webhook-cert
secretName: rhai-operator-controller-webhook-cert
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2701,14 +2701,14 @@ 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
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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2565,14 +2565,14 @@ 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
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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2701,14 +2701,14 @@ 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
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:
Expand Down
4 changes: 2 additions & 2 deletions charts/rhai-on-xks-chart/test/snapshots/coreweave.snap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2563,14 +2563,14 @@ 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
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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2563,14 +2563,14 @@ 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
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:
Expand Down
2 changes: 1 addition & 1 deletion components/operators/job-set-operator/subscription.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions docs/examples/values-all-components-managed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ components:
dsc:
managementState: Managed

sparkoperator:
dsc:
managementState: Managed

llamastackoperator:
dsc:
managementState: Managed
Loading