go get github.com/containernetworking/[email protected]

With current `github.com/containernetworking/[email protected]` depedency, our
generated json from `weave-net setup` return witout the newly required
`cniVersion`.

For `github.com/containernetworking/[email protected]` such `cniVersion` is now
required or else will fall as default version number `0.1.0`.

This PR update the `vendor` folder as below:

  - Update dependency with `go get github.com/containernetworking/[email protected]`
  - Update `vendor` directory with `go mod verndor`
  - Update API interface to `current "github.com/containernetworking/cni/pkg/types/040"`
  - Update QEMU with `QEMU_VERSION=v6.1.0-8`
  - Update build plan with `golang:1.17.9-buster`
  - Update base image with `alpine:3.15`

Test images could be found from:

  - https://hub.docker.com/r/alvistack/weave-kube
  - https://hub.docker.com/r/alvistack/weave-npc

See https://github.com/containernetworking/cni/blob/v1.0.1/Documentation/spec-upgrades.md
See containernetworking/cni@27a5b99
See containerd/containerd#6575 (comment)

Fixes #3936

Signed-off-by: Wong Hoi Sing Edison <[email protected]>

Author: hswong3i

.gitignore

@@ -36,6 +36,9 @@ coverage.html
 # Sed backup files
 *.bak
 
+# Cache files
+.cache
+
 # Project specific
 prog/weaver/weaver
 prog/weavedns/weavedns

Makefile

@@ -13,7 +13,7 @@ ARCH?=amd64
 
 # We're using QEMU to be able to build Docker images for other architectures
 # from amd64 machines.
-QEMU_VERSION=v2.7.0
+QEMU_VERSION=v6.1.0-8
 
 # A list of all supported architectures here. Should be named as Go is naming platforms
 # All supported architectures must have an "ifeq" block below that customizes the parameters
@@ -25,7 +25,7 @@ ifeq ($(ARCH),amd64)
 	WEAVEEXEC_DOCKER_ARCH?=x86_64
 
 # The name of the alpine baseimage to use as the base for weave images
-	ALPINE_BASEIMAGE?=alpine:3.10
+	ALPINE_BASEIMAGE?=alpine:3.15
 
 # The extension for the made images
 # Specifying none means for example weaveworks/weave:latest
@@ -42,7 +42,7 @@ ifeq ($(ARCH),arm)
 	WEAVEEXEC_DOCKER_ARCH?=armel
 
 # Using the (semi-)official alpine image
-	ALPINE_BASEIMAGE?=arm32v6/alpine:3.8
+	ALPINE_BASEIMAGE?=arm32v6/alpine:3.15
 
 # arm images have the -arm suffix, for instance weaveworks/weave-arm:latest
 	ARCH_EXT?=-arm
@@ -62,7 +62,7 @@ ifeq ($(ARCH),arm64)
 	WEAVEEXEC_DOCKER_ARCH?=armel
 
 # Using the (semi-)official alpine image
-	ALPINE_BASEIMAGE?=arm64v8/alpine:3.8
+	ALPINE_BASEIMAGE?=arm64v8/alpine:3.15
 
 # arm64 images have the -arm64 suffix, for instance weaveworks/weave-arm64:latest
 	ARCH_EXT?=-arm64
@@ -82,7 +82,7 @@ ifeq ($(ARCH),ppc64le)
 	WEAVEEXEC_DOCKER_ARCH?=ppc64le
 
 # Using the (semi-)official alpine image
-	ALPINE_BASEIMAGE?=ppc64le/alpine:3.8
+	ALPINE_BASEIMAGE?=ppc64le/alpine:3.15
 
 # ppc64le images have the -ppc64le suffix, for instance weaveworks/weave-ppc64le:latest
 	ARCH_EXT?=-ppc64le
@@ -102,7 +102,7 @@ ifeq ($(ARCH),s390x)
 	WEAVEEXEC_DOCKER_ARCH?=s390x
 
 # Using the (semi-)official alpine image
-	ALPINE_BASEIMAGE?=s390x/alpine:3.6
+	ALPINE_BASEIMAGE?=s390x/alpine:3.15
 
 # s390x images have the -s390x suffix, for instance weaveworks/weave-s390x:latest
 	ARCH_EXT?=-s390x

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.15.6-buster
+FROM golang:1.17.9-buster
 
 # Support Raspberry Pi 2 and newer
 ENV GOARM 7
@@ -43,8 +43,8 @@ RUN apt-get update \
 		flex \
 		bison
 
-RUN curl -fsSLo shfmt https://github.com/mvdan/sh/releases/download/v1.3.0/shfmt_v1.3.0_linux_amd64 && \
-	echo "b1925c2c405458811f0c227266402cf1868b4de529f114722c2e3a5af4ac7bb2  shfmt" | sha256sum -c && \
+RUN curl -fsSLo shfmt https://github.com/mvdan/sh/releases/download/v3.4.3/shfmt_v3.4.3_linux_amd64 && \
+	echo "713ef49db9a60a00636814a507da851b58da6b4b98a3627188fba0a61b60f9a8  shfmt" | sha256sum -c && \
 	chmod +x shfmt && \
 	mv shfmt /usr/bin
 
