Bump containernetworking dependencies only (aws#916)

Makefile

@@ -178,8 +178,8 @@ generate-limits:
 	go run pkg/awsutils/gen_vpc_ip_limits.go
 
 # Fetch portmap the port-forwarding management CNI plugin
-portmap: FETCH_VERSION=0.7.5
-portmap: FETCH_URL=https://github.com/containernetworking/plugins/releases/download/v$(FETCH_VERSION)/cni-plugins-$(GOARCH)-v$(FETCH_VERSION).tgz
+portmap: FETCH_VERSION=0.8.5
+portmap: FETCH_URL=https://github.com/containernetworking/plugins/releases/download/v$(FETCH_VERSION)/cni-plugins-$(GOOS)-$(GOARCH)-v$(FETCH_VERSION).tgz
 portmap: VISIT_URL=https://github.com/containernetworking/plugins/tree/v$(FETCH_VERSION)/plugins/meta/portmap
 portmap:
 	@echo "Fetching portmap CNI plugin v$(FETCH_VERSION) from upstream release"

cmd/routed-eni-cni-plugin/cni.go

@@ -335,8 +335,9 @@ func del(args *skel.CmdArgs, cniTypes typeswrapper.CNITYPES, grpcClient grpcwrap
 func main() {
 	log := logger.DefaultLogger()
 	log.Infof("CNI Plugin version: %s ...", version)
+	about := fmt.Sprintf("AWS CNI %s", version)
 	exitCode := 0
-	if e := skel.PluginMainWithError(cmdAdd, cmdDel, cniSpecVersion.All); e != nil {
+	if e := skel.PluginMainWithError(cmdAdd, nil, cmdDel, cniSpecVersion.All, about); e != nil {
 		if err := e.Print(); err != nil {
 			log.Errorf("Failed to write error to stdout: %v", err)
 		}

cmd/routed-eni-cni-plugin/driver/driver.go

@@ -22,7 +22,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
 
-	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/plugins/pkg/ns"
 	"github.com/vishvananda/netlink"
 
 	"github.com/aws/amazon-vpc-cni-k8s/pkg/ipwrapper"

go.mod

@@ -5,7 +5,8 @@ go 1.13
 require (
 	github.com/aws/aws-sdk-go v1.30.4
 	github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
-	github.com/containernetworking/cni v0.5.2
+	github.com/containernetworking/cni v0.7.1
+	github.com/containernetworking/plugins v0.8.5
 	github.com/coreos/go-iptables v0.4.5
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
@@ -15,7 +16,7 @@ require (
 	github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
 	github.com/googleapis/gnostic v0.2.0 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
-	github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47 // indirect
+	github.com/hashicorp/golang-lru v0.5.1 // indirect
 	github.com/imdario/mergo v0.3.6 // indirect
 	github.com/json-iterator/go v1.1.5 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect

pkg/cninswrapper/ns.go

@@ -13,7 +13,7 @@
 
 package cninswrapper
 
-import "github.com/containernetworking/cni/pkg/ns"
+import "github.com/containernetworking/plugins/pkg/ns"
 
 // NS wraps methods used from the cni/pkg/ns package
 type NS interface {

pkg/ipamd/ipamd.go

@@ -150,13 +150,13 @@ var (
 	addIPCnt = prometheus.NewCounter(
 		prometheus.CounterOpts{
 			Name: "awscni_add_ip_req_count",
-			Help: "The number of add IP address request",
+			Help: "The number of add IP address requests",
 		},
 	)
 	delIPCnt = prometheus.NewCounterVec(
 		prometheus.CounterOpts{
 			Name: "awscni_del_ip_req_count",
-			Help: "The number of delete IP address request",
+			Help: "The number of delete IP address requests",
 		},
 		[]string{"reason"},
 	)

pkg/ipwrapper/ip.go

@@ -16,7 +16,7 @@ package ipwrapper
 import (
 	"net"
 
-	"github.com/containernetworking/cni/pkg/ip"
+	"github.com/containernetworking/plugins/pkg/ip"
 	"github.com/vishvananda/netlink"
 )
 

pkg/nswrapper/ns.go

@@ -14,7 +14,7 @@
 package nswrapper
 
 import (
-	"github.com/containernetworking/cni/pkg/ns"
+	"github.com/containernetworking/plugins/pkg/ns"
 )
 
 type NS interface {