Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to containerd 2.0 #4630

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+54,699 −24,346
Draft

Update to containerd 2.0 #4630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83df069
Update containerd to 2.0.0-beta.2
dmcgowan Feb 7, 2024
eb88ea9
util/multiprovider: Implement Info
vvoland Jan 16, 2024
d3986e5
Updates for containerd 2.0 interface changes
dmcgowan Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions cache/blobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"os"
"strconv"

"github.com/containerd/containerd/diff"
"github.com/containerd/containerd/diff/walking"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/containerd/v2/plugins/diff/walking"
"github.com/moby/buildkit/session"
"github.com/moby/buildkit/util/bklog"
"github.com/moby/buildkit/util/compression"
Expand Down
8 changes: 4 additions & 4 deletions cache/blobs_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"context"
"io"

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
labelspkg "github.com/containerd/containerd/labels"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/mount"
labelspkg "github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/errdefs"
"github.com/moby/buildkit/util/bklog"
"github.com/moby/buildkit/util/compression"
"github.com/moby/buildkit/util/overlay"
Expand Down
2 changes: 1 addition & 1 deletion cache/blobs_nolinux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package cache
import (
"context"

"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/v2/core/mount"
"github.com/moby/buildkit/util/compression"
ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
Expand Down
6 changes: 3 additions & 3 deletions cache/compression_nydus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"context"
"io"

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/errdefs"
"github.com/moby/buildkit/session"
"github.com/moby/buildkit/util/compression"
digest "github.com/opencontainers/go-digest"
Expand Down
12 changes: 6 additions & 6 deletions cache/contenthash/checksum_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"testing"
"time"

"github.com/containerd/containerd/content/local"
"github.com/containerd/containerd/diff/apply"
"github.com/containerd/containerd/diff/walking"
ctdmetadata "github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/containerd/snapshots/native"
"github.com/containerd/containerd/v2/core/diff/apply"
ctdmetadata "github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/plugins/content/local"
"github.com/containerd/containerd/v2/plugins/diff/walking"
"github.com/containerd/containerd/v2/plugins/snapshots/native"
"github.com/moby/buildkit/cache"
"github.com/moby/buildkit/cache/metadata"
"github.com/moby/buildkit/session"
Expand Down
2 changes: 1 addition & 1 deletion cache/filelist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"path"
"sort"

cdcompression "github.com/containerd/containerd/archive/compression"
cdcompression "github.com/containerd/containerd/v2/pkg/archive/compression"
"github.com/moby/buildkit/session"
)

