feat: Added bitnami style image registry override

Signed-off-by: Sylvain Filiatrault <19677334+slik13@users.noreply.github.com>

Author: slik13

charts/llm-d-modelservice/Chart.yaml

@@ -13,7 +13,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "v0.4.9"
+version: "v0.4.10"
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

charts/llm-d-modelservice/templates/_helpers.tpl

@@ -91,6 +91,38 @@ affinity:
             {{- end }}
 {{- end }}
 {{- end }}
+
+{{/* Rewrite an image reference to use a global registry override */}}
+{{- define "llm-d-modelservice.resolveImage" -}}
+{{- $image := required "image is required" .image -}}
+{{- $registryOverride := trimSuffix "/" (default "" .Values.global.imageRegistry) -}}
+{{- if not $registryOverride -}}
+{{- $image -}}
+{{- else -}}
+{{- $parts := splitList "/" $image -}}
+{{- $nameParts := $parts -}}
+{{- $first := index $parts 0 -}}
+{{- if and (gt (len $parts) 1) (or (contains "." $first) (contains ":" $first) (eq $first "localhost")) -}}
+{{- $nameParts = slice $parts 1 -}}
+{{- end -}}
+{{- printf "%s/%s" $registryOverride (join "/" $nameParts) -}}
+{{- end -}}
+{{- end }}
+
+{{/* Render a list of container-like objects while applying image resolution */}}
+{{- define "llm-d-modelservice.renderContainerList" -}}
+{{- $renderedContainers := list -}}
+{{- range $container := (.containers | default list) -}}
+{{- $rendered := deepCopy $container -}}
+{{- if hasKey $rendered "image" -}}
+{{- $_ := set $rendered "image" (include "llm-d-modelservice.resolveImage" (dict "image" (index $rendered "image") "Values" $.Values) | trim) -}}
+{{- end -}}
+{{- $renderedContainers = append $renderedContainers $rendered -}}
+{{- end -}}
+{{- toYaml $renderedContainers -}}
+{{- end }}
+
+
 {{/* Create the init container for the routing proxy/sidecar for decode pods */}}
 {{- define "llm-d-modelservice.routingProxy" -}}
 {{- if or (not (hasKey .proxy "enabled")) (ne .proxy.enabled false) -}}
@@ -123,7 +155,7 @@ affinity:
     {{- if hasKey .proxy "certPath" }}
     - --cert-path={{ .proxy.certPath }}
     {{- end }}
-  image: {{ required "routing.proxy.image must be specified" .proxy.image }}
+  image: {{ include "llm-d-modelservice.resolveImage" (dict "image" (required "routing.proxy.image must be specified" .proxy.image) "Values" .Values) | trim }}
   imagePullPolicy: {{ default "Always" .proxy.imagePullPolicy }}
   env:
 {{- if and .Values.tracing .Values.tracing.enabled }}
@@ -465,7 +497,7 @@ context is a dict with helm root context plus:
 */}}
 {{- define "llm-d-modelservice.container" -}}
 - name: {{ default "vllm" .container.name }}
-  image: {{ required "image of container is required" .container.image }}
+  image: {{ include "llm-d-modelservice.resolveImage" (dict "image" (required "image of container is required" .container.image) "Values" .Values) | trim }}
   {{- with .container.extraConfig }}
     {{ include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 2 }}
   {{- end }}

charts/llm-d-modelservice/templates/decode-deployment.yaml

@@ -41,7 +41,7 @@ spec:
       initContainers:
       {{- (include "llm-d-modelservice.routingProxy" (dict "proxy" .Values.routing.proxy "servicePort" .Values.routing.servicePort "Values" .Values)) | nindent 8 }}
       {{- if .Values.decode.initContainers }}
-      {{- toYaml .Values.decode.initContainers | nindent 8 }}
+      {{- include "llm-d-modelservice.renderContainerList" (dict "containers" .Values.decode.initContainers "Values" .Values) | nindent 8 }}
       {{- end }}
       {{- end }}
       {{- if hasKey .Values.decode "enableServiceLinks" }}

charts/llm-d-modelservice/templates/decode-lws.yaml

@@ -59,7 +59,7 @@ spec:
         initContainers:
         {{- (include "llm-d-modelservice.routingProxy" (dict "proxy" .Values.routing.proxy "servicePort" .Values.routing.servicePort "Values" .Values)) | nindent 8 }}
         {{- if .Values.decode.initContainers }}
