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

Fix handling of nil and set correct defaults for memory.

This commit is contained in:
Ryan Bonham 2019-04-02 10:38:12 -05:00
parent 88a2a3f11f
commit 73845e200d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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