Skip to content

Commit 01fd114

Browse files
davidebianchidavidebianchi
authored
Merge pull request #14 from davidebianchi/cherry-pick/manifests-channel-fixes
Cherry pick manifests channel fixes
2 parents ae518bc + f6f8dd0 commit 01fd114

14 files changed

Lines changed: 39 additions & 19 deletions

‎charts/rhai-on-openshift-chart/api-docs.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ A Helm chart for installing ODH/RHOAI dependencies and component configurations
6161
| components.ray.dependencies | object | `{"certManager":true}` | Dependencies required by Ray |
6262
| components.ray.dsc | object | `{"managementState":"Removed"}` | DSC configuration for Ray |
6363
| components.ray.dsc.managementState | string | `"Removed"` | Management state for Ray (Managed or Removed) |
64+
| components.sparkoperator | object | `{"dependencies":{},"dsc":{"managementState":"Removed"}}` | Spark Operator component |
65+
| components.sparkoperator.dependencies | object | `{}` | Dependencies required by Spark Operator |
66+
| components.sparkoperator.dsc | object | `{"managementState":"Removed"}` | DSC configuration for Spark Operator |
67+
| components.sparkoperator.dsc.managementState | string | `"Removed"` | Management state for Spark Operator (Managed or Removed) |
6468
| components.trainer | object | `{"dependencies":{"certManager":true,"jobSet":true},"dsc":{"managementState":"Removed"}}` | Trainer component |
6569
| components.trainer.dependencies | object | `{"certManager":true,"jobSet":true}` | Dependencies required by Trainer |
6670
| 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
8993
| dependencies.customMetricsAutoscaler | object | `{"dependencies":{},"enabled":"auto","olm":{"channel":"stable","name":"openshift-custom-metrics-autoscaler-operator","namespace":"openshift-keda"}}` | Custom Metrics Autoscaler (KEDA) operator |
9094
| dependencies.customMetricsAutoscaler.dependencies | object | `{}` | Dependencies required by custom-metrics-autoscaler |
9195
| dependencies.customMetricsAutoscaler.enabled | string | `"auto"` | Enable custom-metrics-autoscaler: auto (if needed), true (always), false (never) |
92-
| 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 |
96+
| 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 |
9397
| dependencies.jobSet.config.spec | object | `{"logLevel":"Normal","operatorLogLevel":"Normal"}` | JobSetOperator CR spec (user can add any fields supported by the CR) |
9498
| dependencies.jobSet.dependencies | object | `{"certManager":true}` | Dependencies required by job-set |
9599
| dependencies.jobSet.enabled | string | `"auto"` | Enable job-set: auto (if needed), true (always), false (never) |

‎charts/rhai-on-openshift-chart/test/snapshots/all-components-managed.snap.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ metadata:
469469
helm.sh/chart: HELM_CHART_VERSION_REDACTED
470470
app.kubernetes.io/managed-by: Helm
471471
spec:
472-
channel: tech-preview-v0.1
472+
channel: stable-v1.0
473473
installPlanApproval: Automatic
474474
name: job-set
475475
source: redhat-operators

‎charts/rhai-on-openshift-chart/test/snapshots/enable-llm-d-wva.snap.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ metadata:
306306
helm.sh/chart: HELM_CHART_VERSION_REDACTED
307307
app.kubernetes.io/managed-by: Helm
308308
spec:
309-
channel: tech-preview-v0.1
309+
channel: stable-v1.0
310310
installPlanApproval: Automatic
311311
name: job-set
312312
source: redhat-operators

‎charts/rhai-on-openshift-chart/values.yaml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,15 @@ components:
342342
# -- Management state for LlamaStack Operator (Managed or Removed)
343343
managementState: Removed
344344

345+
# -- Spark Operator component
346+
sparkoperator:
347+
# -- Dependencies required by Spark Operator
348+
dependencies: {}
349+
# -- DSC configuration for Spark Operator
350+
dsc:
351+
# -- Management state for Spark Operator (Managed or Removed)
352+
managementState: Removed
353+
345354
# =============================================================================
346355
# DEPENDENCIES - Operators required by components
347356
#
@@ -393,7 +402,7 @@ dependencies:
393402
dependencies:
394403
certManager: true
395404
olm:
396-
channel: tech-preview-v0.1
405+
channel: stable-v1.0
397406
name: job-set
398407
namespace: openshift-jobset-operator
399408
targetNamespaces:

‎charts/rhai-on-xks-chart/scripts/helmtemplate-config.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ rules:
8080
changes:
8181
# Replace RHAI_APPLICATIONS_NAMESPACE with templated value
8282
- path: .spec.template.spec.containers[name=rhods-operator].env[name=RHAI_APPLICATIONS_NAMESPACE].value
83-
value: '{{ .Values.rhaiOperator.applicationsNamespace }}'
83+
value: '{{ .Values.rhaiOperator.applicationsNamespace | quote }}'
8484
# Add related images env vars
8585
- path: .spec.template.spec.containers[name=rhods-operator].env
8686
appendWith: |
@@ -116,6 +116,9 @@ rules:
116116
# Update serviceAccountName reference
117117
- path: .spec.template.spec.serviceAccountName
118118
value: rhai-operator-controller-manager
119+
# Rename webhook cert secret in volume (rhods-operator to rhai-operator)
120+
- path: .spec.template.spec.volumes[name=cert].secret.secretName
121+
value: rhai-operator-controller-webhook-cert
119122

