From 463e756d7962949c6826989683e0097083c23c2a Mon Sep 17 00:00:00 2001 From: avelichk Date: Sat, 26 Jun 2021 01:17:22 +0100 Subject: [PATCH] Allow empty CPU and Memory in Config --- pkg/util/v1beta1/katibconfig/config.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/util/v1beta1/katibconfig/config.go b/pkg/util/v1beta1/katibconfig/config.go index d8c5103a85f..36602d812fa 100644 --- a/pkg/util/v1beta1/katibconfig/config.go +++ b/pkg/util/v1beta1/katibconfig/config.go @@ -285,6 +285,18 @@ func setResourceRequirements(configResource corev1.ResourceRequirements) corev1. configResource.Limits[corev1.ResourceEphemeralStorage] = defaultDiskLimit } + // If user explicitly sets CPU value to -1, nuke it. + if cpuLimit.Sign() == -1 && cpuRequest.Sign() == -1 { + delete(configResource.Limits, corev1.ResourceCPU) + delete(configResource.Requests, corev1.ResourceCPU) + } + + // If user explicitly sets Memory value to -1, nuke it. + if memLimit.Sign() == -1 && memRequest.Sign() == -1 { + delete(configResource.Limits, corev1.ResourceMemory) + delete(configResource.Requests, corev1.ResourceMemory) + } + // If user explicitly sets ephemeral-storage value to something negative, nuke it. // This enables compability with the GKE nodepool autoscalers, which cannot scale // pods which define ephemeral-storage resource constraints.