Revert "Merge pull request #103 from aws/dev"

This reverts commit a04bd6e, reversing changes made to db58647.
aws · Feb 16, 2023 · f216cc7 · f216cc7
1 parent 515943c
commit f216cc7
Show file tree

Hide file tree

Showing 768 changed files with 100,000 additions and 388,022 deletions.
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/cniipamwrapper/ipam.go b/pkg/cniipamwrapper/ipam.go
@@ -14,9 +14,9 @@
 package cniipamwrapper
 
 import (
+	cni_ipam "github.com/containernetworking/cni/pkg/ipam"
 	"github.com/containernetworking/cni/pkg/types"
 	"github.com/containernetworking/cni/pkg/types/current"
-	cni_ipam "github.com/containernetworking/plugins/pkg/ipam"
 )
 
 // IPAM wraps methods used from the the cni/pkg/ipam package

diff --git a/pkg/cniipamwrapper/mocks/cniipamwrapper_mocks.go b/pkg/cniipamwrapper/mocks/cniipamwrapper_mocks.go
diff --git a/pkg/cniipamwrapper/mocks_types/result_mocks.go b/pkg/cniipamwrapper/mocks_types/result_mocks.go
diff --git a/pkg/cniipwrapper/ip.go b/pkg/cniipwrapper/ip.go
@@ -16,20 +16,20 @@ package cniipwrapper
 import (
 	"net"
 
-	"github.com/containernetworking/plugins/pkg/ip"
-	"github.com/containernetworking/plugins/pkg/ns"
+	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/cni/pkg/ns"
 )
 
 // IPAM wraps methods used from the the cni/pkg/ip package
-// See github.com/containernetworking/plugins/pkg/ip for more details
+// Seee github.com/containernetworking/cni/pkg/ip for more details
 type IP interface {
 	// SetupVeth creates a veth pair
 	SetupVeth(contVethName string, mtu int, hostNS ns.NetNS) (net.Interface, net.Interface, error)
 	// SetHWAddrByIP sets the hardware address for the interface identified
 	// by the ip address
 	SetHWAddrByIP(ifName string, ip4 net.IP, ip6 net.IP) error
 	// DelLinkByNameAddr deletes the interface
-	DelLinkByNameAddr(ifName string) (*net.IPNet, error)
+	DelLinkByNameAddr(ifName string, family int) (*net.IPNet, error)
 }
 
 type cniIP struct{}
@@ -47,11 +47,6 @@ func (*cniIP) SetHWAddrByIP(ifName string, ip4 net.IP, ip6 net.IP) error {
 	return ip.SetHWAddrByIP(ifName, ip4, ip6)
 }
 
-func (*cniIP) DelLinkByNameAddr(ifName string) (*net.IPNet, error) {
-	// this was updated to return an array of its addresses.  For now just returning the first
-	ips, err := ip.DelLinkByNameAddr(ifName)
-	if err != nil {
-		return &net.IPNet{}, err
-	}
-	return ips[0], err
+func (*cniIP) DelLinkByNameAddr(ifName string, family int) (*net.IPNet, error) {
+	return ip.DelLinkByNameAddr(ifName, family)
 }