vendor: github.com/containerd/containerd v1.7.19, migrate to github.com/containerd/platforms module by thaJeztah · Pull Request #47142 · moby/moby

thaJeztah · 2024-01-20T21:56:54Z

Migrate to github.com/containerd/platforms module

Containerd's "platforms" package is being moved to a separate module. This
allows updating the platforms parsing independent of the containerd module
itself.

For existing containerd versions (1.6, 1.7), the package in containerd will
be an alias for the new module.

- Description for the changelog

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

thaJeztah · 2024-01-20T22:05:48Z

Ah, looks like some updates are needed;

# github.com/docker/docker/libcontainerd/local
libcontainerd/local/local_windows.go:944:34: cannot use p[i].CreateTimestamp (variable of type time.Time) as *timestamppb.Timestamp value in struct literal

thaJeztah · 2024-01-20T22:40:07Z

opened downgrade minimum required version of hcsshim to v0.10.0 containerd/platforms#5 to prevent having to upgrade hcsshim

thaJeztah · 2024-01-20T23:59:17Z

Two tests failing that look related, looks like there's some change in behavior in the package;

=== FAIL: github.com/docker/docker/integration/build TestBuildPlatformInvalid (0.06s)
    build_test.go:685: assertion failed: expression is false: errdefs.IsInvalidParameter(err)

moby/integration/build/build_test.go

Lines 680 to 685 in 27e85c7

    
           		Platform:    "foobar", 
        
           	}) 
        
           assert.Assert(t, err != nil) 
        
           assert.ErrorContains(t, err, "unknown operating system or architecture") 
        
           assert.Assert(t, errdefs.IsInvalidParameter(err))

=== FAIL: amd64.integration.image TestImagePullPlatformInvalid (0.01s)
    pull_test.go:37: assertion failed: expression is false: errdefs.IsInvalidParameter(err)

moby/integration/image/pull_test.go

Lines 34 to 37 in 27e85c7

    
           _, err := client.ImagePull(ctx, "docker.io/library/hello-world:latest", types.ImagePullOptions{Platform: "foobar"}) 
        
           assert.Assert(t, err != nil) 
        
           assert.ErrorContains(t, err, "unknown operating system or architecture") 
        
           assert.Assert(t, errdefs.IsInvalidParameter(err))

thaJeztah · 2024-01-21T00:17:34Z

Improved the test-assert a bit, and it looks like it's returning a 500 / internal server error;

=== RUN   TestImagePullPlatformInvalid
    pull_test.go:37: assertion failed: invalid type for expected: func(error) error: errdefs.errSystem: Error response from daemon: "foobar": unknown operating system or architecture: invalid argument
--- FAIL: TestImagePullPlatformInvalid (0.01s)

thaJeztah · 2024-01-21T00:20:19Z

Daemon logs show that it returns an untyped error, hence using the default (500 / Internal Server error);

time="2024-01-21T00:18:31.260074294Z" level=debug msg="Calling POST /v1.45/images/create?fromImage=hello-world&platform=foobar&tag=latest"
time="2024-01-21T00:18:31.260220544Z" level=debug msg="FIXME: Got an API for which error does not match any expected type!!!" error="\"foobar\": unknown operating system or architecture: invalid argument" error_type="*fmt.wrapError" module=api
time="2024-01-21T00:18:31.260320336Z" level=error msg="Handler for POST /v1.45/images/create returned error: \"foobar\": unknown operating system or architecture: invalid argument"
time="2024-01-21T00:18:31.260407169Z" level=debug msg="FIXME: Got an API for which error does not match any expected type!!!" error="\"foobar\": unknown operating system or architecture: invalid argument" error_type="*fmt.wrapError" module=api

thaJeztah · 2024-01-21T00:27:35Z

Found the likely cause; the new module doesn't use containerd errdefs;

thaJeztah · 2024-05-26T15:06:01Z

Some error messages need to be updated in tests;

