Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Commit 7ea287d

Browse files
hswong3ihswong3i
committed
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 as per v1.0.1 requirement - Update build plan with `golang:1.17-bullseye` - 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]>
1 parent e371215 commit 7ea287d

File tree

9 files changed

+827
-40
lines changed

9 files changed

+827
-40
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ coverage.html
3636
# Sed backup files
3737
*.bak
3838

39+
# Cache files
40+
.cache
41+
3942
# Project specific
4043
prog/weaver/weaver
4144
prog/weavedns/weavedns

‎Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ifeq ($(ARCH),amd64)
2525
WEAVEEXEC_DOCKER_ARCH?=x86_64
2626

2727
# The name of the alpine baseimage to use as the base for weave images
28-
ALPINE_BASEIMAGE?=alpine:3.10
28+
ALPINE_BASEIMAGE?=alpine:3.15
2929

3030
# The extension for the made images
3131
# Specifying none means for example weaveworks/weave:latest
@@ -42,7 +42,7 @@ ifeq ($(ARCH),arm)
4242
WEAVEEXEC_DOCKER_ARCH?=armel
4343

4444
# Using the (semi-)official alpine image
45-
ALPINE_BASEIMAGE?=arm32v6/alpine:3.8
45+
ALPINE_BASEIMAGE?=arm32v6/alpine:3.15
4646

4747
# arm images have the -arm suffix, for instance weaveworks/weave-arm:latest
4848
ARCH_EXT?=-arm
@@ -62,7 +62,7 @@ ifeq ($(ARCH),arm64)
6262
WEAVEEXEC_DOCKER_ARCH?=armel
6363

6464
# Using the (semi-)official alpine image
65-
ALPINE_BASEIMAGE?=arm64v8/alpine:3.8
65+
ALPINE_BASEIMAGE?=arm64v8/alpine:3.15
6666

6767
# arm64 images have the -arm64 suffix, for instance weaveworks/weave-arm64:latest
6868
ARCH_EXT?=-arm64
@@ -82,7 +82,7 @@ ifeq ($(ARCH),ppc64le)
8282
WEAVEEXEC_DOCKER_ARCH?=ppc64le
8383

8484
# Using the (semi-)official alpine image
85-
ALPINE_BASEIMAGE?=ppc64le/alpine:3.8
85+
ALPINE_BASEIMAGE?=ppc64le/alpine:3.15
8686

8787
# ppc64le images have the -ppc64le suffix, for instance weaveworks/weave-ppc64le:latest
8888
ARCH_EXT?=-ppc64le
@@ -102,7 +102,7 @@ ifeq ($(ARCH),s390x)
102102
WEAVEEXEC_DOCKER_ARCH?=s390x
103103

104104
# Using the (semi-)official alpine image
105-
ALPINE_BASEIMAGE?=s390x/alpine:3.6
105+
ALPINE_BASEIMAGE?=s390x/alpine:3.15
106106

107107
# s390x images have the -s390x suffix, for instance weaveworks/weave-s390x:latest
108108
ARCH_EXT?=-s390x

‎build/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.15.6-buster
1+
FROM golang:1.17.9-buster
22

33
# Support Raspberry Pi 2 and newer
44
ENV GOARM 7
@@ -76,7 +76,7 @@ RUN curl -sSL https://www.tcpdump.org/release/libpcap-${LIBPCAP_CROSS_VERSION}.t
7676
&& make clean; done
7777

7878
# Install Docker
79-
RUN curl -fsSL https://get.docker.com | VERSION=18.06.0-ce /bin/sh
79+
RUN curl -fsSL https://get.docker.com | VERSION=20.10.9 /bin/sh
8080

8181
COPY build.sh /
8282
ENTRYPOINT ["sh", "/build.sh"]

‎go.mod

+30-26
Original file line numberDiff line numberDiff line change
@@ -4,62 +4,66 @@ go 1.14
44

