Skip to content

Commit e72e5c8

Browse files
authored
Allow to remove each resource in Katib config (#1729)
1 parent 594c177 commit e72e5c8

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

pkg/util/v1beta1/katibconfig/config.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,23 +283,30 @@ func setResourceRequirements(configResource corev1.ResourceRequirements) corev1.
283283
}
284284

285285
// If user explicitly sets CPU value to -1, nuke it.
286-
if cpuLimit.Sign() == -1 && cpuRequest.Sign() == -1 {
286+
if cpuLimit.Sign() == -1 {
287287
delete(configResource.Limits, corev1.ResourceCPU)
288+
}
289+
if cpuRequest.Sign() == -1 {
288290
delete(configResource.Requests, corev1.ResourceCPU)
289291
}
290292

291293
// If user explicitly sets Memory value to -1, nuke it.
292-
if memLimit.Sign() == -1 && memRequest.Sign() == -1 {
294+
if memLimit.Sign() == -1 {
293295
delete(configResource.Limits, corev1.ResourceMemory)
296+
}
297+
if memRequest.Sign() == -1 {
294298
delete(configResource.Requests, corev1.ResourceMemory)
295299
}
296300

297301
// If user explicitly sets ephemeral-storage value to something negative, nuke it.
298302
// This enables compatibility with the GKE nodepool autoscalers, which cannot scale
299303
// pods which define ephemeral-storage resource constraints.
300-
if diskLimit.Sign() == -1 && diskRequest.Sign() == -1 {
304+
if diskLimit.Sign() == -1 {
301305
delete(configResource.Limits, corev1.ResourceEphemeralStorage)
306+
}
307+
if diskRequest.Sign() == -1 {
302308
delete(configResource.Requests, corev1.ResourceEphemeralStorage)
303309
}
310+
304311
return configResource
305312
}

0 commit comments

Comments
 (0)