=== Failed
=== FAIL: amd64.integration.image TestImportWithCustomPlatformReject/_______ (0.00s)
    import_test.go:182: assertion failed: expected error to contain "is an invalid component", got "Error response from daemon: \"       \" is an invalid OS component of \"       \": OSAndVersion specifier component must match \"^([A-Za-z0-9_-]+)(?:\\\\(([A-Za-z0-9_.-]*)\\\\))?$\": invalid argument"
        Error response from daemon: "       " is an invalid OS component of "       ": OSAndVersion specifier component must match "^([A-Za-z0-9_-]+)(?:\\(([A-Za-z0-9_.-]*)\\))?$": invalid argument
    --- FAIL: TestImportWithCustomPlatformReject/_______ (0.00s)

=== FAIL: amd64.integration.image TestImportWithCustomPlatformReject// (0.00s)
    import_test.go:182: assertion failed: expected error to contain "is an invalid component", got "Error response from daemon: \"\" is an invalid OS component of \"/\": OSAndVersion specifier component must match \"^([A-Za-z0-9_-]+)(?:\\\\(([A-Za-z0-9_.-]*)\\\\))?$\": invalid argument"
        Error response from daemon: "" is an invalid OS component of "/": OSAndVersion specifier component must match "^([A-Za-z0-9_-]+)(?:\\(([A-Za-z0-9_.-]*)\\))?$": invalid argument
    --- FAIL: TestImportWithCustomPlatformReject// (0.00s)

=== FAIL: amd64.integration.image TestImportWithCustomPlatformReject (0.01s)

thaJeztah · 2024-06-13T10:41:17Z

Yay! CodeCov action is having a bad day on Windows;

Highlights - Fix support for OTLP config - Add API go module - Remove overlayfs volatile option on temp mounts - Update runc binary to v1.1.13 - Migrate platforms package to github.com/containerd/platforms - Migrate reference/docker package to github.com/distribution/reference Container Runtime Interface (CRI) - Fix panic in NRI from nil CRI reference - Fix Windows HPC working directory full diff: containerd/containerd@v1.7.18...v1.7.19 Signed-off-by: Sebastiaan van Stijn <[email protected]>

Switch to use github.com/containerd/platforms module, because containerd's platforms package has moved to a separate module. This allows updating the platforms parsing independent of the containerd module itself. The package in containerd is deprecated, but kept as an alias to provide compatibility between codebases. Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah · 2024-07-03T11:43:19Z

@vvoland @dmcgowan PTAL

thaJeztah added status/2-code-review kind/refactor PR's that refactor, or clean-up code labels Jan 20, 2024

thaJeztah added this to the 26.0.0 milestone Jan 20, 2024

thaJeztah self-assigned this Jan 20, 2024

thaJeztah mentioned this pull request Jan 20, 2024

vendor: assorted golang.org/x/... updates #47143

Merged

thaJeztah mentioned this pull request Jan 20, 2024

downgrade minimum required version of hcsshim to v0.10.0 containerd/platforms#5

Merged

thaJeztah force-pushed the migrate_to_platforms_module branch 2 times, most recently from 4b10e64 to f79462a Compare January 20, 2024 23:08

thaJeztah mentioned this pull request Jan 20, 2024

Use github.com/containerd/platforms package containerd/containerd#9662

Merged

thaJeztah mentioned this pull request Jan 21, 2024

integration: improve some asserts, and add asserts for unhandled errs #47147

Merged

thaJeztah force-pushed the migrate_to_platforms_module branch 3 times, most recently from 0273a3c to 448d592 Compare January 23, 2024 09:29

vvoland modified the milestones: 26.0.0, v-future Feb 26, 2024

thaJeztah mentioned this pull request May 26, 2024

migrate to new github.com/containerd/platforms package docker/cli#5092

Merged

thaJeztah force-pushed the migrate_to_platforms_module branch from 448d592 to 4da9067 Compare May 26, 2024 11:46

thaJeztah modified the milestones: v-future, 28.0.0 May 26, 2024

thaJeztah force-pushed the migrate_to_platforms_module branch from 4da9067 to 42a1bd3 Compare May 26, 2024 14:39

thaJeztah force-pushed the migrate_to_platforms_module branch from 42a1bd3 to 89a2e16 Compare May 27, 2024 08:18

This was referenced May 27, 2024

don't depend on containerd platform.Parse to return a typed error #47863

Merged

vendor: github.com/containerd/containerd v1.7.18 moby/buildkit#4956

