@@ -195,33 +195,30 @@ func applyVPAPolicyForContainer(containerName string,
195
195
196
196
process := func (recommendation apiv1.ResourceList ) {
197
197
for resourceName , recommended := range recommendation {
198
+ var maxAllowed apiv1.ResourceList
198
199
// containerPolicy can be nil (user does not have to configure it).
199
200
if containerPolicy != nil {
200
201
cappedToMin , _ := maybeCapToPolicyMin (recommended , resourceName , containerPolicy )
201
202
recommendation [resourceName ] = cappedToMin
202
203
203
- maxAllowed := containerPolicy .MaxAllowed
204
- if globalMaxAllowed != nil {
205
- if maxAllowed == nil {
206
- maxAllowed = globalMaxAllowed
207
- } else {
208
- // Set resources from the global maxAllowed if the VPA maxAllowed is missing them.
209
- for resourceName , quantity := range globalMaxAllowed {
210
- if _ , ok := maxAllowed [resourceName ]; ! ok {
211
- maxAllowed [resourceName ] = quantity
212
- }
204
+ maxAllowed = containerPolicy .MaxAllowed
205
+ }
206
+
207
+ if globalMaxAllowed != nil {
208
+ if maxAllowed == nil {
209
+ maxAllowed = globalMaxAllowed
210
+ } else {
211
+ // Set resources from the global maxAllowed if the VPA maxAllowed is missing them.
212
+ for resourceName , quantity := range globalMaxAllowed {
213
+ if _ , ok := maxAllowed [resourceName ]; ! ok {
214
+ maxAllowed [resourceName ] = quantity
213
215
}
214
216
}
215
217
}
216
-
217
- cappedToMax , _ := maybeCapToMax (cappedToMin , resourceName , maxAllowed )
218
- recommendation [resourceName ] = cappedToMax
219
- } else {
220
- if globalMaxAllowed != nil {
221
- cappedToMax , _ := maybeCapToMax (recommended , resourceName , globalMaxAllowed )
222
- recommendation [resourceName ] = cappedToMax
223
- }
224
218
}
219
+
220
+ cappedToMax , _ := maybeCapToMax (recommendation [resourceName ], resourceName , maxAllowed )
221
+ recommendation [resourceName ] = cappedToMax
225
222
}
226
223
}
227
224
0 commit comments