vendor: containerd 2.0 / buildkit v0.19.0 dependencies by thaJeztah · Pull Request #49274 · moby/moby

thaJeztah · 2025-01-14T10:36:45Z

relates to Update to containerd 2.0, buildkit v0.19 #48872

vendor: github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6

full diff: AdaLogics/go-fuzz-headers@e8a1dd7...e8a1dd7

vendor: github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2

full diff: AdamKorcz/go-118-fuzz-build@8075edf...2b5cbb2

vendor: github.com/containerd/errdefs v1.0.0

no changes in vendored code

full diff: containerd/errdefs@v0.3.0...v1.0.0

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

thaJeztah · 2025-01-14T10:52:44Z

Ah! Looks like I need that Remove otel workaround test commit as well; 8875d6a

=== Failed
=== FAIL: cmd/dockerd TestOtelMeterLeak (0.64s)
    daemon_test.go:303: Allocations: 3
    daemon_test.go:307: Allocations count decreased. OTEL leak workaround is no longer needed!

…a1dd7889d6 full diff: AdaLogics/go-fuzz-headers@e8a1dd7...e8a1dd7 Signed-off-by: Sebastiaan van Stijn <[email protected]>

…2b5cbb29f3e2 full diff: AdamKorcz/go-118-fuzz-build@8075edf...2b5cbb2 Signed-off-by: Sebastiaan van Stijn <[email protected]>

no changes in vendored code full diff: containerd/errdefs@v0.3.0...v1.0.0 Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah · 2025-01-14T19:20:14Z

Hm.. looks like containerd/platforms changed a regex, and that's included in the error-message, which makes buildkit tests fail;

=== FAIL: frontend/dockerfile TestIntegration/TestUndeclaredArg/worker=dockerd/frontend=builtin/warntype=progress#07 (0.02s)
    dockerfile_lint_test.go:1645: 
        	Error Trace:	/src/frontend/dockerfile/dockerfile_lint_test.go:1572
        	            				/src/frontend/dockerfile/dockerfile_lint_test.go:1645
        	Error:      	Error message not equal:
        	            	expected: "failed to solve: failed to parse platform linux/${MYARCH}: \"\" is an invalid component of \"linux/\": platform specifier component must match \"^[A-Za-z0-9_-]+$\": invalid argument (did you mean MY_ARCH?)"
        	            	actual  : "failed to solve: failed to parse platform linux/${MYARCH}: \"\" is an invalid component of \"linux/\": platform specifier component must match \"^[A-Za-z0-9_.-]+$\": invalid argument (did you mean MY_ARCH?)"
        	Test:       	TestIntegration/TestUndeclaredArg/worker=dockerd/frontend=builtin/warntype=progress#07
        --- FAIL: TestIntegration/TestUndeclaredArg/worker=dockerd/frontend=builtin/warntype=progress#07 (0.02s)

=== FAIL: frontend/dockerfile TestIntegration/TestUndeclaredArg/worker=dockerd/frontend=builtin/warntype=unmarshal#07 (0.02s)
    dockerfile_lint_test.go:1478: 
        	Error Trace:	/src/frontend/dockerfile/dockerfile_lint_test.go:1478
        	            				/src/frontend/gateway/grpcclient/client.go:215
        	            				/src/client/build.go:58
        	            				/src/client/solve.go:295
        	            				/src/vendor/golang.org/x/sync/errgroup/errgroup.go:78
        	            				/usr/local/go/src/runtime/asm_amd64.s:1700
        	Error:      	Not equal: 
        	            	expected: "failed to parse platform linux/${MYARCH}: \"\" is an invalid component of \"linux/\": platform specifier component must match \"^[A-Za-z0-9_-]+$\": invalid argument (did you mean MY_ARCH?)"

full diff: containerd/ttrpc@v1.2.5...v1.2.7 Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: containerd/go-cni@v1.1.10...v1.1.11 Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: containernetworking/cni@v1.2.2...v1.2.3 Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: vbatts/tar-split@v0.11.5...v0.11.6 Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: fsnotify/fsnotify@v1.6.0...v1.7.0 Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: kubernetes/klog@v2.90.1...v2.130.1 Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: stretchr/testify@v1.9.0...v1.10.0 Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: microsoft/hcsshim@v0.12.8...v0.12.9 Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah added area/runtime Runtime status/2-code-review area/metrics/otel area/dependencies labels Jan 14, 2025

