Skip to content

Commit 7121dcd

Browse files
authored
Update containerd and buildkit deps for gen 106 (#18999)
1 parent 7f0275a commit 7121dcd

File tree

17 files changed

+434
-313
lines changed

17 files changed

+434
-313
lines changed

components/blobserve/go.mod

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/gitpod-io/gitpod/blobserve
33
go 1.21
44

55
require (
6-
github.com/containerd/containerd v1.7.6
6+
github.com/containerd/containerd v1.7.8
77
github.com/docker/cli v24.0.5+incompatible
88
github.com/docker/distribution v2.8.2+incompatible
99
github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
@@ -20,10 +20,11 @@ require (
2020

2121
require (
2222
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
23-
github.com/Microsoft/hcsshim v0.11.0 // indirect
23+
github.com/Microsoft/hcsshim v0.11.1 // indirect
2424
github.com/beorn7/perks v1.0.1 // indirect
2525
github.com/blang/semver/v4 v4.0.0 // indirect
2626
github.com/cespare/xxhash/v2 v2.2.0 // indirect
27+
github.com/containerd/log v0.1.0 // indirect
2728
github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect
2829
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
2930
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -112,14 +113,14 @@ require (
112113
go.uber.org/multierr v1.11.0 // indirect
113114
go.uber.org/zap v1.25.0 // indirect
114115
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
115-
golang.org/x/crypto v0.12.0 // indirect
116+
golang.org/x/crypto v0.14.0 // indirect
116117
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
117-
golang.org/x/net v0.14.0 // indirect
118-
golang.org/x/sys v0.11.0 // indirect
119-
golang.org/x/text v0.12.0 // indirect
118+
golang.org/x/net v0.17.0 // indirect
119+
golang.org/x/sys v0.13.0 // indirect
120+
golang.org/x/text v0.13.0 // indirect
120121
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
121-
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
122-
google.golang.org/grpc v1.55.0 // indirect
122+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
123+
google.golang.org/grpc v1.58.3 // indirect
123124
google.golang.org/protobuf v1.31.0 // indirect
124125
gopkg.in/inf.v0 v0.9.1 // indirect
125126
gopkg.in/yaml.v2 v2.4.0 // indirect

components/blobserve/go.sum

Lines changed: 24 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/common-go/go-update-wc-deps.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ COMPONENTS_TO_TEST=( )
1313

1414
# an associative array to describe dependencies we'd like to search for and update to
1515
declare -A WORKSPACE_CLUSTER_DEPENDENCIES
16-
WORKSPACE_CLUSTER_DEPENDENCIES["github.com/containerd/containerd"]="1.7.6"
17-
WORKSPACE_CLUSTER_DEPENDENCIES["github.com/moby/buildkit"]="0.12.2"
16+
WORKSPACE_CLUSTER_DEPENDENCIES["github.com/containerd/containerd"]="1.7.8"
17+
WORKSPACE_CLUSTER_DEPENDENCIES["github.com/moby/buildkit"]="0.12.3"
1818

1919
# loop through keys of each associative array
2020
for key in "${!WORKSPACE_CLUSTER_DEPENDENCIES[@]}"

components/ide-service/go.mod

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/gitpod-io/gitpod/ide-service
33
go 1.21
44

55
require (
6-
github.com/containerd/containerd v1.7.6
6+
github.com/containerd/containerd v1.7.8
77
github.com/docker/cli v24.0.2+incompatible
88
github.com/docker/distribution v2.8.1+incompatible
99
github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
@@ -16,17 +16,18 @@ require (
1616
github.com/spf13/cobra v1.4.0
1717
github.com/xeipuuv/gojsonschema v1.2.0
1818
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f
19-
google.golang.org/grpc v1.53.0
19+
google.golang.org/grpc v1.58.3
2020
)
2121

2222
require (
2323
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
24-
github.com/Microsoft/hcsshim v0.11.0 // indirect
24+
github.com/Microsoft/hcsshim v0.11.1 // indirect
2525
github.com/beorn7/perks v1.0.1 // indirect
2626
github.com/blang/semver v3.5.1+incompatible // indirect
2727
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
2828
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2929
github.com/configcat/go-sdk/v7 v7.6.0 // indirect
30+
github.com/containerd/log v0.1.0 // indirect
3031
github.com/davecgh/go-spew v1.1.1 // indirect
3132
github.com/docker/docker-credential-helpers v0.7.0 // indirect
3233
github.com/frankban/quicktest v1.11.3 // indirect
@@ -57,21 +58,21 @@ require (
5758
github.com/slok/go-http-metrics v0.10.0 // indirect
5859
github.com/sourcegraph/jsonrpc2 v0.0.0-20200429184054-15c2290dcb37 // indirect
5960
github.com/spf13/pflag v1.0.5 // indirect
60-
github.com/stretchr/testify v1.8.2 // indirect
61+
github.com/stretchr/testify v1.8.4 // indirect
6162
github.com/uber/jaeger-client-go v2.29.1+incompatible // indirect
6263
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
6364
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
6465
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
6566
go.opentelemetry.io/otel v1.14.0 // indirect
6667
go.opentelemetry.io/otel/trace v1.14.0 // indirect
6768
go.uber.org/atomic v1.4.0 // indirect
68-
golang.org/x/net v0.8.0 // indirect
69-
golang.org/x/sync v0.2.0 // indirect
70-
golang.org/x/sys v0.11.0 // indirect
71-
golang.org/x/text v0.8.0 // indirect
69+
golang.org/x/net v0.17.0 // indirect
70+
golang.org/x/sync v0.3.0 // indirect
71+
golang.org/x/sys v0.13.0 // indirect
72+
golang.org/x/text v0.13.0 // indirect
7273
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
73-
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
74-
google.golang.org/protobuf v1.30.0 // indirect
74+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
75+
google.golang.org/protobuf v1.31.0 // indirect
7576
gopkg.in/yaml.v3 v3.0.1 // indirect
7677
gotest.tools/v3 v3.4.0 // indirect
7778
)

0 commit comments

Comments
 (0)