-        {{- toYaml .Values.decode.initContainers | nindent 8 }}
+        {{- include "llm-d-modelservice.renderContainerList" (dict "containers" .Values.decode.initContainers "Values" .Values) | nindent 8 }}
         {{- end }}
         {{- end }}
         {{- if hasKey .Values.decode "enableServiceLinks" }}

charts/llm-d-modelservice/templates/decode-requester-replicaset.yaml

@@ -26,7 +26,7 @@ spec:
             initContainers:
             {{- (include "llm-d-modelservice.routingProxy" (dict "proxy" .Values.routing.proxy "servicePort" .Values.routing.servicePort "Values" .Values)) | nindent 12 }}
             {{- if .Values.decode.initContainers }}
-            {{- toYaml .Values.decode.initContainers | nindent 12 }}
+            {{- include "llm-d-modelservice.renderContainerList" (dict "containers" .Values.decode.initContainers "Values" .Values) | nindent 12 }}{{- toYaml .Values.decode.initContainers | nindent 12 }}
             {{- end }}
             {{- end }}
             {{- with .Values.decode.containers }}
@@ -38,7 +38,7 @@ spec:
     spec:
       containers:
         - name: inference-server
-          image: {{ .Values.requester.image }}
+          image: {{ include "llm-d-modelservice.resolveImage" (dict "image" .Values.requester.image "Values" .Values) | trim }}
           imagePullPolicy: Always
           command:
           - /app/requester

charts/llm-d-modelservice/templates/prefill-deployment.yaml

@@ -35,7 +35,7 @@ spec:
     spec:
       {{- if .Values.prefill.initContainers }}
       initContainers:
-      {{- toYaml .Values.prefill.initContainers | nindent 8 }}
+      {{- include "llm-d-modelservice.renderContainerList" (dict "containers" .Values.prefill.initContainers "Values" .Values) | nindent 8 }}
       {{- end }}
       {{- if hasKey .Values.prefill "enableServiceLinks" }}
       enableServiceLinks: {{ .Values.prefill.enableServiceLinks }}

charts/llm-d-modelservice/templates/prefill-lws.yaml

@@ -57,7 +57,7 @@ spec:
         {{- end }}
         {{- if .Values.prefill.initContainers }}
         initContainers:
-        {{- toYaml .Values.prefill.initContainers | nindent 8 }}
+        {{- include "llm-d-modelservice.renderContainerList" (dict "containers" .Values.prefill.initContainers "Values" .Values) | nindent 8 }}
         {{- end }}
         {{- if hasKey .Values.prefill "enableServiceLinks" }}
         enableServiceLinks: {{ .Values.prefill.enableServiceLinks }}

charts/llm-d-modelservice/values.schema.json

@@ -1921,10 +1921,18 @@
             "title": "fullnameOverride"
         },
         "global": {
-            "description": "Global values are values that can be accessed from any chart or subchart by exactly the same name.",
+            "additionalProperties": false,
+            "description": "Global values shared with subcharts",
+            "properties": {
+                "imageRegistry": {
+                    "default": "",
+                    "description": "Override the registry for built-in chart workload images while preserving repository path and tag or digest Example: \"registry.example.com\" or \"registry.example.com/team-cache\"",
+                    "required": [],
+                    "title": "imageRegistry"
+                }
+            },
             "required": [],
-            "title": "global",
-            "type": "object"
+            "title": "global"
         },
         "modelArtifacts": {
             "additionalProperties": false,

charts/llm-d-modelservice/values.schema.tmpl.json

@@ -607,10 +607,18 @@
       "title": "fullnameOverride"
     },
     "global": {
-      "description": "Global values are values that can be accessed from any chart or subchart by exactly the same name.",
+      "additionalProperties": false,
+      "description": "Global values shared with subcharts",
+      "properties": {
+        "imageRegistry": {
+          "default": "",
+          "description": "Override the registry for built-in chart workload images while preserving repository path and tag or digest Example: \"registry.example.com\" or \"registry.example.com/team-cache\"",
+          "required": [],
+          "title": "imageRegistry"
+        }
+      },
       "required": [],
-      "title": "global",
-      "type": "object"
+      "title": "global"
     },
     "modelArtifacts": {
       "additionalProperties": false,

charts/llm-d-modelservice/values.yaml

@@ -9,6 +9,12 @@
 # -- Common configuration values
 common: {}
 
+# -- Global values shared with subcharts
+global:
+  # -- Override the registry for built-in chart workload images while preserving repository path and tag or digest
+  # Example: "registry.example.com" or "registry.example.com/team-cache"
+  imageRegistry: ""
+
 # -- Usually used when using llm-d-modelservice as a subchart
 enabled: true