From 88a2a3f11f48ae572611655157d5ddc522dc286d Mon Sep 17 00:00:00 2001 From: Ryan Bonham Date: Mon, 1 Apr 2019 14:04:28 -0500 Subject: [PATCH] Cleanup changes to kubedns --- pkg/model/components/kubedns.go | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkg/model/components/kubedns.go b/pkg/model/components/kubedns.go index 6ffb75bf6b..4269197981 100644 --- a/pkg/model/components/kubedns.go +++ b/pkg/model/components/kubedns.go @@ -59,22 +59,19 @@ func (b *KubeDnsOptionsBuilder) BuildOptions(o interface{}) error { clusterSpec.KubeDNS.Domain = clusterSpec.ClusterDNSDomain } - if !clusterSpec.KubeDNS.MemoryRequest.IsZero() { - clusterSpec.KubeDNS.MemoryRequest = clusterSpec.KubeDNS.MemoryRequest - } else { - clusterSpec.KubeDNS.MemoryRequest = resource.MustParse("70m") + if clusterSpec.KubeDNS.MemoryRequest.IsZero() { + defualtMemoryRequest := resource.MustParse("70m") + clusterSpec.KubeDNS.MemoryRequest = &defualtMemoryRequest } - if !clusterSpec.KubeDNS.CPURequest.IsZero() { - clusterSpec.KubeDNS.CPURequest = clusterSpec.KubeDNS.CPURequest - } else { - clusterSpec.KubeDNS.CPURequest = resource.MustParse("100m") + if clusterSpec.KubeDNS.CPURequest.IsZero() { + defaultCPURequest := resource.MustParse("100m") + clusterSpec.KubeDNS.CPURequest = &defaultCPURequest } - if !clusterSpec.KubeDNS.MemoryLimit.IsZero() { - clusterSpec.KubeDNS.MemoryLimit = clusterSpec.KubeDNS.MemoryLimit - } else { - clusterSpec.KubeDNS.MemoryLimit = resource.MustParse("170m") + if clusterSpec.KubeDNS.MemoryLimit.IsZero() { + defaultMemoryLimit := resource.MustParse("170m") + clusterSpec.KubeDNS.MemoryLimit = &defaultMemoryLimit } return nil