From ae45384850c78092a78e31ec8262d91c670e61a9 Mon Sep 17 00:00:00 2001 From: Joyjit Chatterjee Date: Thu, 10 Sep 2026 17:20:25 +0000 Subject: [PATCH] feat(helm): inject OPERATOR_VERSION env into ray-endpoint-operator manager --- .../templates/_helpers.tpl | 11 ++++++++++- .../templates/manager/manager.yaml | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/helm_chart/HyperPodHelmChart/charts/hyperpod-ray-endpoint-operator/templates/_helpers.tpl b/helm_chart/HyperPodHelmChart/charts/hyperpod-ray-endpoint-operator/templates/_helpers.tpl index da6408bd..5af97ca2 100644 --- a/helm_chart/HyperPodHelmChart/charts/hyperpod-ray-endpoint-operator/templates/_helpers.tpl +++ b/helm_chart/HyperPodHelmChart/charts/hyperpod-ray-endpoint-operator/templates/_helpers.tpl @@ -62,6 +62,15 @@ Otherwise, use the standard resourceName helper with "controller-manager" suffix {{- end }} {{- end }} +{{/* +Resolve the container image tag. +Defaults to the pinned operator version when .Values.image.tag is not set. +Reused by both imageUri and the manager's OPERATOR_VERSION env var. +*/}} +{{- define "hyperpod-ray-endpoint-operator.imageTag" -}} +{{- .Values.image.tag | default "1.0.188.0_1.0.19.0" -}} +{{- end }} + {{/* Resolve the container image URI. Priority for region: @@ -114,7 +123,7 @@ Priority for image URI: {{- fail (printf "Unsupported AWS region: %s. Set image.override explicitly for non-standard regions." $region) -}} {{- end -}} -{{- $imageTag := .Values.image.tag | default "1.0.188.0_1.0.19.0" -}} +{{- $imageTag := include "hyperpod-ray-endpoint-operator.imageTag" . -}} {{- printf "%s.dkr.ecr.%s.amazonaws.com/hyperpod-ray-endpoint-operator:%s" $accountId $region $imageTag -}} {{- end -}} {{- end }} diff --git a/helm_chart/HyperPodHelmChart/charts/hyperpod-ray-endpoint-operator/templates/manager/manager.yaml b/helm_chart/HyperPodHelmChart/charts/hyperpod-ray-endpoint-operator/templates/manager/manager.yaml index 15540989..c3209444 100644 --- a/helm_chart/HyperPodHelmChart/charts/hyperpod-ray-endpoint-operator/templates/manager/manager.yaml +++ b/helm_chart/HyperPodHelmChart/charts/hyperpod-ray-endpoint-operator/templates/manager/manager.yaml @@ -106,6 +106,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: OPERATOR_VERSION + value: {{ include "hyperpod-ray-endpoint-operator.imageTag" . | quote }} {{- if or .Values.manager.env (and (kindIs "map" .Values.manager.envOverrides) (not (empty .Values.manager.envOverrides))) }} {{- if .Values.manager.env }} {{- toYaml .Values.manager.env | nindent 10 }}