[Enhancement] modified template to automatically generate resources.claim

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.2"
+version: "v0.4.3"
 # 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-dra.tpl

@@ -112,8 +112,8 @@ false
 {{- $count -}}
 {{- end }}
 
-{{/* Generate pod-level resourceClaims (merges accelerator + user-defined claims) */}}
-{{- define "llm-d-modelservice.podResourceClaims" -}}
+{{/* Generate resourceClaims Variable (merges accelerator + user-defined claims) */}}
+{{- define "llm-d-modelservice.resourceClaimsBase" -}}
 {{- $claims := list -}}
 {{- $draEnabled := eq (include "llm-d-modelservice.draEnabled" .) "true" -}}
 {{- if $draEnabled -}}
@@ -125,29 +125,15 @@ false
   {{- $claims = concat $claims .pdSpec.resourceClaims -}}
 {{- end -}}
 {{- if $claims -}}
-resourceClaims:
-{{- toYaml $claims | nindent 2 }}
+{{- toYaml $claims }}
 {{- end -}}
 {{- end }}
 
-{{/* Generate container-level resource claims (merges accelerator + user-defined claims) */}}
-{{- define "llm-d-modelservice.containerResourceClaims" -}}
-{{- $claims := list -}}
-{{- $draEnabled := eq (include "llm-d-modelservice.draEnabled" .) "true" -}}
-{{- if $draEnabled -}}
-  {{- $claimName := include "llm-d-modelservice.acceleratorClaimName" . -}}
-  {{- $claims = append $claims (dict "name" $claimName) -}}
-{{- end -}}
-{{- if and .resources .resources.claims -}}
-  {{- if kindIs "slice" .resources.claims -}}
-    {{- $claims = concat $claims .resources.claims -}}
-  {{- else -}}
-    {{- fail "resources.claims must be a list of objects with 'name' field, e.g., [{\"name\": \"claim-name\"}]" -}}
-  {{- end -}}
-{{- end -}}
-{{- if $claims -}}
-claims:
-{{- toYaml $claims | nindent 2 }}
+{{- define "llm-d-modelservice.podResourceClaims" -}}
+{{- $claimList := include "llm-d-modelservice.resourceClaimsBase" . -}}
+{{- if $claimList -}}
+resourceClaims:
+{{- $claimList | nindent 2 }}
 {{- end -}}
 {{- end }}
 

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

@@ -281,15 +281,14 @@ nvidia.com/gpu
   {{- $requests = deepCopy .resources.requests }}
 {{- end }}
 {{- $draEnabled := eq (include "llm-d-modelservice.draEnabled" .) "true" -}}
+resources:
 {{- if $draEnabled -}}
   {{- /* DRA mode: pass through user-defined limits/requests as-is, add claims */}}
   {{- /* Users should not include accelerator resources in limits when DRA is enabled */}}
-resources:
   limits:
     {{- toYaml $limits | nindent 4 }}
   requests:
     {{- toYaml $requests | nindent 4 }}
-  {{- include "llm-d-modelservice.containerResourceClaims" . | nindent 2 }}
 {{- else -}}
   {{- /* Device Plugin mode: existing logic */}}
   {{- $numGpus := int (include "llm-d-modelservice.numGpuPerWorker" .parallelism) -}}
@@ -307,17 +306,20 @@ resources:
       {{- $requests = mergeOverwrite $requests (dict $acceleratorResource (toString $numGpus)) }}
     {{- end }}
   {{- end }}
-resources:
   limits:
     {{- toYaml $limits | nindent 4 }}
   requests:
     {{- toYaml $requests | nindent 4 }}
-  {{- /* Include user-defined claims even in Device Plugin mode */}}
-  {{- if and .resources .resources.claims }}
+{{- end -}}
+{{- $claimList := include "llm-d-modelservice.resourceClaimsBase" . | fromYamlArray -}}
+{{- if $claimList }}
   claims:
-    {{- toYaml .resources.claims | nindent 4 }}
+  {{- $containerClaims := list -}}
+  {{- range $claimList -}}
+    {{- $containerClaims = append $containerClaims (dict "name" .name) -}}
   {{- end }}
-{{- end -}}
+    {{- toYaml $containerClaims | nindent 4 }}
+{{- end }}
 {{- end }}
 
 {{/* prefill name */}}
@@ -494,7 +496,7 @@ context is a dict with helm root context plus:
   startupProbe:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- (include "llm-d-modelservice.resources" (dict "resources" .container.resources "parallelism" .parallelism "container" .container "Values" .Values "role" .role)) | nindent 2 }}