Expand Down
14 changes: 7 additions & 7 deletions cache/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (
"sync"
"time"

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/diff"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/filters"
"github.com/containerd/containerd/gc"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/pkg/filters"
"github.com/containerd/containerd/v2/pkg/gc"
"github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/errdefs"
"github.com/docker/docker/pkg/idtools"
"github.com/moby/buildkit/cache/metadata"
"github.com/moby/buildkit/client"
Expand Down
28 changes: 14 additions & 14 deletions cache/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ import (
"testing"
"time"

ctdcompression "github.com/containerd/containerd/archive/compression"
"github.com/containerd/containerd/archive/tarheader"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/content/local"
"github.com/containerd/containerd/diff/apply"
"github.com/containerd/containerd/diff/walking"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/leases"
ctdmetadata "github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/containerd/snapshots/native"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/diff/apply"
"github.com/containerd/containerd/v2/core/leases"
ctdmetadata "github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots"
ctdcompression "github.com/containerd/containerd/v2/pkg/archive/compression"
"github.com/containerd/containerd/v2/pkg/archive/tarheader"
"github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/plugins/content/local"
"github.com/containerd/containerd/v2/plugins/diff/walking"
"github.com/containerd/containerd/v2/plugins/snapshots/native"
"github.com/containerd/continuity/fs/fstest"
"github.com/containerd/errdefs"
"github.com/containerd/stargz-snapshotter/estargz"
"github.com/klauspost/compress/zstd"
"github.com/moby/buildkit/cache/config"
Expand Down
10 changes: 5 additions & 5 deletions cache/migrate_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"os"
"time"

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/errdefs"
"github.com/moby/buildkit/cache/metadata"
"github.com/moby/buildkit/snapshot"
"github.com/moby/buildkit/util/bklog"
Expand Down
2 changes: 1 addition & 1 deletion cache/opts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cache
import (
"fmt"

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/v2/core/content"
"github.com/moby/buildkit/session"
"github.com/moby/buildkit/util/progress"
digest "github.com/opencontainers/go-digest"
Expand Down
16 changes: 8 additions & 8 deletions cache/refs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
"sync"
"time"

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/pkg/userns"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/containerd/v2/pkg/userns"
"github.com/containerd/errdefs"
"github.com/docker/docker/pkg/idtools"
"github.com/hashicorp/go-multierror"
"github.com/moby/buildkit/cache/config"
Expand Down
6 changes: 3 additions & 3 deletions cache/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"net/url"
"strings"

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/reference"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/reference"
"github.com/containerd/errdefs"
"github.com/moby/buildkit/cache/config"
"github.com/moby/buildkit/session"
"github.com/moby/buildkit/solver"
Expand Down
4 changes: 2 additions & 2 deletions cache/remotecache/azblob/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/labels"
"github.com/moby/buildkit/cache/remotecache"
v1 "github.com/moby/buildkit/cache/remotecache/v1"
"github.com/moby/buildkit/session"
Expand Down
4 changes: 2 additions & 2 deletions cache/remotecache/azblob/importer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sync"

"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/labels"
"github.com/moby/buildkit/cache/remotecache"
v1 "github.com/moby/buildkit/cache/remotecache/v1"
"github.com/moby/buildkit/session"
Expand Down
4 changes: 2 additions & 2 deletions cache/remotecache/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"encoding/json"
"fmt"

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images"
v1 "github.com/moby/buildkit/cache/remotecache/v1"
"github.com/moby/buildkit/session"
"github.com/moby/buildkit/solver"
Expand Down
4 changes: 2 additions & 2 deletions cache/remotecache/gha/gha.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"sync"
"time"

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/labels"
"github.com/moby/buildkit/cache/remotecache"
v1 "github.com/moby/buildkit/cache/remotecache/v1"
"github.com/moby/buildkit/session"
Expand Down
6 changes: 3 additions & 3 deletions cache/remotecache/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"sync"
"time"

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/pkg/labels"
v1 "github.com/moby/buildkit/cache/remotecache/v1"
"github.com/moby/buildkit/session"
"github.com/moby/buildkit/solver"
Expand Down
2 changes: 1 addition & 1 deletion cache/remotecache/inline/inline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"encoding/json"

"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/v2/pkg/labels"
"github.com/moby/buildkit/cache/remotecache"
v1 "github.com/moby/buildkit/cache/remotecache/v1"
"github.com/moby/buildkit/session"
Expand Down
2 changes: 1 addition & 1 deletion cache/remotecache/local/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strconv"
"time"

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/v2/core/content"
"github.com/moby/buildkit/cache/remotecache"
"github.com/moby/buildkit/session"
sessioncontent "github.com/moby/buildkit/session/content"
Expand Down
6 changes: 3 additions & 3 deletions cache/remotecache/registry/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"strconv"

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/remotes/docker"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/distribution/reference"
"github.com/moby/buildkit/cache/remotecache"
"github.com/moby/buildkit/session"
Expand Down
4 changes: 2 additions & 2 deletions cache/remotecache/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
"github.com/aws/aws-sdk-go-v2/service/s3"
s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/labels"
"github.com/moby/buildkit/cache/remotecache"
v1 "github.com/moby/buildkit/cache/remotecache/v1"
"github.com/moby/buildkit/session"
Expand Down
2 changes: 1 addition & 1 deletion cache/remotecache/v1/chains.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sync"
"time"

"github.com/containerd/containerd/content"
"github.com/containerd/containerd/v2/core/content"
"github.com/moby/buildkit/solver"
digest "github.com/opencontainers/go-digest"
ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
Expand Down
4 changes: 2 additions & 2 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"
"time"

contentapi "github.com/containerd/containerd/api/services/content/v1"
"github.com/containerd/containerd/defaults"
contentapi "github.com/containerd/containerd/v2/api/services/content/v1"
"github.com/containerd/containerd/v2/defaults"
controlapi "github.com/moby/buildkit/api/services/control"
"github.com/moby/buildkit/client/connhelper"
"github.com/moby/buildkit/session"
Expand Down
4 changes: 2 additions & 2 deletions client/client_nydus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"testing"

"github.com/containerd/containerd/images"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/nydus-snapshotter/pkg/converter"
"github.com/moby/buildkit/client/llb"
"github.com/moby/buildkit/identity"
Expand Down
20 changes: 10 additions & 10 deletions client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
"testing"
"time"

"github.com/containerd/containerd"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/content/local"
"github.com/containerd/containerd/content/proxy"
ctderrdefs "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/remotes/docker"
"github.com/containerd/containerd/snapshots"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/content/proxy"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/plugins/content/local"
"github.com/containerd/continuity/fs/fstest"
ctderrdefs "github.com/containerd/errdefs"
"github.com/containerd/platforms"
"github.com/distribution/reference"
intoto "github.com/in-toto/in-toto-golang/in_toto"
controlapi "github.com/moby/buildkit/api/services/control"
Expand Down Expand Up @@ -501,7 +501,7 @@
_, err = bkstore.Info(ctx, img.Metadata().Target.Digest)
require.NoError(t, err)

_, err = bkstore.Info(ctx, mfst.Config.Digest)

Check failure on line 504 in client/client_test.go

View workflow job for this annotation

GitHub Actions / test / run (containerd, ./client ./cmd/buildctl ./worker/containerd ./solver ./frontend, integration)

Failed: client/TestIntegration/TestExportedImageLabels/worker=containerd 

=== RUN   TestIntegration/TestExportedImageLabels/worker=containerd
=== PAUSE TestIntegration/TestExportedImageLabels/worker=containerd
=== CONT  TestIntegration/TestExportedImageLabels/worker=containerd
    client_test.go:504: 
        	Error Trace:	/src/client/client_test.go:504
        	            				/src/util/testutil/integration/run.go:93
        	            				/src/util/testutil/integration/run.go:207
        	Error:      	Received unexpected error:
        	            	NotFound: rpc error: code = NotFound desc = content digest sha256:d29cda9d132b76add9c990c5681ad9b9d6324f0e58110864f0d886376f08a13b: not found
        	Test:       	TestIntegration/TestExportedImageLabels/worker=containerd
    sandbox.go:128: stdout: /usr/bin/containerd --config /tmp/bktest_containerd3450478350/config.toml
    sandbox.go:128: stderr: /usr/bin/containerd --config /tmp/bktest_containerd3450478350/config.toml
    sandbox.go:131: > StartCmd 2024-02-07 23:31:54.372816175 +0000 UTC m=+21.583141751 /usr/bin/containerd --config /tmp/bktest_containerd3450478350/config.toml
    sandbox.go:131: time="2024-02-07T23:31:54Z" level=warning msg="containerd config version `1` has been deprecated and will be removed in containerd v2.0, please switch to version `2`, see https://github.com/containerd/containerd/blob/main/docs/PLUGINS.md#version-header"
    sandbox.go:131: time="2024-02-07T23:31:54.420415564Z" level=info msg="starting containerd" revision=64b8a811b07ba6288238eefc14d898ee0b5b99ba version=v1.7.11
    sandbox.go:131: time="2024-02-07T23:31:54.457216202Z" level=info msg="loading plugin \"io.containerd.event.v1.exchange\"..." type=io.containerd.event.v1
    sandbox.go:131: time="2024-02-07T23:31:54.457289950Z" level=info msg="loading plugin \"io.containerd.internal.v1.opt\"..." type=io.containerd.internal.v1
    sandbox.go:131: time="2024-02-07T23:31:54.457348589Z" level=info msg="loading plugin \"io.containerd.warning.v1.deprecations\"..." type=io.containerd.warning.v1
    sandbox.go:131: time="2024-02-07T23:31:54.457364058Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.blockfile\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:54.457493470Z" level=info msg="skip loading plugin \"io.containerd.snapshotter.v1.blockfile\"..." error="no scratch file generator: skip plugin" type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:54.457522815Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.devmapper\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:54.457547040Z" level=warning msg="failed to load plugin io.containerd.snapshotter.v1.devmapper" error="devmapper not configured"
    sandbox.go:131: time="2024-02-07T23:31:54.457564503Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.native\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:54.457672865Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.overlayfs\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:54.457961024Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.aufs\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:54.464415624Z" level=info msg="skip loading plugin \"io.containerd.snapshotter.v1.aufs\"..." error="aufs is not supported (modprobe aufs failed: exit status 1 \"modprobe: can't change directory to '/lib/modules': No such file or directory\\n\"): skip plugin" type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:54.464447473Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.zfs\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:54.464783421Z" level=info msg="skip loading plugin \"io.containerd.snapshotter.v1.zfs\"..." error="path /tmp/bktest_containerd3450478350/root/io.containerd.snapshotter.v1.zfs must be a zfs filesystem to be used with the zfs snapshotter: skip plugin" type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:54

Check failure on line 504 in client/client_test.go

View workflow job for this annotation

GitHub Actions / test / run (containerd-1.6, ./client ./cmd/buildctl ./worker/containerd ./solver ./frontend, integration)

Failed: client/TestIntegration/TestExportedImageLabels/worker=containerd-1.6 

=== RUN   TestIntegration/TestExportedImageLabels/worker=containerd-1.6
=== PAUSE TestIntegration/TestExportedImageLabels/worker=containerd-1.6
=== CONT  TestIntegration/TestExportedImageLabels/worker=containerd-1.6
    client_test.go:504: 
        	Error Trace:	/src/client/client_test.go:504
        	            				/src/util/testutil/integration/run.go:93
        	            				/src/util/testutil/integration/run.go:207
        	Error:      	Received unexpected error:
        	            	NotFound: rpc error: code = NotFound desc = content digest sha256:b4355ba4dac31fc52f23501dd563ddbef7e11198fdee476cdca3f24dfd5fbff1: not found
        	Test:       	TestIntegration/TestExportedImageLabels/worker=containerd-1.6
    sandbox.go:128: stdout: /opt/containerd-alt-16/bin/containerd --config /tmp/bktest_containerd2153329337/config.toml
    sandbox.go:128: stderr: /opt/containerd-alt-16/bin/containerd --config /tmp/bktest_containerd2153329337/config.toml
    sandbox.go:131: > StartCmd 2024-02-07 23:33:36.862952228 +0000 UTC m=+122.741705709 /opt/containerd-alt-16/bin/containerd --config /tmp/bktest_containerd2153329337/config.toml
    sandbox.go:131: time="2024-02-07T23:33:36Z" level=warning msg="containerd config version `1` has been deprecated and will be removed in containerd v2.0, please switch to version `2`, see https://github.com/containerd/containerd/blob/main/docs/PLUGINS.md#version-header"
    sandbox.go:131: time="2024-02-07T23:33:36.893928487Z" level=info msg="starting containerd" revision=61f9fd88f79f081d64d6fa3bb1a0dc71ec870523 version=v1.6.24
    sandbox.go:131: time="2024-02-07T23:33:36.919953669Z" level=info msg="loading plugin \"io.containerd.content.v1.content\"..." type=io.containerd.content.v1
    sandbox.go:131: time="2024-02-07T23:33:36.920108528Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.devmapper\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:36.920142120Z" level=warning msg="failed to load plugin io.containerd.snapshotter.v1.devmapper" error="devmapper not configured"
    sandbox.go:131: time="2024-02-07T23:33:36.920162929Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.native\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:36.920286850Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.overlayfs\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:36.920566912Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.aufs\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:36.921762092Z" level=info msg="skip loading plugin \"io.containerd.snapshotter.v1.aufs\"..." error="aufs is not supported (modprobe aufs failed: exit status 1 \"modprobe: can't change directory to '/lib/modules': No such file or directory\\n\"): skip plugin" type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:36.921796896Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.zfs\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:36.922013781Z" level=info msg="skip loading plugin \"io.containerd.snapshotter.v1.zfs\"..." error="path /tmp/bktest_containerd2153329337/root/io.containerd.snapshotter.v1.zfs must be a zfs filesystem to be used with the zfs snapshotter: skip plugin" type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:36.922043416Z" level=info msg="loading plugin \"io.containerd.metadata.v1.bolt\"..." type=io.containerd.metadata.v1
    sandbox.go:131: time="2024-02-07T23:33:36.922115941Z" level=warning msg="could not use snapshotter devmapper in metadata plugin" error="devmapper not configured"
    sandbox.go:131: time="2024-02-07T23:33:36.922140366Z" level=info msg="metadata content store policy set" policy=shared
    sandbox.go:131: time="2024-02-07T23:33:36.925761465Z" level=info msg="loading plugin \"io.containerd.differ.v1.walking\"..." type=io.containerd.differ.v1
    sandbox.go:131: time="2024-02-07T23:33:36.925847656Z" level=info msg="loadin

Check failure on line 504 in client/client_test.go

View workflow job for this annotation

GitHub Actions / test / run (./client, containerd, nydus, integration)

Failed: client/TestIntegration/TestExportedImageLabels/worker=containerd 

=== RUN   TestIntegration/TestExportedImageLabels/worker=containerd
=== PAUSE TestIntegration/TestExportedImageLabels/worker=containerd
=== CONT  TestIntegration/TestExportedImageLabels/worker=containerd
    client_test.go:504: 
        	Error Trace:	/src/client/client_test.go:504
        	            				/src/util/testutil/integration/run.go:93
        	            				/src/util/testutil/integration/run.go:207
        	Error:      	Received unexpected error:
        	            	NotFound: rpc error: code = NotFound desc = content digest sha256:5fbd0dacf715c7098d1a3388b9fc19ed86d84089d4161469e1d72a16ee5a0a9e: not found
        	Test:       	TestIntegration/TestExportedImageLabels/worker=containerd
    sandbox.go:128: stdout: /usr/bin/containerd --config /tmp/bktest_containerd3306282819/config.toml
    sandbox.go:128: stderr: /usr/bin/containerd --config /tmp/bktest_containerd3306282819/config.toml
    sandbox.go:131: > StartCmd 2024-02-07 23:33:39.971454652 +0000 UTC m=+113.286502640 /usr/bin/containerd --config /tmp/bktest_containerd3306282819/config.toml
    sandbox.go:131: time="2024-02-07T23:33:39Z" level=warning msg="containerd config version `1` has been deprecated and will be removed in containerd v2.0, please switch to version `2`, see https://github.com/containerd/containerd/blob/main/docs/PLUGINS.md#version-header"
    sandbox.go:131: time="2024-02-07T23:33:39.998651878Z" level=info msg="starting containerd" revision=64b8a811b07ba6288238eefc14d898ee0b5b99ba version=v1.7.11
    sandbox.go:131: time="2024-02-07T23:33:40.026153818Z" level=info msg="loading plugin \"io.containerd.event.v1.exchange\"..." type=io.containerd.event.v1
    sandbox.go:131: time="2024-02-07T23:33:40.026222114Z" level=info msg="loading plugin \"io.containerd.internal.v1.opt\"..." type=io.containerd.internal.v1
    sandbox.go:131: time="2024-02-07T23:33:40.026345794Z" level=info msg="loading plugin \"io.containerd.warning.v1.deprecations\"..." type=io.containerd.warning.v1
    sandbox.go:131: time="2024-02-07T23:33:40.026410484Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.blockfile\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:40.026521300Z" level=info msg="skip loading plugin \"io.containerd.snapshotter.v1.blockfile\"..." error="no scratch file generator: skip plugin" type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:40.026538782Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.devmapper\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:40.026595397Z" level=warning msg="failed to load plugin io.containerd.snapshotter.v1.devmapper" error="devmapper not configured"
    sandbox.go:131: time="2024-02-07T23:33:40.026610866Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.native\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:40.026761766Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.overlayfs\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:40.027167348Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.aufs\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:40.031001105Z" level=info msg="skip loading plugin \"io.containerd.snapshotter.v1.aufs\"..." error="aufs is not supported (modprobe aufs failed: exit status 1 \"modprobe: can't change directory to '/lib/modules': No such file or directory\\n\"): skip plugin" type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:40.031226033Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.zfs\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:40.031578537Z" level=info msg="skip loading plugin \"io.containerd.snapshotter.v1.zfs\"..." error="path /tmp/bktest_containerd3306282819/root/io.containerd.snapshotter.v1.zfs must be a zfs filesystem to be used with the zfs snapshotter: skip plugin" type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:33:4

Check failure on line 504 in client/client_test.go

View workflow job for this annotation

GitHub Actions / test / run (containerd-snapshotter-stargz, ./client ./cmd/buildctl ./worker/containerd ./solver ./fronte...

Failed: client/TestIntegration/TestExportedImageLabels/worker=containerd-snapshotter-stargz 

=== RUN   TestIntegration/TestExportedImageLabels/worker=containerd-snapshotter-stargz
=== PAUSE TestIntegration/TestExportedImageLabels/worker=containerd-snapshotter-stargz
=== CONT  TestIntegration/TestExportedImageLabels/worker=containerd-snapshotter-stargz
    client_test.go:504: 
        	Error Trace:	/src/client/client_test.go:504
        	            				/src/util/testutil/integration/run.go:93
        	            				/src/util/testutil/integration/run.go:207
        	Error:      	Received unexpected error:
        	            	NotFound: rpc error: code = NotFound desc = content digest sha256:628d5870e791759e8adff7cd1571c015f18317d5d662bd1346a211e5ccd5fe39: not found
        	Test:       	TestIntegration/TestExportedImageLabels/worker=containerd-snapshotter-stargz
    sandbox.go:128: stdout: /usr/bin/buildkitd --containerd-worker-gc=false --containerd-worker=true --containerd-worker-addr /tmp/bktest_containerd189149724/containerd.sock --containerd-worker-labels=org.mobyproject.buildkit.worker.sandbox=true --oci-worker=false --containerd-worker-snapshotter=stargz --config=/tmp/bktest_config928249562/buildkitd.toml --root /tmp/bktest_buildkitd3801371401 --addr unix:///tmp/bktest_buildkitd3801371401/buildkitd.sock --debug
    sandbox.go:131: foo > /foo
    sandbox.go:128: stderr: /usr/bin/buildkitd --containerd-worker-gc=false --containerd-worker=true --containerd-worker-addr /tmp/bktest_containerd189149724/containerd.sock --containerd-worker-labels=org.mobyproject.buildkit.worker.sandbox=true --oci-worker=false --containerd-worker-snapshotter=stargz --config=/tmp/bktest_config928249562/buildkitd.toml --root /tmp/bktest_buildkitd3801371401 --addr unix:///tmp/bktest_buildkitd3801371401/buildkitd.sock --debug
    sandbox.go:131: > StartCmd 2024-02-07 23:32:18.658929026 +0000 UTC m=+48.093966408 /usr/bin/buildkitd --containerd-worker-gc=false --containerd-worker=true --containerd-worker-addr /tmp/bktest_containerd189149724/containerd.sock --containerd-worker-labels=org.mobyproject.buildkit.worker.sandbox=true --oci-worker=false --containerd-worker-snapshotter=stargz --config=/tmp/bktest_config928249562/buildkitd.toml --root /tmp/bktest_buildkitd3801371401 --addr unix:///tmp/bktest_buildkitd3801371401/buildkitd.sock --debug
    sandbox.go:131: time="2024-02-07T23:32:18Z" level=debug msg="could not read \"/tmp/bktest_buildkitd3801371401/net/cni\" for cleanup: open /tmp/bktest_buildkitd3801371401/net/cni: no such file or directory"
    sandbox.go:131: time="2024-02-07T23:32:18Z" level=debug msg="creating new network namespace wy0ggw4mja0pg8mr7u5zfywv6"
    sandbox.go:131: time="2024-02-07T23:32:18Z" level=debug msg="finished creating network namespace wy0ggw4mja0pg8mr7u5zfywv6"
    sandbox.go:131: time="2024-02-07T23:32:18Z" level=debug msg="finished setting up network namespace wy0ggw4mja0pg8mr7u5zfywv6"
    sandbox.go:131: time="2024-02-07T23:32:18Z" level=debug msg="remote introspection plugin filters" filters="[type==io.containerd.runtime.v1 type==io.containerd.runtime.v2]"
    sandbox.go:131: time="2024-02-07T23:32:18Z" level=info msg="found worker \"rbdrsgggyeh417bq81lac0mcj\", labels=map[org.mobyproject.buildkit.worker.containerd.namespace:buildkit org.mobyproject.buildkit.worker.containerd.uuid:08257207-5b5f-4163-81fa-7e994f1f3e47 org.mobyproject.buildkit.worker.executor:containerd org.mobyproject.buildkit.worker.hostname:9d5dd50b36c9 org.mobyproject.buildkit.worker.network:cni org.mobyproject.buildkit.worker.sandbox:true org.mobyproject.buildkit.worker.selinux.enabled:false org.mobyproject.buildkit.worker.snapshotter:stargz], platforms=[linux/amd64 linux/amd64/v2 linux/amd64/v3 linux/arm64 linux/riscv64 linux/ppc64le linux/s390x linux/386 linux/mips64le linux/mips64 linux/arm/v7 linux/arm/v6]"
    sandbox.go:131: time="2024-02-07T23:32:18Z" level=info msg="found 1 workers, default=\"rbdrsgggyeh417bq81lac0mcj\""
    sandbox.go:131: time="2024-02-07T23:32:18Z" level=warning msg="currently, only the default worker can be used."
    sandbox.go:131: time="2024-02-07T23:32:18Z" level=info msg="running server on /tmp/b

Check failure on line 504 in client/client_test.go

View workflow job for this annotation

GitHub Actions / test / run (containerd-rootless, ./client ./cmd/buildctl ./worker/containerd ./solver ./frontend, integr...

Failed: client/TestIntegration/TestExportedImageLabels/worker=containerd-rootless 

=== RUN   TestIntegration/TestExportedImageLabels/worker=containerd-rootless
=== PAUSE TestIntegration/TestExportedImageLabels/worker=containerd-rootless
=== CONT  TestIntegration/TestExportedImageLabels/worker=containerd-rootless
    client_test.go:504: 
        	Error Trace:	/src/client/client_test.go:504
        	            				/src/util/testutil/integration/run.go:93
        	            				/src/util/testutil/integration/run.go:207
        	Error:      	Received unexpected error:
        	            	NotFound: rpc error: code = NotFound desc = content digest sha256:e38e627b43dd46c02b44fd3b8d6a4992146ccf63ed8aee2fd6bb3346a2883ad6: not found
        	Test:       	TestIntegration/TestExportedImageLabels/worker=containerd-rootless
    sandbox.go:128: stdout: /usr/bin/sudo -u #1000 -i CONTAINERD_ROOTLESS_ROOTLESSKIT_STATE_DIR=/tmp/bktest_containerd542896241/rootlesskit-containerd CONTAINERD_ROOTLESS_ROOTLESSKIT_NET=host CONTAINERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER=none CONTAINERD_ROOTLESS_ROOTLESSKIT_FLAGS=--mtu=0 containerd-rootless.sh -c /tmp/bktest_containerd542896241/config.toml
    sandbox.go:128: stderr: /usr/bin/sudo -u #1000 -i CONTAINERD_ROOTLESS_ROOTLESSKIT_STATE_DIR=/tmp/bktest_containerd542896241/rootlesskit-containerd CONTAINERD_ROOTLESS_ROOTLESSKIT_NET=host CONTAINERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER=none CONTAINERD_ROOTLESS_ROOTLESSKIT_FLAGS=--mtu=0 containerd-rootless.sh -c /tmp/bktest_containerd542896241/config.toml
    sandbox.go:131: > StartCmd 2024-02-07 23:31:48.405929726 +0000 UTC m=+22.727232506 /usr/bin/sudo -u #1000 -i CONTAINERD_ROOTLESS_ROOTLESSKIT_STATE_DIR=/tmp/bktest_containerd542896241/rootlesskit-containerd CONTAINERD_ROOTLESS_ROOTLESSKIT_NET=host CONTAINERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER=none CONTAINERD_ROOTLESS_ROOTLESSKIT_FLAGS=--mtu=0 containerd-rootless.sh -c /tmp/bktest_containerd542896241/config.toml
    sandbox.go:131: time="2024-02-07T23:31:48Z" level=warning msg="containerd config version `1` has been deprecated and will be removed in containerd v2.0, please switch to version `2`, see https://github.com/containerd/containerd/blob/main/docs/PLUGINS.md#version-header"
    sandbox.go:131: time="2024-02-07T23:31:48.474443883Z" level=info msg="starting containerd" revision=64b8a811b07ba6288238eefc14d898ee0b5b99ba version=v1.7.11
    sandbox.go:131: time="2024-02-07T23:31:48.507348910Z" level=info msg="loading plugin \"io.containerd.event.v1.exchange\"..." type=io.containerd.event.v1
    sandbox.go:131: time="2024-02-07T23:31:48.507379948Z" level=info msg="loading plugin \"io.containerd.internal.v1.opt\"..." type=io.containerd.internal.v1
    sandbox.go:131: time="2024-02-07T23:31:48.507415264Z" level=warning msg="failed to load plugin io.containerd.internal.v1.opt" error="mkdir /opt/containerd: permission denied"
    sandbox.go:131: time="2024-02-07T23:31:48.507428128Z" level=info msg="loading plugin \"io.containerd.warning.v1.deprecations\"..." type=io.containerd.warning.v1
    sandbox.go:131: time="2024-02-07T23:31:48.507443256Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.blockfile\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:48.507525059Z" level=info msg="skip loading plugin \"io.containerd.snapshotter.v1.blockfile\"..." error="no scratch file generator: skip plugin" type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:48.507545477Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.devmapper\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:48.507559313Z" level=warning msg="failed to load plugin io.containerd.snapshotter.v1.devmapper" error="devmapper not configured"
    sandbox.go:131: time="2024-02-07T23:31:48.507569653Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.native\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:48.507872369Z" level=info msg="loading plugin \"io.containerd.snapshotter.v1.overlayfs\"..." type=io.containerd.snapshotter.v1
    sandbox.go:131: time="2024-02-07T23:31:48.508125673Z"
require.NoError(t, err)

cl, err := c.ControlClient().ListenBuildHistory(sb.Context(), &controlapi.BuildHistoryRequest{
Expand Down
2 changes: 1 addition & 1 deletion client/llb/definition_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"testing"

"github.com/containerd/containerd/platforms"
"github.com/containerd/platforms"
"github.com/moby/buildkit/solver/pb"
digest "github.com/opencontainers/go-digest"
"github.com/stretchr/testify/require"
Expand Down
6 changes: 3 additions & 3 deletions client/llb/imagemetaresolver/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"net/http"
"sync"

"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/platforms"
"github.com/moby/buildkit/client/llb"
"github.com/moby/buildkit/util/contentutil"
"github.com/moby/buildkit/util/imageutil"
Expand Down
2 changes: 1 addition & 1 deletion client/llb/llbtest/platform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"testing"

"github.com/containerd/containerd/platforms"
"github.com/containerd/platforms"
"github.com/moby/buildkit/client/llb"
"github.com/moby/buildkit/solver"
"github.com/moby/buildkit/solver/llbsolver"
Expand Down
2 changes: 1 addition & 1 deletion client/llb/marshal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package llb
import (
"io"

"github.com/containerd/containerd/platforms"
"github.com/containerd/platforms"
"github.com/moby/buildkit/solver/pb"
digest "github.com/opencontainers/go-digest"
)
Expand Down
Loading
Loading