Merged

thaJeztah force-pushed the migrate_to_platforms_module branch 2 times, most recently from 4ad5d69 to 649c049 Compare June 13, 2024 07:35

thaJeztah mentioned this pull request Jun 13, 2024

vendor: github.com/containerd/containerd v1.7.19 and switch to github.com/containerd/platforms module moby/buildkit#5034

Merged

thaJeztah force-pushed the migrate_to_platforms_module branch 4 times, most recently from dcdea36 to 886611a Compare June 26, 2024 00:38

thaJeztah mentioned this pull request Jun 29, 2024

vendor: github.com/microsoft/hcsshim v0.11.7 #48091

Merged

thaJeztah force-pushed the migrate_to_platforms_module branch 2 times, most recently from a47a10a to 6f9f5b9 Compare July 1, 2024 10:27

thaJeztah added 2 commits July 2, 2024 21:19

thaJeztah force-pushed the migrate_to_platforms_module branch from 6f9f5b9 to d0aa3ea Compare July 2, 2024 19:20

thaJeztah changed the title ~~[WIP] Migrate to github.com/containerd/platforms module~~ vendor: github.com/containerd/containerd v1.7.19 ,migrate to github.com/containerd/platforms module Jul 2, 2024

thaJeztah changed the title ~~vendor: github.com/containerd/containerd v1.7.19 ,migrate to github.com/containerd/platforms module~~ vendor: github.com/containerd/containerd v1.7.19, migrate to github.com/containerd/platforms module Jul 2, 2024

thaJeztah added area/runtime Runtime area/dependencies labels Jul 2, 2024

thaJeztah marked this pull request as ready for review July 2, 2024 19:21

thaJeztah requested review from cpuguy83 and tonistiigi as code owners July 2, 2024 19:21

thaJeztah requested a review from dmcgowan July 2, 2024 19:21

thaJeztah mentioned this pull request Jul 3, 2024

update containerd binary to v1.7.19 #48117

Merged

tonistiigi mentioned this pull request Jul 3, 2024

vendor: update buildkit to v0.15.0-rc1 #48126

Merged

AkihiroSuda approved these changes Jul 4, 2024

View reviewed changes

AkihiroSuda merged commit 1205a90 into moby:master Jul 4, 2024

thaJeztah deleted the migrate_to_platforms_module branch July 4, 2024 06:21

thaJeztah mentioned this pull request Jul 17, 2024

[27.1 backport] vendor: update buildkit to v0.15.0 #48175

Merged

thaJeztah added the process/cherry-picked label Jul 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

vendor: github.com/containerd/containerd v1.7.19, migrate to github.com/containerd/platforms module#47142

vendor: github.com/containerd/containerd v1.7.19, migrate to github.com/containerd/platforms module#47142
AkihiroSuda merged 2 commits intomoby:masterfrom
thaJeztah:migrate_to_platforms_module

thaJeztah commented Jan 20, 2024 •

edited

Loading

Uh oh!

thaJeztah commented Jan 20, 2024

Uh oh!

thaJeztah commented Jan 20, 2024

Uh oh!

thaJeztah commented Jan 20, 2024

Uh oh!

thaJeztah commented Jan 21, 2024

Uh oh!

thaJeztah commented Jan 21, 2024

Uh oh!

thaJeztah commented Jan 21, 2024

Uh oh!

thaJeztah commented May 26, 2024

Uh oh!

thaJeztah commented Jun 13, 2024

Uh oh!

thaJeztah commented Jul 3, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

Conversation

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

Uh oh!

Migrate to github.com/containerd/platforms module

Uh oh!

thaJeztah commented Jan 20, 2024

Uh oh!

thaJeztah commented Jan 20, 2024

Uh oh!

thaJeztah commented Jan 20, 2024

Uh oh!

thaJeztah commented Jan 21, 2024

Uh oh!

thaJeztah commented Jan 21, 2024

Uh oh!

thaJeztah commented Jan 21, 2024

Uh oh!

thaJeztah commented May 26, 2024

Uh oh!

thaJeztah commented Jun 13, 2024

Uh oh!

thaJeztah commented Jul 3, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

thaJeztah commented Jan 20, 2024 •

edited

Loading