kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup changes to kubedns

This commit is contained in:
Ryan Bonham 2019-04-01 14:04:28 -05:00
parent 1fe925e01f
commit 88a2a3f11f
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/model/components/kubedns.go
View File

@ -59,22 +59,19 @@ func (b *KubeDnsOptionsBuilder) BuildOptions(o interface{}) error {
clusterSpec.KubeDNS.Domain = clusterSpec.ClusterDNSDomain clusterSpec.KubeDNS.Domain = clusterSpec.ClusterDNSDomain
} }
if !clusterSpec.KubeDNS.MemoryRequest.IsZero() { if clusterSpec.KubeDNS.MemoryRequest.IsZero() {
clusterSpec.KubeDNS.MemoryRequest = clusterSpec.KubeDNS.MemoryRequest defualtMemoryRequest := resource.MustParse("70m")
} else { clusterSpec.KubeDNS.MemoryRequest = &defualtMemoryRequest
clusterSpec.KubeDNS.MemoryRequest = resource.MustParse("70m")
} }
if !clusterSpec.KubeDNS.CPURequest.IsZero() { if clusterSpec.KubeDNS.CPURequest.IsZero() {
clusterSpec.KubeDNS.CPURequest = clusterSpec.KubeDNS.CPURequest defaultCPURequest := resource.MustParse("100m")
} else { clusterSpec.KubeDNS.CPURequest = &defaultCPURequest
clusterSpec.KubeDNS.CPURequest = resource.MustParse("100m")
} }
if !clusterSpec.KubeDNS.MemoryLimit.IsZero() { if clusterSpec.KubeDNS.MemoryLimit.IsZero() {
clusterSpec.KubeDNS.MemoryLimit = clusterSpec.KubeDNS.MemoryLimit defaultMemoryLimit := resource.MustParse("170m")
} else { clusterSpec.KubeDNS.MemoryLimit = &defaultMemoryLimit
clusterSpec.KubeDNS.MemoryLimit = resource.MustParse("170m")
} }
return nil return nil