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

fixing nil reference

This commit is contained in:
Eric Greer 2019-02-22 09:23:19 -08:00
parent 89a5fa58a4
commit 478f464dfb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/model/bootstrapscript.go
View File

@ -175,12 +175,12 @@ func (b *BootstrapScript) ResourceNodeUp(ig *kops.InstanceGroup, cluster *kops.C
Image: etcdCluster.Image, Image: etcdCluster.Image,
Version: etcdCluster.Version, Version: etcdCluster.Version,
} }
// if the user has not specified memory or cpu alotments for etcd, do not // if the user has not specified memory or cpu allotments for etcd, do not
// apply one. Described in PR #6313. // apply one. Described in PR #6313.
if !etcdCluster.CPURequest.IsZero() { if etcdCluster.CPURequest != nil {
c.CPURequest = etcdCluster.CPURequest c.CPURequest = etcdCluster.CPURequest
} }
if !etcdCluster.MemoryRequest.IsZero() { if etcdCluster.MemoryRequest != nil {
c.MemoryRequest = etcdCluster.MemoryRequest c.MemoryRequest = etcdCluster.MemoryRequest
} }
spec["etcdClusters"].(map[string]kops.EtcdClusterSpec)[etcdCluster.Name] = c spec["etcdClusters"].(map[string]kops.EtcdClusterSpec)[etcdCluster.Name] = c