thaJeztah added this to the 28.0.0 milestone Jan 14, 2025

thaJeztah self-assigned this Jan 14, 2025

thaJeztah mentioned this pull request Jan 14, 2025

Update to containerd 2.0, buildkit v0.19 #48872

Merged

8 tasks

thaJeztah marked this pull request as draft January 14, 2025 11:00

thaJeztah force-pushed the containerd_2_deps branch from b42ea8c to 9414ed1 Compare January 14, 2025 11:34

thaJeztah added 3 commits January 14, 2025 17:31

vendor: github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8…

eb592fe

…a1dd7889d6 full diff: AdaLogics/go-fuzz-headers@e8a1dd7...e8a1dd7 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-…

f40b922

…2b5cbb29f3e2 full diff: AdamKorcz/go-118-fuzz-build@8075edf...2b5cbb2 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/containerd/errdefs v1.0.0

6439c46

no changes in vendored code full diff: containerd/errdefs@v0.3.0...v1.0.0 Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah force-pushed the containerd_2_deps branch from 9414ed1 to ca7b79a Compare January 14, 2025 16:32

thaJeztah marked this pull request as ready for review January 14, 2025 16:32

thaJeztah added 8 commits January 14, 2025 20:21

vendor: github.com/containerd/ttrpc v1.2.7

2ea97ae

full diff: containerd/ttrpc@v1.2.5...v1.2.7 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/containerd/go-cni v1.1.11

6dd592b

full diff: containerd/go-cni@v1.1.10...v1.1.11 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/containernetworking/cni v1.2.3

de86c46

full diff: containernetworking/cni@v1.2.2...v1.2.3 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/vbatts/tar-split v0.11.6

1ef5957

full diff: vbatts/tar-split@v0.11.5...v0.11.6 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/fsnotify/fsnotify v1.7.0

adec695

full diff: fsnotify/fsnotify@v1.6.0...v1.7.0 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: k8s.io/klog/v2 v2.130.1

2008799

full diff: kubernetes/klog@v2.90.1...v2.130.1 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/stretchr/testify v1.10.0

488d697

full diff: stretchr/testify@v1.9.0...v1.10.0 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/Microsoft/hcsshim v0.12.9

f68eb9c

full diff: microsoft/hcsshim@v0.12.8...v0.12.9 Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah force-pushed the containerd_2_deps branch from ca7b79a to f68eb9c Compare January 14, 2025 19:25

thompson-shaun requested review from tonistiigi and vvoland January 14, 2025 22:29

AkihiroSuda approved these changes Jan 15, 2025

View reviewed changes

AkihiroSuda merged commit 1cf2cb5 into moby:master Jan 15, 2025

thaJeztah deleted the containerd_2_deps branch January 15, 2025 07:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

vendor: containerd 2.0 / buildkit v0.19.0 dependencies#49274

vendor: containerd 2.0 / buildkit v0.19.0 dependencies#49274
AkihiroSuda merged 11 commits intomoby:masterfrom
thaJeztah:containerd_2_deps

thaJeztah commented Jan 14, 2025 •

edited

Loading

Uh oh!

thaJeztah commented Jan 14, 2025

Uh oh!

thaJeztah commented Jan 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

thaJeztah commented Jan 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

vendor: github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6

vendor: github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2

vendor: github.com/containerd/errdefs v1.0.0

vendor: github.com/containerd/ttrpc v1.2.5

vendor: github.com/containerd/go-cni v1.1.11

vendor: github.com/containernetworking/cni v1.2.3

vendor: github.com/vbatts/tar-split v0.11.6

vendor: github.com/fsnotify/fsnotify v1.7.0

vendor: k8s.io/klog/v2 v2.130.1

vendor: github.com/stretchr/testify v1.10.0

vendor: github.com/Microsoft/hcsshim v0.12.9

Uh oh!

thaJeztah commented Jan 14, 2025

Uh oh!

thaJeztah commented Jan 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

thaJeztah commented Jan 14, 2025 •

edited

Loading