Skip to content

Commit 76781bf

Browse files
geroplgeropl
authored
[dev] Update workspace libraries to match kubernetes (containerd, runc, buildkit) (#20526)
* [workspace] Set lib versions: containerd to 1.6.36, runc 1.1.14 and buildkit to 0.12.5 Reasoning: https://linear.app/gitpod/issue/CLC-982/update-containerd-to-latest-patch-16x-k8s-and-runc-libs-in-gitpod-mono#comment-d5450e2c * [golangci] Remove superfluous notlint and checks * [image-builder-mk3] Fix incomplete tests where a library made the field "mediaType" non-optimal Original change: opencontainers/image-spec#1091 * [docker] Switch from github.com/docker/distribution/reference to github.com/distribution/reference * [ws-daemon] Internalize libcontainer/specconv because it got dropped between runc 1.1.10 and 1.1.14
1 parent e4b0fa7 commit 76781bf

File tree

52 files changed

+831
-551
lines changed

Some content is hidden

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

52 files changed

+831
-551
lines changed

‎WORKSPACE.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ defaultVariant:
4444
- "**/node_modules/**"
4545
config:
4646
go:
47-
lintCommand: ["sh", "-c", "golangci-lint run --disable govet,errcheck,typecheck,staticcheck,structcheck -e '.*declared but not used.*' --allow-parallel-runners --timeout 15m"]
47+
lintCommand: ["sh", "-c", "golangci-lint run --disable govet,errcheck,staticcheck --allow-parallel-runners --timeout 15m"]

‎components/blobserve/cmd/run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717

1818
"github.com/containerd/containerd/remotes"
1919
"github.com/containerd/containerd/remotes/docker"
20+
"github.com/distribution/reference"
2021
"github.com/docker/cli/cli/config/configfile"
21-
"github.com/docker/distribution/reference"
2222
blobserve_config "github.com/gitpod-io/gitpod/blobserve/pkg/config"
2323
"github.com/heptiolabs/healthcheck"
2424
"github.com/prometheus/client_golang/prometheus"

‎components/blobserve/go.mod

+8-9
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@ module github.com/gitpod-io/gitpod/blobserve
33
go 1.22
44

55
require (
6-
github.com/containerd/containerd v1.7.13
6+
github.com/containerd/containerd v1.6.36
7+
github.com/distribution/reference v0.5.0
78
github.com/docker/cli v25.0.1+incompatible
8-
github.com/docker/distribution v2.8.3+incompatible
99
github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
1010
github.com/gitpod-io/gitpod/registry-facade v0.0.0-00010101000000-000000000000
1111
github.com/google/go-cmp v0.6.0
1212
github.com/gorilla/mux v1.8.1
1313
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
14-
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
14+
github.com/opencontainers/image-spec v1.1.0
1515
github.com/prometheus/client_golang v1.18.0
1616
github.com/spf13/cobra v1.6.0
1717
golang.org/x/sync v0.6.0
1818
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028
1919
)
2020

2121
require (
22-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
2322
github.com/Microsoft/hcsshim v0.11.4 // indirect
2423
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
2524
github.com/beorn7/perks v1.0.1 // indirect
2625
github.com/blang/semver/v4 v4.0.0 // indirect
2726
github.com/cespare/xxhash/v2 v2.2.0 // indirect
27+
github.com/containerd/errdefs v0.1.0 // indirect
2828
github.com/containerd/log v0.1.0 // indirect
2929
github.com/crackcomm/go-gitignore v0.0.0-20231225121904-e25f5bc08668 // indirect
3030
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
3131
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
32-
github.com/distribution/reference v0.5.0 // indirect
32+
github.com/docker/distribution v2.8.3+incompatible // indirect
3333
github.com/docker/docker-credential-helpers v0.8.0 // indirect
3434
github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5 // indirect
3535
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -128,19 +128,18 @@ require (
128128
github.com/whyrusleeping/cbor-gen v0.0.0-20240109153615-66e95c3e8a87 // indirect
129129
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
130130
go.opencensus.io v0.24.0 // indirect
131-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
132131
go.opentelemetry.io/otel v1.22.0 // indirect
133132
go.opentelemetry.io/otel/metric v1.22.0 // indirect
134133
go.opentelemetry.io/otel/trace v1.22.0 // indirect
135134
go.uber.org/atomic v1.11.0 // indirect
136135
go.uber.org/multierr v1.11.0 // indirect
137136
go.uber.org/zap v1.27.0 // indirect
138137
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
139-
golang.org/x/crypto v0.19.0 // indirect
138+
golang.org/x/crypto v0.21.0 // indirect
140139
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
141140
golang.org/x/mod v0.15.0 // indirect
142-
golang.org/x/net v0.21.0 // indirect
143-
golang.org/x/sys v0.17.0 // indirect
141+
golang.org/x/net v0.23.0 // indirect
142+
golang.org/x/sys v0.18.0 // indirect
144143
golang.org/x/text v0.14.0 // indirect
145144
golang.org/x/time v0.3.0 // indirect
146145
golang.org/x/tools v0.18.0 // indirect

‎components/blobserve/go.sum

+13-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/blobserve/pkg/blobserve/blobserve.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"github.com/containerd/containerd/errdefs"
2222
"github.com/containerd/containerd/remotes"
23-
"github.com/docker/distribution/reference"
23+
"github.com/distribution/reference"
2424
"github.com/gorilla/mux"
2525
"golang.org/x/xerrors"
2626

‎components/blobserve/pkg/blobserve/refstore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/containerd/containerd/errdefs"
1414
"github.com/containerd/containerd/remotes"
15-
"github.com/docker/distribution/reference"
15+
"github.com/distribution/reference"
1616
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
1717
"golang.org/x/xerrors"
1818

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ 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.11"
17-
WORKSPACE_CLUSTER_DEPENDENCIES["github.com/moby/buildkit"]="0.12.4"
16+
# Reasoning on the specific versions: https://linear.app/gitpod/issue/CLC-982/update-containerd-to-latest-patch-16x-k8s-and-runc-libs-in-gitpod-mono#comment-d5450e2c
17+
WORKSPACE_CLUSTER_DEPENDENCIES["github.com/containerd/containerd"]="1.6.36"
18+
WORKSPACE_CLUSTER_DEPENDENCIES["github.com/moby/buildkit"]="0.12.5"
19+
WORKSPACE_CLUSTER_DEPENDENCIES["github.com/opencontainers/runc"]="1.1.14"
1820

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

‎components/ide-service/go.mod

+8-16
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,36 @@ module github.com/gitpod-io/gitpod/ide-service
33
go 1.22
44

55
require (
6-
github.com/containerd/containerd v1.7.13
6+
github.com/containerd/containerd v1.6.36
7+
github.com/distribution/reference v0.5.0
78
github.com/docker/cli v25.0.1+incompatible
8-
github.com/docker/distribution v2.8.3+incompatible
99
github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
1010
github.com/gitpod-io/gitpod/gitpod-protocol v0.0.0-00010101000000-000000000000
1111
github.com/gitpod-io/gitpod/ide-service-api v0.0.0-00010101000000-000000000000
1212
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
13-
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
13+
github.com/opencontainers/image-spec v1.1.0
1414
github.com/prometheus/client_golang v1.16.0
1515
github.com/sirupsen/logrus v1.9.3
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.58.3
19+
google.golang.org/grpc v1.59.0
2020
)
2121

2222
require (
23-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
2423
github.com/Microsoft/hcsshim v0.11.4 // indirect
2524
github.com/beorn7/perks v1.0.1 // indirect
2625
github.com/blang/semver v3.5.1+incompatible // indirect
2726
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
2827
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2928
github.com/configcat/go-sdk/v7 v7.6.0 // indirect
29+
github.com/containerd/errdefs v0.1.0 // indirect
3030
github.com/containerd/log v0.1.0 // indirect
3131
github.com/davecgh/go-spew v1.1.1 // indirect
32-
github.com/distribution/reference v0.5.0 // indirect
3332
github.com/docker/docker-credential-helpers v0.7.0 // indirect
34-
github.com/felixge/httpsnoop v1.0.3 // indirect
3533
github.com/frankban/quicktest v1.11.3 // indirect
3634
github.com/fsnotify/fsnotify v1.6.0 // indirect
3735
github.com/gitpod-io/gitpod/components/scrubber v0.0.0-00010101000000-000000000000 // indirect
38-
github.com/go-logr/logr v1.3.0 // indirect
39-
github.com/go-logr/stdr v1.2.2 // indirect
4036
github.com/go-test/deep v1.0.5 // indirect
4137
github.com/golang/mock v1.6.0 // indirect
4238
github.com/golang/protobuf v1.5.4 // indirect
@@ -65,17 +61,13 @@ require (
6561
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
6662
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
6763
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
68-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
69-
go.opentelemetry.io/otel v1.19.0 // indirect
70-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
71-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
7264
go.uber.org/atomic v1.4.0 // indirect
73-
golang.org/x/net v0.19.0 // indirect
65+
golang.org/x/net v0.23.0 // indirect
7466
golang.org/x/sync v0.3.0 // indirect
75-
golang.org/x/sys v0.15.0 // indirect
67+
golang.org/x/sys v0.18.0 // indirect
7668
golang.org/x/text v0.14.0 // indirect
7769
golang.org/x/time v0.3.0 // indirect
78-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
70+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
7971
google.golang.org/protobuf v1.33.0 // indirect
8072
gopkg.in/yaml.v3 v3.0.1 // indirect
8173
gotest.tools/v3 v3.4.0 // indirect

0 commit comments

Comments
 (0)