Skip to content

Commit 12f42ee

Browse files
committed
Address review comment from adrianmoisey
1 parent 7e427ae commit 12f42ee

File tree

1 file changed

+15
-18
lines changed

1 file changed

+15
-18
lines changed

vertical-pod-autoscaler/pkg/utils/vpa/capping.go

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -186,33 +186,30 @@ func applyVPAPolicyForContainer(containerName string,
186186

187187
process := func(recommendation apiv1.ResourceList) {
188188
for resourceName, recommended := range recommendation {
189+
var maxAllowed apiv1.ResourceList
189190
// containerPolicy can be nil (user does not have to configure it).
190191
if containerPolicy != nil {
191192
cappedToMin, _ := maybeCapToPolicyMin(recommended, resourceName, containerPolicy)
192193
recommendation[resourceName] = cappedToMin
193194

194-
maxAllowed := containerPolicy.MaxAllowed
195-
if globalMaxAllowed != nil {
196-
if maxAllowed == nil {
197-
maxAllowed = globalMaxAllowed
198-
} else {
199-
// Set resources from the global maxAllowed if the VPA maxAllowed is missing them.
200-
for resourceName, quantity := range globalMaxAllowed {
201-
if _, ok := maxAllowed[resourceName]; !ok {
202-
maxAllowed[resourceName] = quantity
203-
}
195+
maxAllowed = containerPolicy.MaxAllowed
196+
}
197+
198+
if globalMaxAllowed != nil {
199+
if maxAllowed == nil {
200+
maxAllowed = globalMaxAllowed
201+
} else {
202+
// Set resources from the global maxAllowed if the VPA maxAllowed is missing them.
203+
for resourceName, quantity := range globalMaxAllowed {
204+
if _, ok := maxAllowed[resourceName]; !ok {
205+
maxAllowed[resourceName] = quantity
204206
}
205207
}
206208
}
207-
208-
cappedToMax, _ := maybeCapToMax(cappedToMin, resourceName, maxAllowed)
209-
recommendation[resourceName] = cappedToMax
210-
} else {
211-
if globalMaxAllowed != nil {
212-
cappedToMax, _ := maybeCapToMax(recommended, resourceName, globalMaxAllowed)
213-
recommendation[resourceName] = cappedToMax
214-
}
215209
}
210+
211+
cappedToMax, _ := maybeCapToMax(recommendation[resourceName], resourceName, maxAllowed)
212+
recommendation[resourceName] = cappedToMax
216213
}
217214
}
218215

0 commit comments

Comments
 (0)