Skip to content

Commit c1fe090

Browse files
chore: update related images (opendatahub-io#58)
1 parent 0d31b40 commit c1fe090

10 files changed

Lines changed: 30 additions & 18 deletions

charts/rhaii-helm-chart/api-docs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ Red Hat OpenShift AI Operator Helm chart (non-OLM installation)
4949
| rhaiOperator.image | string | `"quay.io/opendatahub/opendatahub-operator:latest"` | |
5050
| rhaiOperator.imagePullPolicy | string | `"Always"` | |
5151
| rhaiOperator.namespace | string | `"redhat-ods-operator"` | |
52-
| rhaiOperator.relatedImages | object | `{}` | |
52+
| rhaiOperator.relatedImages | list | `[]` | |
5353

charts/rhaii-helm-chart/templates/manager/deployment-rhods-operator.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ spec:
9393
- name: RHAI_DISABLE_SETUPCONTROLLER_SERVICE
9494
value: "true"
9595
- name: RHAI_APPLICATIONS_NAMESPACE
96-
value: {{ .Values.rhaiOperator.applicationsNamespace }}
96+
value: {{ .Values.rhaiOperator.applicationsNamespace | quote }}
9797
- name: ODH_PLATFORM_TYPE
9898
value: XKS
9999
- name: OPERATOR_NAME
@@ -104,9 +104,9 @@ spec:
104104
fieldPath: metadata.namespace
105105
- name: DEFAULT_MANIFESTS_PATH
106106
value: /opt/manifests
107-
{{- range $name, $value := .Values.rhaiOperator.relatedImages }}
108-
- name: {{ $name }}
109-
value: {{ $value }}
107+
{{- range $item := .Values.rhaiOperator.relatedImages }}
108+
- name: {{ $item.name | quote }}
109+
value: {{ $item.value | quote }}
110110
{{- end }}
111111
image: {{ .Values.rhaiOperator.image }}
112112
imagePullPolicy: {{ .Values.rhaiOperator.imagePullPolicy }}

charts/rhaii-helm-chart/test/snapshots/azure-with-pull-secret.snap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2642,7 +2642,7 @@ spec:
26422642
- name: RHAI_DISABLE_SETUPCONTROLLER_SERVICE
26432643
value: "true"
26442644
- name: RHAI_APPLICATIONS_NAMESPACE
2645-
value: redhat-ods-applications
2645+
value: "redhat-ods-applications"
26462646
- name: ODH_PLATFORM_TYPE
26472647
value: XKS
26482648
- name: OPERATOR_NAME

charts/rhaii-helm-chart/test/snapshots/azure-with-related-images.snap.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2504,7 +2504,7 @@ spec:
25042504
- name: RHAI_DISABLE_SETUPCONTROLLER_SERVICE
25052505
value: "true"
25062506
- name: RHAI_APPLICATIONS_NAMESPACE
2507-
value: redhat-ods-applications
2507+
value: "redhat-ods-applications"
25082508
- name: ODH_PLATFORM_TYPE
25092509
value: XKS
25102510
- name: OPERATOR_NAME
@@ -2515,8 +2515,8 @@ spec:
25152515
fieldPath: metadata.namespace
25162516
- name: DEFAULT_MANIFESTS_PATH
25172517
value: /opt/manifests
2518-
- name: RELATED_IMAGE_ODH_KSERVE_CONTROLLER_IMAGE
2519-
value: quay.io/opendatahub/kserve-controller:latest
2518+
- name: "RELATED_IMAGE_ODH_KSERVE_CONTROLLER_IMAGE"
2519+
value: "quay.io/opendatahub/kserve-controller:latest"
25202520
image: quay.io/opendatahub/opendatahub-operator:latest
25212521
imagePullPolicy: Always
25222522
livenessProbe:

charts/rhaii-helm-chart/test/snapshots/coreweave-with-pull-secret.snap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2642,7 +2642,7 @@ spec:
26422642
- name: RHAI_DISABLE_SETUPCONTROLLER_SERVICE
26432643
value: "true"
26442644
- name: RHAI_APPLICATIONS_NAMESPACE
2645-
value: redhat-ods-applications
2645+
value: "redhat-ods-applications"
26462646
- name: ODH_PLATFORM_TYPE
26472647
value: XKS
26482648
- name: OPERATOR_NAME

charts/rhaii-helm-chart/test/snapshots/coreweave.snap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2504,7 +2504,7 @@ spec:
25042504
- name: RHAI_DISABLE_SETUPCONTROLLER_SERVICE
25052505
value: "true"
25062506
- name: RHAI_APPLICATIONS_NAMESPACE
2507-
value: redhat-ods-applications
2507+
value: "redhat-ods-applications"
25082508
- name: ODH_PLATFORM_TYPE
25092509
value: XKS
25102510
- name: OPERATOR_NAME

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2504,7 +2504,7 @@ spec:
25042504
- name: RHAI_DISABLE_SETUPCONTROLLER_SERVICE
25052505
value: "true"
25062506
- name: RHAI_APPLICATIONS_NAMESPACE
2507-
value: rhai-applications
2507+
value: "rhai-applications"
25082508
- name: ODH_PLATFORM_TYPE
25092509
value: XKS
25102510
- name: OPERATOR_NAME

charts/rhaii-helm-chart/values.schema.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,20 @@
7777
"description": "Manager container image"
7878
},
7979
"relatedImages": {
80-
"type": "object",
80+
"type": "array",
8181
"description": "Related images env vars (RELATED_IMAGE_*) for disconnected environments",
82-
"additionalProperties": {
83-
"type": "string"
82+
"items": {
83+
"type": "object",
84+
"additionalProperties": false,
85+
"properties": {
86+
"name": {
87+
"type": "string"
88+
},
89+
"value": {
90+
"type": "string"
91+
}
92+
},
93+
"required": ["name", "value"]
8494
}
8595
}
8696
}

charts/rhaii-helm-chart/values.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ rhaiOperator:
1717
# Image pull policy
1818
imagePullPolicy: Always
1919
# Related images env vars (RELATED_IMAGE_*)
20-
relatedImages: {}
20+
relatedImages: []
2121
# Example:
2222
# relatedImages:
23-
# RELATED_IMAGE_ODH_KSERVE_CONTROLLER_IMAGE: quay.io/opendatahub/kserve-controller:latest
23+
# - name: RELATED_IMAGE_ODH_KSERVE_CONTROLLER_IMAGE
24+
# value: quay.io/opendatahub/kserve-controller:latest
2425

2526
# Components configuration
2627
components:

scripts/snapshot-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ charts:
7272
- name: azure-with-related-images
7373
setFlags:
7474
- azure.enabled=true
75-
- rhaiOperator.relatedImages.RELATED_IMAGE_ODH_KSERVE_CONTROLLER_IMAGE=quay.io/opendatahub/kserve-controller:latest
75+
- rhaiOperator.relatedImages[0].name=RELATED_IMAGE_ODH_KSERVE_CONTROLLER_IMAGE
76+
- rhaiOperator.relatedImages[0].value=quay.io/opendatahub/kserve-controller:latest
7677

7778
- name: with-custom-namespace
7879
setFlags:

0 commit comments

Comments
 (0)