rancher/plugins
1
0
Fork 1
mirror of https://github.com/rancher/plugins.git synced 2025-09-01 18:02:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #387 from tangle329/master

Browse Source 
Check n.IPAM before use it in LoadIPAMConfig function
This commit is contained in:
Tom Denham
2017-03-02 09:23:02 -08:00
committed by GitHub
parent 75a5cf1bf0 1003822e53
commit 1f6efc28b5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/ipam/host-local/backend/allocator/config.go
View File

@@ -54,6 +54,10 @@ func LoadIPAMConfig(bytes []byte, args string) (*IPAMConfig, string, error) {
return nil, "", err
}
if n.IPAM == nil {
return nil, "", fmt.Errorf("IPAM config missing 'ipam' key")
}
if args != "" {
n.IPAM.Args = &IPAMArgs{}
err := types.LoadArgs(args, n.IPAM.Args)
@@ -62,10 +66,6 @@ func LoadIPAMConfig(bytes []byte, args string) (*IPAMConfig, string, error) {
}
}
if n.IPAM == nil {
return nil, "", fmt.Errorf("IPAM config missing 'ipam' key")
}
// Copy net name into IPAM so not to drag Net struct around
n.IPAM.Name = n.Name