Merge pull request #19 from s1061123/dev/bump-vendor

Update vendor packages, include cni v1.1.2

Dockerfile.openshift

@@ -1,25 +1,15 @@
 # This dockerfile is used for building for OpenShift
-FROM openshift/origin-release:rhel-8-golang-1.12 as rhel8
+FROM openshift/origin-release:golang-1.16 as rhel8
 ADD . /usr/src/route-override
 WORKDIR /usr/src/route-override
 ENV CGO_ENABLED=0
-ENV GO111MODULE=off
 ENV VERSION=rhel8 COMMIT=unset
 RUN ./build_linux.sh
 WORKDIR /
 
-FROM openshift/origin-release:rhel-7-golang-1.12 as rhel7
-ADD . /usr/src/route-override
-WORKDIR /usr/src/route-override
-ENV CGO_ENABLED=0
-ENV GO111MODULE=off
-RUN ./build_linux.sh
-WORKDIR /
-
 FROM openshift/origin-base
 LABEL org.opencontainers.image.source https://github.com/redhat-nfvpe/cni-route-override
-COPY --from=rhel7 /usr/src/route-override/bin/route-override /usr/src/route-override/rhel7/bin/route-override
-COPY --from=rhel7 /usr/src/route-override/bin/route-override /usr/src/route-override/bin/route-override
+COPY --from=rhel8 /usr/src/route-override/bin/route-override /usr/src/route-override/bin/route-override
 COPY --from=rhel8 /usr/src/route-override/bin/route-override /usr/src/route-override/rhel8/bin/route-override
 
 LABEL io.k8s.display-name="route override CNI" \

cmd/route-override/route-override.go

@@ -27,7 +27,7 @@ import (
 
 	"github.com/containernetworking/cni/pkg/skel"
 	"github.com/containernetworking/cni/pkg/types"
-	"github.com/containernetworking/cni/pkg/types/current"
+	current "github.com/containernetworking/cni/pkg/types/100"
 	"github.com/containernetworking/cni/pkg/version"
 	"github.com/containernetworking/plugins/pkg/ns"
 
@@ -236,7 +236,7 @@ func processRoutes(netnsname string, conf *RouteOverrideConfig) (*current.Result
 
 		// delete given gateway address
 		for _, ips := range res.IPs {
-			if ips.Version == "6" {
+			if ips.Address.IP.To4() == nil {
 				ips.Gateway = net.IPv6zero
 			} else {
 				ips.Gateway = net.IPv4zero