Skip to content

Commit 3d7ce67

Browse files
Gregory-PereiraGregory-Pereira
authored
Enable adding labels in schema (#202)
* provide no labels by default, but enable any llm-d.ai label in schema Signed-off-by: greg pereira <grpereir@redhat.com> * bump app version, normalize label names and format Signed-off-by: greg pereira <grpereir@redhat.com> * precommit Signed-off-by: greg pereira <grpereir@redhat.com> --------- Signed-off-by: greg pereira <grpereir@redhat.com>
1 parent 35a3a0c commit 3d7ce67

24 files changed

Lines changed: 134 additions & 135 deletions

‎charts/llm-d-modelservice/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ type: application
1313
# This is the chart version. This version number should be incremented each time you make changes
1414
# to the chart and its templates, including the app version.
1515
# Versions are expected to follow Semantic Versioning (https://semver.org/)
16-
version: "v0.4.4"
16+
version: "v0.4.5"
1717
# This is the version number of the application being deployed. This version number should be
1818
# incremented each time you make changes to the application. Versions are not expected to
1919
# follow Semantic Versioning. They should reflect the version the application is using.
2020
# It is recommended to use it with quotes.
21-
appVersion: "v0.3.0"
21+
appVersion: "v0.4.0"
2222
maintainers:
2323
- name: "Jing Chen"
2424
email: "jing.chen2@ibm.com"

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2041,24 +2041,19 @@
20412041
"type": "string"
20422042
},
20432043
"labels": {
2044-
"additionalProperties": false,
2045-
"description": " These should match the labels of any associated InferencePool In addition, the label llm-d.ai/role will be added with the value 'prefill' or 'decode' depending on the role of the pod.",
2044+
"additionalProperties": true,
2045+
"description": " These should match the labels of any associated InferencePool In addition, the label llm-d.ai/role will be added with the value 'prefill' or 'decode' depending on the role of the pod. @schema type: object additionalProperties: true @schema",
20462046
"properties": {
2047-
"llm-d.ai/inferenceServing": {
2047+
"llm-d.ai/inference-serving": {
20482048
"default": "true",
20492049
"required": [],
2050-
"title": "llm-d.ai/inferenceServing",
2051-
"type": "string"
2052-
},
2053-
"llm-d.ai/model": {
2054-
"default": "random_model",
2055-
"required": [],
2056-
"title": "llm-d.ai/model",
2050+
"title": "llm-d.ai/inference-serving",
20572051
"type": "string"
20582052
}
20592053
},
20602054
"required": [],
2061-
"title": "labels"
2055+
"title": "labels",
2056+
"type": "object"
20622057
},
20632058
"mountPath": {
20642059
"default": "/model-cache",

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -727,24 +727,19 @@
727727
"type": "string"
728728
},
729729
"labels": {
730-
"additionalProperties": false,
731-
"description": " These should match the labels of any associated InferencePool In addition, the label llm-d.ai/role will be added with the value 'prefill' or 'decode' depending on the role of the pod.",
730+
"additionalProperties": true,
731+
"description": " These should match the labels of any associated InferencePool In addition, the label llm-d.ai/role will be added with the value 'prefill' or 'decode' depending on the role of the pod. @schema type: object additionalProperties: true @schema",
732732
"properties": {
733-
"llm-d.ai/inferenceServing": {
733+
"llm-d.ai/inference-serving": {
734734
"default": "true",
735735
"required": [],
736-
"title": "llm-d.ai/inferenceServing",
737-
"type": "string"
738-
},
739-
"llm-d.ai/model": {
740-
"default": "random_model",
741-
"required": [],
742-
"title": "llm-d.ai/model",
736+
"title": "llm-d.ai/inference-serving",
743737
"type": "string"
744738
}
745739
},
746740
"required": [],
747-
"title": "labels"
741+
"title": "labels",
742+
"type": "object"
748743
},
749744
"mountPath": {
750745
"default": "/model-cache",

‎charts/llm-d-modelservice/values.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,12 @@ modelArtifacts:
5454
# These should match the labels of any associated InferencePool
5555
# In addition, the label llm-d.ai/role will be added with the value 'prefill'
5656
# or 'decode' depending on the role of the pod.
57+
# @schema
58+
# type: object
59+
# additionalProperties: true
60+
# @schema
5761
labels:
58-
llm-d.ai/inferenceServing: "true"
59-
llm-d.ai/model: random_model
62+
llm-d.ai/inference-serving: "true"
6063

6164
# model URI. One of:
6265
# hf://model/name - model as defined on Hugging Face

‎examples/output-cpu.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ kind: ServiceAccount
66
metadata:
77
name: cpu-sim-llm-d-modelservice
88
labels:
9-
helm.sh/chart: llm-d-modelservice-v0.4.4
10-
app.kubernetes.io/version: "v0.3.0"
9+
helm.sh/chart: llm-d-modelservice-v0.4.5
10+
app.kubernetes.io/version: "v0.4.0"
1111
app.kubernetes.io/managed-by: Helm
1212
---
1313
# Source: llm-d-modelservice/templates/decode-deployment.yaml
@@ -16,20 +16,20 @@ kind: Deployment
1616
metadata:
1717
name: cpu-sim-llm-d-modelservice-decode
1818
labels:
19-
helm.sh/chart: llm-d-modelservice-v0.4.4
20-
app.kubernetes.io/version: "v0.3.0"
19+
helm.sh/chart: llm-d-modelservice-v0.4.5
20+
app.kubernetes.io/version: "v0.4.0"
2121
app.kubernetes.io/managed-by: Helm
2222
spec:
2323
replicas: 1
2424
selector:
2525
matchLabels:
26-
llm-d.ai/inferenceServing: "true"
26+
llm-d.ai/inference-serving: "true"
2727
llm-d.ai/model: random-model
2828
llm-d.ai/role: decode
2929
template:
3030
metadata:
3131
labels:
32-
llm-d.ai/inferenceServing: "true"
32+
llm-d.ai/inference-serving: "true"
3333
llm-d.ai/model: random-model
3434
llm-d.ai/role: decode
3535
spec:
@@ -105,20 +105,20 @@ kind: Deployment
105105
metadata:
106106
name: cpu-sim-llm-d-modelservice-prefill
107107
labels:
108-
helm.sh/chart: llm-d-modelservice-v0.4.4
109-
app.kubernetes.io/version: "v0.3.0"
108+
helm.sh/chart: llm-d-modelservice-v0.4.5
109+
app.kubernetes.io/version: "v0.4.0"
110110
app.kubernetes.io/managed-by: Helm
111111
spec:
112112
replicas: 1
113113
selector:
114114
matchLabels:
115-
llm-d.ai/inferenceServing: "true"
115+
llm-d.ai/inference-serving: "true"
116116
llm-d.ai/model: random-model
117117
llm-d.ai/role: prefill
118118
template:
119119
metadata:
120120
labels:
121-
llm-d.ai/inferenceServing: "true"
121+
llm-d.ai/inference-serving: "true"
122122
llm-d.ai/model: random-model
123123
llm-d.ai/role: prefill
124124
spec:

‎examples/output-dra.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ kind: ServiceAccount
66
metadata:
77
name: dra-llm-d-modelservice
88
labels:
9-
helm.sh/chart: llm-d-modelservice-v0.4.4
10-
app.kubernetes.io/version: "v0.3.0"
9+
helm.sh/chart: llm-d-modelservice-v0.4.5
10+
app.kubernetes.io/version: "v0.4.0"
1111
app.kubernetes.io/managed-by: Helm
1212
---
1313
# Source: llm-d-modelservice/templates/decode-deployment.yaml
@@ -16,21 +16,21 @@ kind: Deployment
1616
metadata:
1717
name: dra-llm-d-modelservice-decode
1818
labels:
19-
helm.sh/chart: llm-d-modelservice-v0.4.4
20-
app.kubernetes.io/version: "v0.3.0"
19+
helm.sh/chart: llm-d-modelservice-v0.4.5
20+
app.kubernetes.io/version: "v0.4.0"
2121
app.kubernetes.io/managed-by: Helm
2222
spec:
2323
replicas: 1
2424
selector:
2525
matchLabels:
26-
llm-d.ai/inferenceServing: "true"
27-
llm-d.ai/model: random_model
26+
llm-d.ai/inference-serving: "true"
27+
llm-d.ai/model: random-model
2828
llm-d.ai/role: decode
2929
template:
3030
metadata:
3131
labels:
32-
llm-d.ai/inferenceServing: "true"
33-
llm-d.ai/model: random_model
32+
llm-d.ai/inference-serving: "true"
33+
llm-d.ai/model: random-model
3434
llm-d.ai/role: decode
3535
spec:
3636

@@ -115,8 +115,8 @@ kind: ResourceClaimTemplate
115115
metadata:
116116
name: intel-gaudi-claim-template-decode
117117
labels:
118-
helm.sh/chart: llm-d-modelservice-v0.4.4
119-
app.kubernetes.io/version: "v0.3.0"
118+
helm.sh/chart: llm-d-modelservice-v0.4.5
119+
app.kubernetes.io/version: "v0.4.0"
120120
app.kubernetes.io/managed-by: Helm
121121
llm-d.ai/role: decode
122122
spec:

‎examples/output-gaudi.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ kind: ServiceAccount
66
metadata:
77
name: gaudi-llm-d-modelservice
88
labels:
9-
helm.sh/chart: llm-d-modelservice-v0.4.4
10-
app.kubernetes.io/version: "v0.3.0"
9+
helm.sh/chart: llm-d-modelservice-v0.4.5
10+
app.kubernetes.io/version: "v0.4.0"
1111
app.kubernetes.io/managed-by: Helm
1212
---
1313
# Source: llm-d-modelservice/templates/decode-deployment.yaml
@@ -16,21 +16,21 @@ kind: Deployment
1616
metadata:
1717
name: gaudi-llm-d-modelservice-decode
1818
labels:
19-
helm.sh/chart: llm-d-modelservice-v0.4.4
20-
app.kubernetes.io/version: "v0.3.0"
19+
helm.sh/chart: llm-d-modelservice-v0.4.5
20+
app.kubernetes.io/version: "v0.4.0"
2121
app.kubernetes.io/managed-by: Helm
2222
spec:
2323
replicas: 1
2424
selector:
2525
matchLabels:
26-
llm-d.ai/inferenceServing: "true"
27-
llm-d.ai/model: random_model
26+
llm-d.ai/inference-serving: "true"
27+
llm-d.ai/model: random-model
2828
llm-d.ai/role: decode
2929
template:
3030
metadata:
3131
labels:
32-
llm-d.ai/inferenceServing: "true"
33-
llm-d.ai/model: random_model
32+
llm-d.ai/inference-serving: "true"
33+
llm-d.ai/model: random-model
3434
llm-d.ai/role: decode
3535
spec:
3636

‎examples/output-heterogeneous-pd.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ kind: ServiceAccount
66
metadata:
77
name: heterogeneous-pd-llm-d-modelservice
88
labels:
9-
helm.sh/chart: llm-d-modelservice-v0.4.4
10-
app.kubernetes.io/version: "v0.3.0"
9+
helm.sh/chart: llm-d-modelservice-v0.4.5
10+
app.kubernetes.io/version: "v0.4.0"
1111
app.kubernetes.io/managed-by: Helm
1212
---
1313
# Source: llm-d-modelservice/templates/decode-deployment.yaml
@@ -16,20 +16,20 @@ kind: Deployment
1616
metadata:
1717
name: heterogeneous-pd-llm-d-modelservice-decode
1818
labels:
19-
helm.sh/chart: llm-d-modelservice-v0.4.4
20-
app.kubernetes.io/version: "v0.3.0"
19+
helm.sh/chart: llm-d-modelservice-v0.4.5
20+
app.kubernetes.io/version: "v0.4.0"
2121
app.kubernetes.io/managed-by: Helm
2222
spec:
2323
replicas: 1
2424
selector:
2525
matchLabels:
26-
llm-d.ai/inferenceServing: "true"
26+
llm-d.ai/inference-serving: "true"
2727
llm-d.ai/model: facebook-opt-125m
2828
llm-d.ai/role: decode
2929
template:
3030
metadata:
3131
labels:
32-
llm-d.ai/inferenceServing: "true"
32+
llm-d.ai/inference-serving: "true"
3333
llm-d.ai/model: facebook-opt-125m
3434
llm-d.ai/role: decode
3535
spec:
@@ -131,20 +131,20 @@ kind: Deployment
131131
metadata:
132132
name: heterogeneous-pd-llm-d-modelservice-prefill
133133
labels:
134-
helm.sh/chart: llm-d-modelservice-v0.4.4
135-
app.kubernetes.io/version: "v0.3.0"
134+
helm.sh/chart: llm-d-modelservice-v0.4.5
135+
app.kubernetes.io/version: "v0.4.0"
136136
app.kubernetes.io/managed-by: Helm
137137
spec:
138138
replicas: 1
139139
selector:
140140
matchLabels:
141-
llm-d.ai/inferenceServing: "true"
141+
llm-d.ai/inference-serving: "true"
142142
llm-d.ai/model: facebook-opt-125m
143143
llm-d.ai/role: prefill
144144
template:
145145
metadata:
146146
labels:
147-
llm-d.ai/inferenceServing: "true"
147+
llm-d.ai/inference-serving: "true"
148148
llm-d.ai/model: facebook-opt-125m
149149
llm-d.ai/role: prefill
150150
spec:
@@ -224,8 +224,8 @@ kind: ResourceClaimTemplate
224224
metadata:
225225
name: nvidia-claim-template-decode
226226
labels:
227-
helm.sh/chart: llm-d-modelservice-v0.4.4
228-
app.kubernetes.io/version: "v0.3.0"
227+
helm.sh/chart: llm-d-modelservice-v0.4.5
228+
app.kubernetes.io/version: "v0.4.0"
229229
app.kubernetes.io/managed-by: Helm
230230
llm-d.ai/role: decode
231231
spec:

‎examples/output-pd-mnnvl.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ kind: ServiceAccount
66
metadata:
77
name: pd-mnnvl-llm-d-modelservice
88
labels:
9-
helm.sh/chart: llm-d-modelservice-v0.4.4
10-
app.kubernetes.io/version: "v0.3.0"
9+
helm.sh/chart: llm-d-modelservice-v0.4.5
10+
app.kubernetes.io/version: "v0.4.0"
1111
app.kubernetes.io/managed-by: Helm
1212
---
1313
# Source: llm-d-modelservice/templates/decode-deployment.yaml
@@ -16,20 +16,20 @@ kind: Deployment
1616
metadata:
1717
name: pd-mnnvl-llm-d-modelservice-decode
1818
labels:
19-
helm.sh/chart: llm-d-modelservice-v0.4.4
20-
app.kubernetes.io/version: "v0.3.0"
19+
helm.sh/chart: llm-d-modelservice-v0.4.5
20+
app.kubernetes.io/version: "v0.4.0"
2121
app.kubernetes.io/managed-by: Helm
2222
spec:
2323
replicas: 1
2424
selector:
2525
matchLabels:
26-
llm-d.ai/inferenceServing: "true"
26+
llm-d.ai/inference-serving: "true"
2727
llm-d.ai/model: facebook-opt-125m
2828
llm-d.ai/role: decode
2929
template:
3030
metadata:
3131
labels:
32-
llm-d.ai/inferenceServing: "true"
32+
llm-d.ai/inference-serving: "true"
3333
llm-d.ai/model: facebook-opt-125m
3434
llm-d.ai/role: decode
3535
spec:
@@ -131,20 +131,20 @@ kind: Deployment
131131
metadata:
132132
name: pd-mnnvl-llm-d-modelservice-prefill
133133
labels:
134-
helm.sh/chart: llm-d-modelservice-v0.4.4
135-
app.kubernetes.io/version: "v0.3.0"
134+
helm.sh/chart: llm-d-modelservice-v0.4.5
135+
app.kubernetes.io/version: "v0.4.0"
136136
app.kubernetes.io/managed-by: Helm
137137
spec:
138138
replicas: 1
139139
selector:
140140
matchLabels:
141-
llm-d.ai/inferenceServing: "true"
141+
llm-d.ai/inference-serving: "true"
142142
llm-d.ai/model: facebook-opt-125m
143143
llm-d.ai/role: prefill
144144
template:
145145
metadata:
146146
labels:
147-
llm-d.ai/inferenceServing: "true"
147+
llm-d.ai/inference-serving: "true"
148148
llm-d.ai/model: facebook-opt-125m
149149
llm-d.ai/role: prefill
150150
spec:

0 commit comments

Comments
 (0)