Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/llm-d-modelservice/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3"
version: "v0.4.4"
# 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.
Expand Down
19 changes: 16 additions & 3 deletions charts/llm-d-modelservice/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,18 @@ Required number of GPU per worker -- dpl * tp
{{/*
Port on which vllm container should listen.
Context is helm root context plus key "role" ("decode" or "prefill")
For prefill: uses prefill.servicePort if set, otherwise fall back to routing.servicePort
For decode with proxy: uses routing.proxy.targetPort
For decode without proxy: uses routing.servicePort
*/}}
{{- define "llm-d-modelservice.vllmPort" -}}
{{- if or (eq .role "prefill") (eq .Values.routing.proxy.enabled false) }}
{{- if eq .role "prefill" }}
{{- if .Values.prefill.servicePort }}
{{- .Values.prefill.servicePort }}
{{- else }}
{{- .Values.routing.servicePort }}
{{- end }}
{{- else if eq .Values.routing.proxy.enabled false }}
{{- .Values.routing.servicePort }}
{{- else }}
{{- .Values.routing.proxy.targetPort }}
Expand Down Expand Up @@ -477,9 +486,13 @@ context is a dict with helm root context plus:
{{- if $acceleratorEnv }}{{ $acceleratorEnv | nindent 2 }}{{- end }}
{{- /* Add tracing environment variables from global config */}}
{{- (include "llm-d-modelservice.tracingEnv" .) | nindent 2 }}
{{- with .container.ports }}
{{- /* Set containerPorts - prefill.servicePort takes precedence if it is set */}}
{{- if and (eq .role "prefill") .Values.prefill.servicePort }}
ports:
{{- include "common.tplvalues.render" ( dict "value" . "context" $ ) | nindent 2 }}
- containerPort: {{ .Values.prefill.servicePort }}
{{- else if .container.ports }}
ports:
{{- include "common.tplvalues.render" ( dict "value" .container.ports "context" $ ) | nindent 2 }}
{{- end }}
{{- /* DEPRECATED; use extraConfig.livenessProbe instead */ -}}
{{- with .container.livenessProbe }}
Expand Down
5 changes: 2 additions & 3 deletions charts/llm-d-modelservice/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -3557,7 +3557,7 @@
},
"parallelism": {
"additionalProperties": false,
"description": "VLLM parallelism configuration",
"description": "Name of the scheduler to use for scheduling prefill pods (overrides global schedulerName) schedulerName: prefill-scheduler VLLM parallelism configuration",
"properties": {
"data": {
"default": 1,
Expand Down Expand Up @@ -3585,8 +3585,7 @@
}
},
"required": [],
"title": "parallelism",
"type": "object"
"title": "parallelism"
},
"replicas": {
"default": 0,
Expand Down
5 changes: 2 additions & 3 deletions charts/llm-d-modelservice/values.schema.tmpl.json
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@
},
"parallelism": {
"additionalProperties": false,
"description": "VLLM parallelism configuration",
"description": "Name of the scheduler to use for scheduling prefill pods (overrides global schedulerName) schedulerName: prefill-scheduler VLLM parallelism configuration",
"properties": {
"data": {
"default": 1,
Expand Down Expand Up @@ -957,8 +957,7 @@
}
},
"required": [],
"title": "parallelism",
"type": "object"
"title": "parallelism"
},
"replicas": {
"default": 0,
Expand Down
6 changes: 6 additions & 0 deletions charts/llm-d-modelservice/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -459,10 +459,16 @@ prefill:
enabled: false

replicas: 0

# @schema
# additionalProperties: true
# @schema
nodeSelector: {}

# Port on which the prefill vLLM container listens
# When not specified, falls back to routing.servicePort
# Uncomment to override:
# servicePort: 8000
# schedulerName -- Name of the scheduler to use for scheduling prefill pods (overrides global schedulerName)
# schedulerName: prefill-scheduler

Expand Down
6 changes: 3 additions & 3 deletions examples/output-cpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: ServiceAccount
metadata:
name: cpu-sim-llm-d-modelservice
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
---
Expand All @@ -16,7 +16,7 @@ kind: Deployment
metadata:
name: cpu-sim-llm-d-modelservice-decode
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down Expand Up @@ -105,7 +105,7 @@ kind: Deployment
metadata:
name: cpu-sim-llm-d-modelservice-prefill
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down
6 changes: 3 additions & 3 deletions examples/output-dra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: ServiceAccount
metadata:
name: dra-llm-d-modelservice
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
---
Expand All @@ -16,7 +16,7 @@ kind: Deployment
metadata:
name: dra-llm-d-modelservice-decode
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down Expand Up @@ -115,7 +115,7 @@ kind: ResourceClaimTemplate
metadata:
name: intel-gaudi-claim-template-decode
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
llm-d.ai/role: decode
Expand Down
4 changes: 2 additions & 2 deletions examples/output-gaudi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: ServiceAccount
metadata:
name: gaudi-llm-d-modelservice
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
---
Expand All @@ -16,7 +16,7 @@ kind: Deployment
metadata:
name: gaudi-llm-d-modelservice-decode
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down
8 changes: 4 additions & 4 deletions examples/output-heterogeneous-pd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: ServiceAccount
metadata:
name: heterogeneous-pd-llm-d-modelservice
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
---
Expand All @@ -16,7 +16,7 @@ kind: Deployment
metadata:
name: heterogeneous-pd-llm-d-modelservice-decode
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down Expand Up @@ -131,7 +131,7 @@ kind: Deployment
metadata:
name: heterogeneous-pd-llm-d-modelservice-prefill
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down Expand Up @@ -224,7 +224,7 @@ kind: ResourceClaimTemplate
metadata:
name: nvidia-claim-template-decode
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
llm-d.ai/role: decode
Expand Down
6 changes: 3 additions & 3 deletions examples/output-pd-mnnvl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: ServiceAccount
metadata:
name: pd-mnnvl-llm-d-modelservice
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
---
Expand All @@ -16,7 +16,7 @@ kind: Deployment
metadata:
name: pd-mnnvl-llm-d-modelservice-decode
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down Expand Up @@ -131,7 +131,7 @@ kind: Deployment
metadata:
name: pd-mnnvl-llm-d-modelservice-prefill
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down
6 changes: 3 additions & 3 deletions examples/output-pd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: ServiceAccount
metadata:
name: pd-llm-d-modelservice
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
---
Expand All @@ -16,7 +16,7 @@ kind: Deployment
metadata:
name: pd-llm-d-modelservice-decode
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down Expand Up @@ -127,7 +127,7 @@ kind: Deployment
metadata:
name: pd-llm-d-modelservice-prefill
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down
6 changes: 3 additions & 3 deletions examples/output-pvc-hf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: ServiceAccount
metadata:
name: pvc-hf-llm-d-modelservice
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
---
Expand All @@ -16,7 +16,7 @@ kind: Deployment
metadata:
name: pvc-hf-llm-d-modelservice-decode
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down Expand Up @@ -127,7 +127,7 @@ kind: Deployment
metadata:
name: pvc-hf-llm-d-modelservice-prefill
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down
6 changes: 3 additions & 3 deletions examples/output-pvc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: ServiceAccount
metadata:
name: pvc-llm-d-modelservice
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
---
Expand All @@ -16,7 +16,7 @@ kind: Deployment
metadata:
name: pvc-llm-d-modelservice-decode
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down Expand Up @@ -126,7 +126,7 @@ kind: Deployment
metadata:
name: pvc-llm-d-modelservice-prefill
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down
4 changes: 2 additions & 2 deletions examples/output-requester.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: ServiceAccount
metadata:
name: requester-llm-d-modelservice
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
---
Expand Down Expand Up @@ -142,7 +142,7 @@ kind: Deployment
metadata:
name: requester-llm-d-modelservice-prefill
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down
6 changes: 3 additions & 3 deletions examples/output-xpu-pd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: ServiceAccount
metadata:
name: xpu-pd-llm-d-modelservice
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
---
Expand All @@ -16,7 +16,7 @@ kind: Deployment
metadata:
name: xpu-pd-llm-d-modelservice-decode
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down Expand Up @@ -158,7 +158,7 @@ kind: Deployment
metadata:
name: xpu-pd-llm-d-modelservice-prefill
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down
4 changes: 2 additions & 2 deletions examples/output-xpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: ServiceAccount
metadata:
name: xpu-llm-d-modelservice
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
---
Expand All @@ -16,7 +16,7 @@ kind: Deployment
metadata:
name: xpu-llm-d-modelservice-decode
labels:
helm.sh/chart: llm-d-modelservice-v0.4.3
helm.sh/chart: llm-d-modelservice-v0.4.4
app.kubernetes.io/version: "v0.3.0"
app.kubernetes.io/managed-by: Helm
spec:
Expand Down
Loading
Loading