55
require (
66
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
7-
github.com/Microsoft/go-winio v0.4.7 // indirect
7+
github.com/Microsoft/go-winio v0.4.17 // indirect
88
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
99
github.com/andybalholm/go-bit v0.0.0-20150501193155-34813fe0e46a
1010
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
11-
github.com/aws/aws-sdk-go v1.13.22
11+
github.com/aws/aws-sdk-go v1.15.11
1212
github.com/boltdb/bolt v1.3.1
13-
github.com/containerd/continuity v0.0.0-20180322171221-3e8f2ea4b190 // indirect
14-
github.com/containernetworking/cni v0.5.2
15-
github.com/coreos/go-iptables v0.3.0
16-
github.com/docker/distribution v2.6.0-rc.1.0.20180327202408-83389a148052+incompatible // indirect
13+
github.com/containerd/continuity v0.1.0 // indirect
14+
github.com/containernetworking/cni v1.0.1
15+
github.com/containernetworking/plugins v1.1.1
16+
github.com/coreos/go-iptables v0.6.0
17+
github.com/docker/distribution v2.7.1+incompatible // indirect
1718
github.com/docker/docker v17.12.0-ce-rc1.0.20180328155642-38588656727d+incompatible
1819
github.com/docker/go-connections v0.3.0 // indirect
19-
github.com/docker/go-units v0.3.2 // indirect
20+
github.com/docker/go-units v0.4.0 // indirect
2021
github.com/docker/libnetwork v0.8.0-dev.2.0.20180212220201-119badbd737b
2122
github.com/docker/machine v0.14.0
2223
github.com/fsouza/go-dockerclient v1.2.0
2324
github.com/go-ini/ini v1.33.0 // indirect
2425
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
25-
github.com/google/go-cmp v0.5.1 // indirect
26+
github.com/google/go-cmp v0.5.5 // indirect
2627
github.com/google/gopacket v1.1.16
28+
github.com/gophercloud/gophercloud v0.1.0 // indirect
2729
github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f // indirect
28-
github.com/gorilla/mux v1.6.1
30+
github.com/gorilla/mux v1.7.2
2931
github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
3032
github.com/hashicorp/go-cleanhttp v0.0.0-20171218145408-d5fe4b57a186 // indirect
3133
github.com/inconshreveable/mousetrap v1.0.0 // indirect
3234
github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56
33-
github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 // indirect
35+
github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7 // indirect
3436
github.com/mattn/go-colorable v0.0.9 // indirect
35-
github.com/mattn/go-isatty v0.0.3 // indirect
37+
github.com/mattn/go-isatty v0.0.4 // indirect
3638
github.com/mdlayher/raw v0.0.0-20181016155347-fa5ef3332ca9 // indirect
3739
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
3840
github.com/miekg/dns v1.0.4
39-
github.com/onsi/ginkgo v1.14.0 // indirect
40-
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
41+
github.com/onsi/ginkgo v1.16.4 // indirect
42+
github.com/opencontainers/go-digest v1.0.0 // indirect
4143
github.com/opencontainers/image-spec v1.0.1 // indirect
42-
github.com/opencontainers/runc v0.1.1 // indirect
43-
github.com/opencontainers/selinux v1.6.0 // indirect
44+
github.com/opencontainers/runc v1.0.0-rc93 // indirect
45+
github.com/opencontainers/selinux v1.8.0 // indirect
4446
github.com/pkg/errors v0.9.1
4547
github.com/pkg/profile v1.2.1
4648
github.com/prometheus/client_golang v1.7.1
47-
github.com/sirupsen/logrus v1.4.2
49+
github.com/sirupsen/logrus v1.8.1
4850
github.com/smartystreets/goconvey v1.6.4 // indirect
49-
github.com/spf13/cobra v0.0.1
50-
github.com/stretchr/testify v1.4.0
51-
github.com/vishvananda/netlink v1.0.0
52-
github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936
51+
github.com/spf13/cobra v1.0.0
52+
github.com/stretchr/testify v1.7.0
53+
github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
54+
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f
5355
github.com/weaveworks/common v0.0.0-20180321110636-ebab3a78900a
5456
github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab
5557
github.com/weaveworks/go-odp v0.0.0-20181017121109-6b0aa22550d9
5658
github.com/weaveworks/mesh v0.0.0-20191105120815-58dbcc3e8e63
57-
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
58-
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1
59-
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384
59+
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
60+
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e
61+
golang.org/x/tools v0.1.4
6062
gopkg.in/ini.v1 v1.57.0 // indirect
6163
gotest.tools v2.2.0+incompatible // indirect
62-
k8s.io/api v0.18.6
63-
k8s.io/apimachinery v0.18.6
64-
k8s.io/client-go v0.18.6
64+
k8s.io/api v0.20.6
65+
k8s.io/apimachinery v0.20.6
66+
k8s.io/client-go v0.20.6
67+
k8s.io/klog v1.0.0 // indirect
68+
sigs.k8s.io/structured-merge-diff/v3 v3.0.0 // indirect
6569
)

0 commit comments

Comments
 (0)