mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 02:41:25 +00:00
code cleanup: scheduler/framework use max function instead of if-condition in types.go
This commit is contained in:
parent
43a32c14f5
commit
8f57233a3a
@ -554,25 +554,16 @@ func (r *Resource) SetMaxResource(rl v1.ResourceList) {
|
|||||||
for rName, rQuantity := range rl {
|
for rName, rQuantity := range rl {
|
||||||
switch rName {
|
switch rName {
|
||||||
case v1.ResourceMemory:
|
case v1.ResourceMemory:
|
||||||
if mem := rQuantity.Value(); mem > r.Memory {
|
r.Memory = max(r.Memory, rQuantity.Value())
|
||||||
r.Memory = mem
|
|
||||||
}
|
|
||||||
case v1.ResourceCPU:
|
case v1.ResourceCPU:
|
||||||
if cpu := rQuantity.MilliValue(); cpu > r.MilliCPU {
|
r.MilliCPU = max(r.MilliCPU, rQuantity.MilliValue())
|
||||||
r.MilliCPU = cpu
|
|
||||||
}
|
|
||||||
case v1.ResourceEphemeralStorage:
|
case v1.ResourceEphemeralStorage:
|
||||||
if utilfeature.DefaultFeatureGate.Enabled(features.LocalStorageCapacityIsolation) {
|
if utilfeature.DefaultFeatureGate.Enabled(features.LocalStorageCapacityIsolation) {
|
||||||
if ephemeralStorage := rQuantity.Value(); ephemeralStorage > r.EphemeralStorage {
|
r.EphemeralStorage = max(r.EphemeralStorage, rQuantity.Value())
|
||||||
r.EphemeralStorage = ephemeralStorage
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
if schedutil.IsScalarResourceName(rName) {
|
if schedutil.IsScalarResourceName(rName) {
|
||||||
value := rQuantity.Value()
|
r.SetScalar(rName, max(r.ScalarResources[rName], rQuantity.Value()))
|
||||||
if value > r.ScalarResources[rName] {
|
|
||||||
r.SetScalar(rName, value)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user