@@ -283,23 +283,30 @@ func setResourceRequirements(configResource corev1.ResourceRequirements) corev1.
283
283
}
284
284
285
285
// If user explicitly sets CPU value to -1, nuke it.
286
- if cpuLimit .Sign () == - 1 && cpuRequest . Sign () == - 1 {
286
+ if cpuLimit .Sign () == - 1 {
287
287
delete (configResource .Limits , corev1 .ResourceCPU )
288
+ }
289
+ if cpuRequest .Sign () == - 1 {
288
290
delete (configResource .Requests , corev1 .ResourceCPU )
289
291
}
290
292
291
293
// If user explicitly sets Memory value to -1, nuke it.
292
- if memLimit .Sign () == - 1 && memRequest . Sign () == - 1 {
294
+ if memLimit .Sign () == - 1 {
293
295
delete (configResource .Limits , corev1 .ResourceMemory )
296
+ }
297
+ if memRequest .Sign () == - 1 {
294
298
delete (configResource .Requests , corev1 .ResourceMemory )
295
299
}
296
300
297
301
// If user explicitly sets ephemeral-storage value to something negative, nuke it.
298
302
// This enables compatibility with the GKE nodepool autoscalers, which cannot scale
299
303
// pods which define ephemeral-storage resource constraints.
300
- if diskLimit .Sign () == - 1 && diskRequest . Sign () == - 1 {
304
+ if diskLimit .Sign () == - 1 {
301
305
delete (configResource .Limits , corev1 .ResourceEphemeralStorage )
306
+ }
307
+ if diskRequest .Sign () == - 1 {
302
308
delete (configResource .Requests , corev1 .ResourceEphemeralStorage )
303
309
}
310
+
304
311
return configResource
305
312
}
0 commit comments