Skip to content

Commit c7bd2fa

Browse files
pohlyk8s-publishing-bot
authored andcommitted
DRA API: rename DeviceCapacity.Quantity to DeviceCapacity.Value
Based on review feedback (kubernetes/kubernetes#127511 (comment)). Kubernetes-commit: 30f52826560129839922e1756730b02f184f0ef9
1 parent 2e536d5 commit c7bd2fa

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

api/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ type DeviceAttribute struct {
6464
}
6565

6666
type DeviceCapacity struct {
67-
Quantity resource.Quantity
67+
Value resource.Quantity
6868
}

api/zz_generated.conversion.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cel/compile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func (c CompilationResult) DeviceMatches(ctx context.Context, input Device) (boo
215215
if capacity[domain] == nil {
216216
capacity[domain] = make(map[string]apiservercel.Quantity)
217217
}
218-
capacity[domain].(map[string]apiservercel.Quantity)[id] = apiservercel.Quantity{Quantity: &cap.Quantity}
218+
capacity[domain].(map[string]apiservercel.Quantity)[id] = apiservercel.Quantity{Quantity: &cap.Value}
219219
}
220220

221221
variables := map[string]any{

cel/compile_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,14 @@ var testcases = map[string]struct {
149149
},
150150
"quantity": {
151151
expression: `device.capacity["dra.example.com"].name.isGreaterThan(quantity("1Ki"))`,
152-
capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{"name": {Quantity: resource.MustParse("1Mi")}},
152+
capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{"name": {Value: resource.MustParse("1Mi")}},
153153
driver: "dra.example.com",
154154
expectMatch: true,
155155
expectCost: 6,
156156
},
157157
"check-positive": {
158158
expression: `"name" in device.capacity["dra.example.com"] && device.capacity["dra.example.com"].name.isGreaterThan(quantity("1Ki"))`,
159-
capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{"name": {Quantity: resource.MustParse("1Mi")}},
159+
capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{"name": {Value: resource.MustParse("1Mi")}},
160160
driver: "dra.example.com",
161161
expectMatch: true,
162162
expectCost: 10,
@@ -186,7 +186,7 @@ device.attributes["dra.example.com"]["version"].isGreaterThan(semver("0.0.1"))
186186
"version": {VersionValue: ptr.To("1.0.0")},
187187
},
188188
capacity: map[resourceapi.QualifiedName]resourceapi.DeviceCapacity{
189-
"quantity": {Quantity: resource.MustParse("1Mi")},
189+
"quantity": {Value: resource.MustParse("1Mi")},
190190
},
191191
driver: "dra.example.com",
192192
expectMatch: true,

structured/allocator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func device(name string, capacity map[resourceapi.QualifiedName]resource.Quantit
193193
}
194194
device.Basic.Capacity = make(map[resourceapi.QualifiedName]resourceapi.DeviceCapacity, len(capacity))
195195
for name, quantity := range capacity {
196-
device.Basic.Capacity[name] = resourceapi.DeviceCapacity{Quantity: quantity}
196+
device.Basic.Capacity[name] = resourceapi.DeviceCapacity{Value: quantity}
197197
}
198198
return device
199199
}

0 commit comments

Comments
 (0)