@@ -76,7 +76,7 @@ RUN curl -sSL https://www.tcpdump.org/release/libpcap-${LIBPCAP_CROSS_VERSION}.t
 		&& make clean; done
 
 # Install Docker
-RUN curl -fsSL https://get.docker.com | VERSION=18.06.0-ce /bin/sh
+RUN curl -fsSL https://get.docker.com | VERSION=20.10.9 /bin/sh
 
 COPY build.sh /
 ENTRYPOINT ["sh", "/build.sh"]

go.mod

@@ -4,62 +4,66 @@ go 1.14
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
-	github.com/Microsoft/go-winio v0.4.7 // indirect
+	github.com/Microsoft/go-winio v0.4.17 // indirect
 	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
 	github.com/andybalholm/go-bit v0.0.0-20150501193155-34813fe0e46a
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
-	github.com/aws/aws-sdk-go v1.13.22
+	github.com/aws/aws-sdk-go v1.15.11
 	github.com/boltdb/bolt v1.3.1
-	github.com/containerd/continuity v0.0.0-20180322171221-3e8f2ea4b190 // indirect
-	github.com/containernetworking/cni v0.5.2
-	github.com/coreos/go-iptables v0.3.0
-	github.com/docker/distribution v2.6.0-rc.1.0.20180327202408-83389a148052+incompatible // indirect
+	github.com/containerd/continuity v0.1.0 // indirect
+	github.com/containernetworking/cni v1.0.1
+	github.com/containernetworking/plugins v1.1.1
+	github.com/coreos/go-iptables v0.6.0
+	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v17.12.0-ce-rc1.0.20180328155642-38588656727d+incompatible
 	github.com/docker/go-connections v0.3.0 // indirect
-	github.com/docker/go-units v0.3.2 // indirect
+	github.com/docker/go-units v0.4.0 // indirect
 	github.com/docker/libnetwork v0.8.0-dev.2.0.20180212220201-119badbd737b
 	github.com/docker/machine v0.14.0
 	github.com/fsouza/go-dockerclient v1.2.0
 	github.com/go-ini/ini v1.33.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
-	github.com/google/go-cmp v0.5.1 // indirect
+	github.com/google/go-cmp v0.5.5 // indirect
 	github.com/google/gopacket v1.1.16
+	github.com/gophercloud/gophercloud v0.1.0 // indirect
 	github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f // indirect
-	github.com/gorilla/mux v1.6.1
+	github.com/gorilla/mux v1.7.2
 	github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
 	github.com/hashicorp/go-cleanhttp v0.0.0-20171218145408-d5fe4b57a186 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56
-	github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 // indirect
+	github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7 // indirect
 	github.com/mattn/go-colorable v0.0.9 // indirect
-	github.com/mattn/go-isatty v0.0.3 // indirect
+	github.com/mattn/go-isatty v0.0.4 // indirect
 	github.com/mdlayher/raw v0.0.0-20181016155347-fa5ef3332ca9 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
 	github.com/miekg/dns v1.0.4
-	github.com/onsi/ginkgo v1.14.0 // indirect
-	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
+	github.com/onsi/ginkgo v1.16.4 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.1 // indirect
-	github.com/opencontainers/runc v0.1.1 // indirect
-	github.com/opencontainers/selinux v1.6.0 // indirect
+	github.com/opencontainers/runc v1.0.0-rc93 // indirect
+	github.com/opencontainers/selinux v1.8.0 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/pkg/profile v1.2.1
 	github.com/prometheus/client_golang v1.7.1
-	github.com/sirupsen/logrus v1.4.2
+	github.com/sirupsen/logrus v1.8.1
 	github.com/smartystreets/goconvey v1.6.4 // indirect
-	github.com/spf13/cobra v0.0.1
-	github.com/stretchr/testify v1.4.0
-	github.com/vishvananda/netlink v1.0.0
-	github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936
+	github.com/spf13/cobra v1.0.0
+	github.com/stretchr/testify v1.7.0
+	github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
+	github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f
 	github.com/weaveworks/common v0.0.0-20180321110636-ebab3a78900a
 	github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab
 	github.com/weaveworks/go-odp v0.0.0-20181017121109-6b0aa22550d9
 	github.com/weaveworks/mesh v0.0.0-20191105120815-58dbcc3e8e63
-	golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
-	golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1
-	golang.org/x/tools v0.0.0-20190328211700-ab21143f2384
+	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
+	golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e
+	golang.org/x/tools v0.1.4
 	gopkg.in/ini.v1 v1.57.0 // indirect
 	gotest.tools v2.2.0+incompatible // indirect
-	k8s.io/api v0.18.6
-	k8s.io/apimachinery v0.18.6
-	k8s.io/client-go v0.18.6
+	k8s.io/api v0.20.6
+	k8s.io/apimachinery v0.20.6
+	k8s.io/client-go v0.20.6
+	k8s.io/klog v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v3 v3.0.0 // indirect
 )