convert IPs to []string

weaveworks · May 7, 2020 · 08afded · 08afded
1 parent 3a364e4
commit 08afded
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/plugin/ipam/cni.go b/plugin/ipam/cni.go
@@ -39,13 +39,18 @@ func (i *Ipam) Allocate(args *skel.CmdArgs) (types.Result, error) {
 	var ipnet *net.IPNet
 
 	if len(conf.IPs) == 1 {
-		ip := conf.IPs[0]
-		if ip.Version == "4" {
-			ipnet = &ip.Address
-			err = i.weave.ClaimIP(containerID, ipnet, false)
-		} else {
+		ip := net.ParseIP(conf.IPs[0]).To4()
+
+		if ip == nil {
 			return nil, errors.New("allocation of ipv6 addresses is not implemented")
 		}
+
+		ipnet := &net.IPNet{
+			IP:   ip,
+			Mask: ip.DefaultMask(),
+		}
+
+		err = i.weave.ClaimIP(containerID, ipnet, false)
 	} else if conf.Subnet == "" {
 		ipnet, err = i.weave.AllocateIP(containerID, false)
 	} else {
@@ -80,10 +85,10 @@ func (i *Ipam) Release(args *skel.CmdArgs) error {
 }
 
 type ipamConf struct {
-	Subnet  string              `json:"subnet,omitempty"`
-	Gateway net.IP              `json:"gateway,omitempty"`
-	Routes  []*types.Route      `json:"routes"`
-	IPs     []*current.IPConfig `json:"ips,omitempty"`
+	Subnet  string         `json:"subnet,omitempty"`
+	Gateway net.IP         `json:"gateway,omitempty"`
+	Routes  []*types.Route `json:"routes"`
+	IPs     []string       `json:"ips,omitempty"`
 }
 
 type netConf struct {