+  {{- (include "llm-d-modelservice.resources" (dict "resources" .container.resources "parallelism" .parallelism "container" .container "Values" .Values "role" .role "pdSpec" .pdSpec)) | nindent 2 }}
   {{- include "llm-d-modelservice.mountModelVolumeVolumeMounts" (dict "container" .container "Values" .Values) | nindent 2 }}
   {{- /* DEPRECATED; use extraConfig.workingDir instead */ -}}
   {{- with .container.workingDir }}

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

@@ -56,7 +56,7 @@ spec:
       {{- with .Values.decode.containers }}
       containers:
         {{- range . }}
-        {{- (include "llm-d-modelservice.container" (dict "role" "decode" "container" . "parallelism" $.Values.decode.parallelism "Values" $.Values "Release" $.Release "Chart" $.Chart)) | nindent 8 }}
+        {{- (include "llm-d-modelservice.container" (dict "role" "decode" "container" . "parallelism" $.Values.decode.parallelism "Values" $.Values "Release" $.Release "Chart" $.Chart "pdSpec" $.Values.decode)) | nindent 8 }}
         {{- end }}
       {{- end }}
       {{- if .Values.decode.tolerations }}

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

@@ -74,7 +74,7 @@ spec:
         {{- with .Values.decode.containers }}
         containers:
           {{- range . }}
-        {{- (include "llm-d-modelservice.container" (dict "role" "decode" "container" . "parallelism" $.Values.decode.parallelism "Values" $.Values "Release" $.Release "Chart" $.Chart)) | nindent 8 }}
+        {{- (include "llm-d-modelservice.container" (dict "role" "decode" "container" . "parallelism" $.Values.decode.parallelism "Values" $.Values "Release" $.Release "Chart" $.Chart "pdSpec" $.Values.decode)) | nindent 8 }}
           {{- end }}
         {{- end }}
         {{- if .Values.decode.nodeSelector }}

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

@@ -34,7 +34,7 @@ spec:
             {{- with .Values.decode.containers }}
             containers:
               {{- range . }}
-              {{- (include "llm-d-modelservice.container" (dict "role" "decode" "container" . "parallelism" $.Values.decode.parallelism "Values" $.Values "Release" $.Release "Chart" $.Chart)) | nindent 14 }}
+              {{- (include "llm-d-modelservice.container" (dict "role" "decode" "container" . "parallelism" $.Values.decode.parallelism "Values" $.Values "Release" $.Release "Chart" $.Chart "pdSpec" $.Values.decode)) | nindent 14 }}
               {{- end }}
             {{- end }}
     spec:

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

@@ -51,7 +51,7 @@ spec:
       {{- with .Values.prefill.containers }}
       containers:
         {{- range . }}
-        {{- (include "llm-d-modelservice.container" (dict "role" "prefill" "container" . "parallelism" $.Values.prefill.parallelism "Values" $.Values "Release" $.Release "Chart" $.Chart)) | nindent 8 }}
+        {{- (include "llm-d-modelservice.container" (dict "role" "prefill" "container" . "parallelism" $.Values.prefill.parallelism "Values" $.Values "Release" $.Release "Chart" $.Chart "pdSpec" $.Values.prefill)) | nindent 8 }}
         {{- end }}
       {{- end }}
       {{- if .Values.prefill.tolerations }}

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

@@ -69,7 +69,7 @@ spec:
         {{- with .Values.prefill.containers }}
         containers:
           {{- range . }}
-        {{- (include "llm-d-modelservice.container" (dict "role" "prefill" "container" . "parallelism" $.Values.prefill.parallelism "Values" $.Values "Release" $.Release "Chart" $.Chart)) | nindent 8 }}
+        {{- (include "llm-d-modelservice.container" (dict "role" "prefill" "container" . "parallelism" $.Values.prefill.parallelism "Values" $.Values "Release" $.Release "Chart" $.Chart "pdSpec" $.Values.prefill)) | nindent 8 }}
           {{- end }}
         {{- end }}
         {{- if .Values.prefill.nodeSelector }}

charts/llm-d-modelservice/values.yaml

@@ -344,20 +344,6 @@ decode:
         # additionalProperties: true
         # @schema
         requests: {}
-        # @schema
-        # type: array
-        # items:
-        #   type: object
-        #   required: [name]
-        #   properties:
-        #     name:
-        #       type: string
-        # @schema
-        # Resource claims for this container (DRA)
-        # Will be merged with accelerator claim when accelerator.dra is enabled
-        claims: []
-        # Example:
-        # - name: llm-d-imex-channel-0
       # when set, a volumeMount (and volume) is created for model storage
       mountModelVolume: true
       # @schema