120123
# Rename ServiceAccount
121124
- match:
@@ -222,7 +225,7 @@ rules:
222225
- path: .metadata.name
223226
value: rhai-operator-mutating-webhook-configuration
224227
- path: .metadata.annotations["cert-manager.io/inject-ca-from"]
225-
value: '{{ .Values.rhaiOperator.namespace }}/rhai-operator-webhook-cert'
228+
value: '{{ .Values.rhaiOperator.namespace }}/opendatahub-operator-webhook-cert'
226229
- path: .webhooks[*].clientConfig.service.name
227230
value: rhai-operator-webhook-service
228231
- path: .metadata.labels["app.kubernetes.io/created-by"]

‎charts/rhai-on-xks-chart/templates/manager/deployment-rhods-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,5 +156,5 @@ spec:
156156
- name: cert
157157
secret:
158158
defaultMode: 420
159-
secretName: redhat-ods-operator-controller-webhook-cert
159+
secretName: rhai-operator-controller-webhook-cert
160160
{{- end }}

‎charts/rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: admissionregistration.k8s.io/v1
33
kind: MutatingWebhookConfiguration
44
metadata:
55
annotations:
6-
cert-manager.io/inject-ca-from: {{ .Values.rhaiOperator.namespace }}/rhai-operator-webhook-cert
6+
cert-manager.io/inject-ca-from: {{ .Values.rhaiOperator.namespace }}/opendatahub-operator-webhook-cert
77
name: rhai-operator-mutating-webhook-configuration
88
namespace: {{ .Values.rhaiOperator.namespace }}
99
labels:

‎charts/rhai-on-xks-chart/test/snapshots/azure-with-pull-secret.snap.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2701,14 +2701,14 @@ spec:
27012701
- name: cert
27022702
secret:
27032703
defaultMode: 420
2704-
secretName: redhat-ods-operator-controller-webhook-cert
2704+
secretName: rhai-operator-controller-webhook-cert
27052705
---
27062706
# Source: rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml
27072707
apiVersion: admissionregistration.k8s.io/v1
27082708
kind: MutatingWebhookConfiguration
27092709
metadata:
27102710
annotations:
2711-
cert-manager.io/inject-ca-from: redhat-ods-operator/rhai-operator-webhook-cert
2711+
cert-manager.io/inject-ca-from: redhat-ods-operator/opendatahub-operator-webhook-cert
27122712
name: rhai-operator-mutating-webhook-configuration
27132713
namespace: redhat-ods-operator
27142714
labels:

‎charts/rhai-on-xks-chart/test/snapshots/azure-with-related-images.snap.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2565,14 +2565,14 @@ spec:
25652565
- name: cert
25662566
secret:
25672567
defaultMode: 420
2568-
secretName: redhat-ods-operator-controller-webhook-cert
2568+
secretName: rhai-operator-controller-webhook-cert
25692569
---
25702570
# Source: rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml
25712571
apiVersion: admissionregistration.k8s.io/v1
25722572
kind: MutatingWebhookConfiguration
25732573
metadata:
25742574
annotations:
2575-
cert-manager.io/inject-ca-from: redhat-ods-operator/rhai-operator-webhook-cert
2575+
cert-manager.io/inject-ca-from: redhat-ods-operator/opendatahub-operator-webhook-cert
25762576
name: rhai-operator-mutating-webhook-configuration
25772577
namespace: redhat-ods-operator
25782578
labels:

‎charts/rhai-on-xks-chart/test/snapshots/coreweave-with-pull-secret.snap.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2701,14 +2701,14 @@ spec:
27012701
- name: cert
27022702
secret:
27032703
defaultMode: 420
2704-
secretName: redhat-ods-operator-controller-webhook-cert
2704+
secretName: rhai-operator-controller-webhook-cert
27052705
---
27062706
# Source: rhai-on-xks-chart/templates/webhooks/mutatingwebhookconfiguration-rhods-operator-mutating-webhook-configuration.yaml
27072707
apiVersion: admissionregistration.k8s.io/v1
27082708
kind: MutatingWebhookConfiguration
27092709
metadata:
27102710
annotations:
2711-
cert-manager.io/inject-ca-from: redhat-ods-operator/rhai-operator-webhook-cert
2711+
cert-manager.io/inject-ca-from: redhat-ods-operator/opendatahub-operator-webhook-cert
27122712
name: rhai-operator-mutating-webhook-configuration
27132713
namespace: redhat-ods-operator
27142714
labels:

0 commit comments

Comments
 (0)