Skip to content

Commit cfec21e

Browse files
committed
Sec: github.com/containernetworking/cni to v1.1.2
Ran `go get github.com/containernetworking/[email protected]` Ran `go get github.com/containernetworking/[email protected]` modified: ../../plugin/ipam/cni.go modified: ../../plugin/net/cni.go modified: ../../prog/kube-utils/main.go modified: ../../prog/weaveutil/cni.go Ran go mod tidy -v Ran go mod vendor This was all work done previously by @hswong3i in weaveworks#3939 All credit to them
1 parent f23928d commit cfec21e

File tree

993 files changed

+127053
-44447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

993 files changed

+127053
-44447
lines changed

go.mod

+19-20
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ require (
77
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
88
github.com/aws/aws-sdk-go v1.34.0
99
github.com/boltdb/bolt v1.3.1
10-
github.com/containernetworking/cni v0.5.2
11-
github.com/coreos/go-iptables v0.3.0
10+
github.com/containernetworking/cni v1.1.2
11+
github.com/containernetworking/plugins v1.2.0
12+
github.com/coreos/go-iptables v0.6.0
1213
github.com/docker/docker v17.12.0-ce-rc1.0.20180328155642-38588656727d+incompatible
1314
github.com/docker/libnetwork v0.8.0-dev.2.0.20180212220201-119badbd737b
1415
github.com/docker/machine v0.14.0
@@ -21,26 +22,26 @@ require (
2122
github.com/pkg/errors v0.9.1
2223
github.com/pkg/profile v1.2.1
2324
github.com/prometheus/client_golang v1.7.1
24-
github.com/sirupsen/logrus v1.4.2
25+
github.com/sirupsen/logrus v1.8.1
2526
github.com/spf13/cobra v0.0.1
2627
github.com/stretchr/testify v1.5.1
27-
github.com/vishvananda/netlink v1.0.0
28-
github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936
28+
github.com/vishvananda/netlink v1.2.1-beta.2
29+
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f
2930
github.com/weaveworks/common v0.0.0-20180321110636-ebab3a78900a
3031
github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab
3132
github.com/weaveworks/go-odp v0.0.0-20181017121109-6b0aa22550d9
3233
github.com/weaveworks/mesh v0.0.0-20191105120815-58dbcc3e8e63
33-
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
34-
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1
35-
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384
34+
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
35+
golang.org/x/sys v0.4.0
36+
golang.org/x/tools v0.4.0
3637
k8s.io/api v0.18.6
3738
k8s.io/apimachinery v0.18.6
3839
k8s.io/client-go v0.18.6
3940
)
4041

4142
require (
4243
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
43-
github.com/Microsoft/go-winio v0.4.7 // indirect
44+
github.com/Microsoft/go-winio v0.4.17 // indirect
4445
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
4546
github.com/beorn7/perks v1.0.1 // indirect
4647
github.com/cespare/xxhash/v2 v2.1.1 // indirect
@@ -50,10 +51,9 @@ require (
5051
github.com/docker/go-connections v0.3.0 // indirect
5152
github.com/docker/go-units v0.3.2 // indirect
5253
github.com/evanphx/json-patch v4.2.0+incompatible // indirect
53-
github.com/gogo/protobuf v1.3.1 // indirect
54-
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
55-
github.com/golang/protobuf v1.4.2 // indirect
56-
github.com/google/go-cmp v0.5.1 // indirect
54+
github.com/gogo/protobuf v1.3.2 // indirect
55+
github.com/golang/protobuf v1.5.2 // indirect
56+
github.com/google/go-cmp v0.5.9 // indirect
5757
github.com/google/gofuzz v1.1.0 // indirect
5858
github.com/google/uuid v1.1.1 // indirect
5959
github.com/googleapis/gnostic v0.1.0 // indirect
@@ -64,15 +64,13 @@ require (
6464
github.com/inconshreveable/mousetrap v1.0.0 // indirect
6565
github.com/jmespath/go-jmespath v0.3.0 // indirect
6666
github.com/json-iterator/go v1.1.10 // indirect
67-
github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect
6867
github.com/mattn/go-colorable v0.0.9 // indirect
6968
github.com/mattn/go-isatty v0.0.3 // indirect
7069
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
7170
github.com/mdlayher/raw v0.0.0-20181016155347-fa5ef3332ca9 // indirect
7271
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7372
github.com/modern-go/reflect2 v1.0.1 // indirect
74-
github.com/onsi/ginkgo v1.14.0 // indirect
75-
github.com/onsi/gomega v1.10.1 // indirect
73+
github.com/onsi/ginkgo/v2 v2.6.1 // indirect
7674
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
7775
github.com/opencontainers/image-spec v1.0.1 // indirect
7876
github.com/opencontainers/runc v0.1.1 // indirect
@@ -81,15 +79,16 @@ require (
8179
github.com/prometheus/client_model v0.2.0 // indirect
8280
github.com/prometheus/common v0.10.0 // indirect
8381
github.com/prometheus/procfs v0.1.3 // indirect
82+
github.com/safchain/ethtool v0.2.0 // indirect
8483
github.com/spf13/pflag v1.0.5 // indirect
85-
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 // indirect
84+
golang.org/x/net v0.4.0 // indirect
8685
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
87-
golang.org/x/text v0.3.2 // indirect
86+
golang.org/x/text v0.5.0 // indirect
8887
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
8988
google.golang.org/appengine v1.5.0 // indirect
90-
google.golang.org/protobuf v1.23.0 // indirect
89+
google.golang.org/protobuf v1.28.0 // indirect
9190
gopkg.in/inf.v0 v0.9.1 // indirect
92-
gopkg.in/yaml.v2 v2.3.0 // indirect
91+
gopkg.in/yaml.v2 v2.4.0 // indirect
9392
gotest.tools v2.2.0+incompatible // indirect
9493
k8s.io/klog v1.0.0 // indirect
9594
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 // indirect

0 commit comments

Comments
 (0)