Merge pull request #25 from Gregory-Pereira/update-ms-rbac-v2-attempt-4

using imagepullsecrts for epp/pd secrets

Author: Gregory-Pereira

charts/llm-d/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: llm-d
 type: application
-version: 0.0.8
+version: 0.0.9
 appVersion: "0.0.1"
 icon: data:null
 description: A Helm chart for llm-d

charts/llm-d/README.md

@@ -1,7 +1,7 @@
 
 # llm-d Helm Chart for OpenShift
 
-![Version: 0.0.8](https://img.shields.io/badge/Version-0.0.8-informational?style=flat-square)
+![Version: 0.0.9](https://img.shields.io/badge/Version-0.0.9-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart for llm-d

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

@@ -70,3 +70,29 @@ Return the proper Docker Image Registry Secret Names
 {{- define "vllmSim.renderImagePullSecrets" -}}
   {{- include "common.images.renderPullSecrets" (dict "images" (list .Values.modelservice.vllmSim.image) "context" $) -}}
 {{- end -}}
+
+
+{{- define "common.images.renderImagePullSecretsString" -}}
+  {{- $pullSecrets := list }}
+  {{- $context := .context }}
+
+  {{- range (($context.Values.global).imagePullSecrets) -}}
+    {{- if kindIs "map" . -}}
+      {{- $pullSecrets = append $pullSecrets (include "common.tplvalues.render" (dict "value" .name "context" $context)) -}}
+    {{- else -}}
+      {{- $pullSecrets = append $pullSecrets (include "common.tplvalues.render" (dict "value" . "context" $context)) -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- range .images -}}
+    {{- range .pullSecrets -}}
+      {{- if kindIs "map" . -}}
+        {{- $pullSecrets = append $pullSecrets (include "common.tplvalues.render" (dict "value" .name "context" $context)) -}}
+      {{- else -}}
+        {{- $pullSecrets = append $pullSecrets (include "common.tplvalues.render" (dict "value" . "context" $context)) -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- join "," ($pullSecrets | uniq) | quote }}
+{{- end }}

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

@@ -46,11 +46,11 @@ spec:
         - --epp-cluster-role
         - endpoint-picker-clusterrole
         - --epp-pull-secrets
-        - endpoint-picker-pull-secret
+        - {{ include "common.images.renderImagePullSecretsString" (dict "images" (list .Values.modelservice.epp.image) "context" $) }}
         - --pd-cluster-role
         - prefill-decode-clusterrole
         - --pd-pull-secrets
-        - prefill-decode-pull-secret
+        - {{ include "common.images.renderImagePullSecretsString" (dict "images" (list .Values.modelservice.vllm.image) "context" $) }}
         # MSV2 HACK END
         command:
         - /manager