Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support CNI_ARGS in static IPAM plugin #165

Merged
merged 8 commits into from
Sep 25, 2018
Merged

Support CNI_ARGS in static IPAM plugin #165

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6da1cb7
Support CNI_ARGS in static IPAM plugin
s1061123 Jun 18, 2018
3b3622d
Incorporate jellonek's comments.
s1061123 Jul 6, 2018
cc3ad26
Incorporate Casey's comments
s1061123 Jul 26, 2018
60a99ca
Incorporate Dan's comments.
s1061123 Sep 5, 2018
321467b
Merge remote-tracking branch 'upstream/master' into dev/static-args
s1061123 Sep 5, 2018
61c1361
Support multiple IP addresses in CNI_ARGS
s1061123 Sep 6, 2018
61a412e
Align test suite name with others
s1061123 Sep 6, 2018
094c903
Incorporate Dan's comments.
s1061123 Sep 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Incorporate Dan's comments.
  • Loading branch information
@s1061123
s1061123 committed Sep 12, 2018
commit 094c9039328e1d2007d9e300804654ad0748a08c
2 changes: 1 addition & 1 deletion plugins/ipam/static/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func LoadIPAMConfig(bytes []byte, envArgs string) (*IPAMConfig, string, error) {

ip, subnet, err := net.ParseCIDR(ipstr)
if err != nil {
return nil, "", fmt.Errorf("invalid CIDR %s: %s", e.IP, err)
return nil, "", fmt.Errorf("invalid CIDR %s: %s", ipstr, err)
}

addr := Address{Address: net.IPNet{IP: ip, Mask: subnet.Mask}}
Expand Down