From f13de68ca9d9718ad94978052294a79c2916f1c7 Mon Sep 17 00:00:00 2001 From: greg pereira Date: Mon, 5 May 2025 19:43:59 -0700 Subject: [PATCH 1/4] using imagepullsecrts for epp/pd secrets Signed-off-by: greg pereira --- charts/llm-d/templates/modelservice/_helpers.tpl | 5 +++++ charts/llm-d/templates/modelservice/deployment.yaml | 4 ++-- .../llm-d/templates/modelservice/ms-v2-hack/secret-epp.yaml | 4 ---- .../llm-d/templates/modelservice/ms-v2-hack/secret-pd.yaml | 4 ---- 4 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 charts/llm-d/templates/modelservice/ms-v2-hack/secret-epp.yaml delete mode 100644 charts/llm-d/templates/modelservice/ms-v2-hack/secret-pd.yaml diff --git a/charts/llm-d/templates/modelservice/_helpers.tpl b/charts/llm-d/templates/modelservice/_helpers.tpl index 1ecff11..caac269 100644 --- a/charts/llm-d/templates/modelservice/_helpers.tpl +++ b/charts/llm-d/templates/modelservice/_helpers.tpl @@ -70,3 +70,8 @@ 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 "modelservice.imagePullSecretsString" -}} +{{- join "," .Values.global.imagePullSecrets | quote -}} +{{- end }} diff --git a/charts/llm-d/templates/modelservice/deployment.yaml b/charts/llm-d/templates/modelservice/deployment.yaml index bd2c792..26f9615 100644 --- a/charts/llm-d/templates/modelservice/deployment.yaml +++ b/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 "modelservice.imagePullSecretsString" . }} - --pd-cluster-role - prefill-decode-clusterrole - --pd-pull-secrets - - prefill-decode-pull-secret + - {{ include "modelservice.imagePullSecretsString" . }} # MSV2 HACK END command: - /manager diff --git a/charts/llm-d/templates/modelservice/ms-v2-hack/secret-epp.yaml b/charts/llm-d/templates/modelservice/ms-v2-hack/secret-epp.yaml deleted file mode 100644 index c78dc14..0000000 --- a/charts/llm-d/templates/modelservice/ms-v2-hack/secret-epp.yaml +++ /dev/null @@ -1,4 +0,0 @@ -kind: Secret -apiVersion: v1 -metadata: - name: endpoint-picker-pull-secret diff --git a/charts/llm-d/templates/modelservice/ms-v2-hack/secret-pd.yaml b/charts/llm-d/templates/modelservice/ms-v2-hack/secret-pd.yaml deleted file mode 100644 index 0925b89..0000000 --- a/charts/llm-d/templates/modelservice/ms-v2-hack/secret-pd.yaml +++ /dev/null @@ -1,4 +0,0 @@ -kind: Secret -apiVersion: v1 -metadata: - name: pd-pull-secret From 1319ed31daaeb8d9b70602af95227f4126b4ffbc Mon Sep 17 00:00:00 2001 From: Gregory Pereira Date: Tue, 6 May 2025 06:01:54 -0700 Subject: [PATCH 2/4] Update charts/llm-d/templates/modelservice/_helpers.tpl non global pull-secrets as well Co-authored-by: Tom Coufal <7453394+tumido@users.noreply.github.com> --- .../llm-d/templates/modelservice/_helpers.tpl | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/charts/llm-d/templates/modelservice/_helpers.tpl b/charts/llm-d/templates/modelservice/_helpers.tpl index caac269..0ce8188 100644 --- a/charts/llm-d/templates/modelservice/_helpers.tpl +++ b/charts/llm-d/templates/modelservice/_helpers.tpl @@ -72,6 +72,27 @@ Return the proper Docker Image Registry Secret Names {{- end -}} -{{- define "modelservice.imagePullSecretsString" -}} -{{- join "," .Values.global.imagePullSecrets | quote -}} +{{- 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 }} From f3f00cf32378c2123b154c995783f97d4afc124f Mon Sep 17 00:00:00 2001 From: greg pereira Date: Tue, 6 May 2025 06:13:41 -0700 Subject: [PATCH 3/4] calling the IPS template properly Signed-off-by: greg pereira --- charts/llm-d/templates/modelservice/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/llm-d/templates/modelservice/deployment.yaml b/charts/llm-d/templates/modelservice/deployment.yaml index 26f9615..b60f26d 100644 --- a/charts/llm-d/templates/modelservice/deployment.yaml +++ b/charts/llm-d/templates/modelservice/deployment.yaml @@ -46,11 +46,11 @@ spec: - --epp-cluster-role - endpoint-picker-clusterrole - --epp-pull-secrets - - {{ include "modelservice.imagePullSecretsString" . }} + - {{ include "common.images.renderImagePullSecretsString" (dict "images" (list .Values.modelservice.epp.image) "context" $) }} - --pd-cluster-role - prefill-decode-clusterrole - --pd-pull-secrets - - {{ include "modelservice.imagePullSecretsString" . }} + - {{ include "common.images.renderImagePullSecretsString" (dict "images" (list .Values.modelservice.vllm.image) "context" $) }} # MSV2 HACK END command: - /manager From 68a383dbcf954f70fdf6facf9deb153d6ca87bd7 Mon Sep 17 00:00:00 2001 From: greg pereira Date: Tue, 6 May 2025 08:03:38 -0700 Subject: [PATCH 4/4] chart bump + linting Signed-off-by: greg pereira --- charts/llm-d/Chart.yaml | 2 +- charts/llm-d/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/llm-d/Chart.yaml b/charts/llm-d/Chart.yaml index f09ab03..7752df9 100644 --- a/charts/llm-d/Chart.yaml +++ b/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 diff --git a/charts/llm-d/README.md b/charts/llm-d/README.md index cd0ff30..6780f01 100644 --- a/charts/llm-d/README.md +++ b/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