@@ -576,20 +562,6 @@ prefill:
         # additionalProperties: true
         # @schema
         requests: {}
-        # @schema
-        # type: array
-        # items:
-        #   type: object
-        #   required: [name]
-        #   properties:
-        #     name:
-        #       type: string
-        # @schema
-        # Resource claims for this container (DRA)
-        # Will be merged with accelerator claim when accelerator.dra is enabled
-        claims: []
-        # Example:
-        # - name: llm-d-imex-channel-0
       # @schema
       # type: array
       # items:

examples/output-cpu.yaml

@@ -6,7 +6,7 @@ kind: ServiceAccount
 metadata:
   name: cpu-sim-llm-d-modelservice
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
 ---
@@ -16,7 +16,7 @@ kind: Deployment
 metadata:
   name: cpu-sim-llm-d-modelservice-decode
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
 spec:
@@ -89,7 +89,6 @@ spec:
           ports:
           - containerPort: 8200
             protocol: TCP
-
           resources:
             limits:
               {}
@@ -106,7 +105,7 @@ kind: Deployment
 metadata:
   name: cpu-sim-llm-d-modelservice-prefill
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
 spec:
@@ -161,7 +160,6 @@ spec:
           ports:
           - containerPort: 8000
             protocol: TCP
-
           resources:
             limits:
               {}

examples/output-dra.yaml

@@ -6,7 +6,7 @@ kind: ServiceAccount
 metadata:
   name: dra-llm-d-modelservice
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
 ---
@@ -16,7 +16,7 @@ kind: Deployment
 metadata:
   name: dra-llm-d-modelservice-decode
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
 spec:
@@ -94,7 +94,6 @@ spec:
                 name: llm-d-hf-token
                 key: HF_TOKEN
 
-
           resources:
             limits:
               cpu: "4"
@@ -116,7 +115,7 @@ kind: ResourceClaimTemplate
 metadata:
   name: intel-gaudi-claim-template-decode
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
     llm-d.ai/role: decode

examples/output-gaudi.yaml

@@ -6,7 +6,7 @@ kind: ServiceAccount
 metadata:
   name: gaudi-llm-d-modelservice
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
 ---
@@ -16,7 +16,7 @@ kind: Deployment
 metadata:
   name: gaudi-llm-d-modelservice-decode
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
 spec:
@@ -92,7 +92,6 @@ spec:
           ports:
           - containerPort: 8200
             protocol: TCP
-
           resources:
             limits:
               habana.ai/gaudi: "1"

examples/output-heterogeneous-pd.yaml

@@ -6,7 +6,7 @@ kind: ServiceAccount
 metadata:
   name: heterogeneous-pd-llm-d-modelservice
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
 ---
@@ -16,7 +16,7 @@ kind: Deployment
 metadata:
   name: heterogeneous-pd-llm-d-modelservice-decode
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
 spec:
@@ -111,7 +111,6 @@ spec:
             protocol: TCP
           - containerPort: 5557
             protocol: TCP
-
           resources:
             limits:
               cpu: "16"
@@ -132,7 +131,7 @@ kind: Deployment
 metadata:
   name: heterogeneous-pd-llm-d-modelservice-prefill
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
 spec:
@@ -205,7 +204,6 @@ spec:
             protocol: TCP
           - containerPort: 5557
             protocol: TCP
-
           resources:
             limits:
               cpu: "16"
@@ -226,7 +224,7 @@ kind: ResourceClaimTemplate
 metadata:
   name: nvidia-claim-template-decode
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
     llm-d.ai/role: decode

examples/output-pd-mnnvl.yaml

@@ -6,7 +6,7 @@ kind: ServiceAccount
 metadata:
   name: pd-mnnvl-llm-d-modelservice
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
 ---
@@ -16,7 +16,7 @@ kind: Deployment
 metadata:
   name: pd-mnnvl-llm-d-modelservice-decode
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
 spec:
@@ -109,7 +109,6 @@ spec:
             protocol: TCP
           - containerPort: 5557
             protocol: TCP
-
           resources:
             limits:
               cpu: "16"
@@ -132,7 +131,7 @@ kind: Deployment
 metadata:
   name: pd-mnnvl-llm-d-modelservice-prefill
   labels:
-    helm.sh/chart: llm-d-modelservice-v0.4.2
+    helm.sh/chart: llm-d-modelservice-v0.4.3
     app.kubernetes.io/version: "v0.3.0"
     app.kubernetes.io/managed-by: Helm
 spec:
@@ -207,7 +206,6 @@ spec:
             protocol: TCP
           - containerPort: 5557
             protocol: TCP
-
           resources:
             limits:
               cpu: "16"