Skip to content

Commit babb981

Browse files
anshalshuklaanshal
authored andcommitted
Update containerd and related dependencies
Signed-off-by: Anshal Shukla <shukla.anshal85@gmail.com>
1 parent ee098e2 commit babb981

File tree

7 files changed

+280
-62
lines changed

7 files changed

+280
-62
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ for arbitrary serverless deployments.
8080

8181
### Changed
8282

83-
- Bumped Containerd to v1.5.2.
83+
- Bumped Containerd to v1.6.0.
8484
- Bumped Knative to v0.23.0.
8585
- Bumped Go to v1.16.4.
8686
- Frozen Kubernetes at v1.20.6-00.

examples/invoker/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ require (
1818
github.com/vhive-serverless/vhive/utils/benchmarking/eventing v0.0.0-00010101000000-000000000000
1919
github.com/vhive-serverless/vhive/utils/tracing/go v0.0.0-00010101000000-000000000000
2020
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0
21-
google.golang.org/grpc v1.39.0
22-
google.golang.org/protobuf v1.26.0
21+
google.golang.org/grpc v1.43.0
22+
google.golang.org/protobuf v1.27.1
2323
)

examples/invoker/go.sum

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,11 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
9999
github.com/cloudevents/sdk-go/v2 v2.4.1/go.mod h1:MZiMwmAh5tGj+fPFvtHv9hKurKqXtdB9haJYMJ/7GJY=
100100
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
101101
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
102+
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
102103
github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
104+
github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
105+
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
106+
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
103107
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
104108
github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
105109
github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
@@ -239,6 +243,7 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
239243
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
240244
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
241245
github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
246+
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
242247
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
243248
github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
244249
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -890,8 +895,9 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp
890895
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
891896
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
892897
google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
893-
google.golang.org/grpc v1.39.0 h1:Klz8I9kdtkIN6EpHHUOMLCYhTn/2WAe5a0s1hcBkdTI=
894898
google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
899+
google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM=
900+
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
895901
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
896902
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
897903
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -903,8 +909,9 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
903909
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
904910
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
905911
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
906-
google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
907912
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
913+
google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
914+
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
908915
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
909916
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
910917
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ go 1.16
66
replace (
77
// Pin gPRC-related dependencies as like containerd v1.5.2
88
github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
9-
github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
9+
github.com/golang/protobuf => github.com/golang/protobuf v1.5.3
1010
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
11-
google.golang.org/grpc => google.golang.org/grpc v1.27.1
11+
google.golang.org/grpc => google.golang.org/grpc v1.43.0
1212
)
1313

1414
replace (
@@ -47,27 +47,27 @@ replace (
4747

4848
require (
4949
github.com/blend/go-sdk v1.20211025.3 // indirect
50-
github.com/containerd/containerd v1.5.2
50+
github.com/containerd/containerd v1.6.0
5151
github.com/containerd/go-cni v1.1.4
5252
github.com/davecgh/go-spew v1.1.1
5353
github.com/firecracker-microvm/firecracker-containerd v0.0.0-00010101000000-000000000000
5454
github.com/ftrvxmtrx/fd v0.0.0-20150925145434-c6d800382fff
5555
github.com/go-multierror/multierror v1.0.2
56-
github.com/golang/protobuf v1.4.3
56+
github.com/golang/protobuf v1.5.2
5757
github.com/google/nftables v0.0.0-20210916140115-16a134723a96
5858
github.com/montanaflynn/stats v0.6.5
5959
github.com/pkg/errors v0.9.1
6060
github.com/sirupsen/logrus v1.9.0
6161
github.com/stretchr/testify v1.8.0
6262
github.com/vhive-serverless/vhive/examples/protobuf/helloworld v0.0.0-00010101000000-000000000000
63-
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
63+
github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
6464
github.com/wcharczuk/go-chart v2.0.1+incompatible
6565
golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb // indirect
66-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
67-
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
66+
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
67+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
6868
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8
6969
gonum.org/v1/gonum v0.9.0
7070
gonum.org/v1/plot v0.9.0
71-
google.golang.org/grpc v1.34.0
72-
k8s.io/cri-api v0.20.6
71+
google.golang.org/grpc v1.43.0
72+
k8s.io/cri-api v0.23.1
7373
)

0 commit comments

Comments
 (0)