Skip to content

Commit 02e0fef

Browse files
fuweidfuweid
authored
Merge pull request containerd#9365 from dmcgowan/move-packages
Move packages based on contributing guide
2 parents aad3769 + 94d1b20 commit 02e0fef

File tree

730 files changed

+1525
-1464
lines changed

Some content is hidden

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

730 files changed

+1525
-1464
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ protos: bin/protoc-gen-go-fieldpath
182182
find v2 -name '*.pb.go' -exec sh -c 'f={}; mkdir -p $$(dirname "$${f#v2/}"); echo mv $$f $${f#v2/}; mv $$f $${f#v2/}' \;
183183
@mv ${TMPDIR}/vendor ${ROOTDIR}
184184
@rm -rf ${TMPDIR} v2
185-
go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ runtime/ -name '*.pb.go')
185+
go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ core/runtime/ -name '*.pb.go')
186186

187187
check-protos: protos ## check if protobufs needs to be generated again
188188
@echo "$(WHALE) $@"

‎Protobuild.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ generators = ["go"]
1414
after = ["/usr/local/include", "/usr/include"]
1515

1616
[[descriptors]]
17-
prefix = "github.com/containerd/containerd/runtime/v2/runc/options"
18-
target = "runtime/v2/runc/options/next.pb.txt"
17+
prefix = "github.com/containerd/containerd/core/runtime/v2/runc/options"
18+
target = "core/runtime/v2/runc/options/next.pb.txt"
1919
ignore_files = [
2020
"google/protobuf/descriptor.proto",
2121
]

‎Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ EOF
257257
set -eux -o pipefail
258258
rm -rf /var/lib/containerd-test /run/containerd-test
259259
cd ${GOPATH}/src/github.com/containerd/containerd
260-
go test -v -count=1 -race ./metrics/cgroups
260+
go test -v -count=1 -race ./core/metrics/cgroups
261261
make integration EXTRA_TESTFLAGS="-timeout 15m -no-criu -test.v" TEST_RUNTIME=io.containerd.runc.v2 RUNC_FLAVOR=$RUNC_FLAVOR
262262
SHELL
263263
end

‎client/client.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,27 @@ import (
3939
"github.com/containerd/containerd/v2/api/services/tasks/v1"
4040
versionservice "github.com/containerd/containerd/v2/api/services/version/v1"
4141
apitypes "github.com/containerd/containerd/v2/api/types"
42-
"github.com/containerd/containerd/v2/containers"
43-
"github.com/containerd/containerd/v2/content"
44-
contentproxy "github.com/containerd/containerd/v2/content/proxy"
42+
"github.com/containerd/containerd/v2/core/containers"
43+
"github.com/containerd/containerd/v2/core/content"
44+
contentproxy "github.com/containerd/containerd/v2/core/content/proxy"
45+
"github.com/containerd/containerd/v2/core/images"
46+
"github.com/containerd/containerd/v2/core/leases"
47+
leasesproxy "github.com/containerd/containerd/v2/core/leases/proxy"
48+
"github.com/containerd/containerd/v2/core/remotes"
49+
"github.com/containerd/containerd/v2/core/remotes/docker"
50+
"github.com/containerd/containerd/v2/core/sandbox"
51+
sandboxproxy "github.com/containerd/containerd/v2/core/sandbox/proxy"
52+
"github.com/containerd/containerd/v2/core/snapshots"
53+
snproxy "github.com/containerd/containerd/v2/core/snapshots/proxy"
4554
"github.com/containerd/containerd/v2/defaults"
46-
"github.com/containerd/containerd/v2/errdefs"
47-
"github.com/containerd/containerd/v2/events"
48-
"github.com/containerd/containerd/v2/images"
49-
"github.com/containerd/containerd/v2/leases"
50-
leasesproxy "github.com/containerd/containerd/v2/leases/proxy"
51-
"github.com/containerd/containerd/v2/namespaces"
5255
"github.com/containerd/containerd/v2/pkg/dialer"
56+
"github.com/containerd/containerd/v2/pkg/errdefs"
57+
"github.com/containerd/containerd/v2/pkg/events"
58+
"github.com/containerd/containerd/v2/pkg/namespaces"
5359
"github.com/containerd/containerd/v2/platforms"
5460
"github.com/containerd/containerd/v2/plugins"
61+
"github.com/containerd/containerd/v2/plugins/services/introspection"
5562
ptypes "github.com/containerd/containerd/v2/protobuf/types"
56-
"github.com/containerd/containerd/v2/remotes"
57-
"github.com/containerd/containerd/v2/remotes/docker"
58-
"github.com/containerd/containerd/v2/sandbox"
59-
sandboxproxy "github.com/containerd/containerd/v2/sandbox/proxy"
60-
"github.com/containerd/containerd/v2/services/introspection"
61-
"github.com/containerd/containerd/v2/snapshots"
62-
snproxy "github.com/containerd/containerd/v2/snapshots/proxy"
6363
"github.com/containerd/typeurl/v2"
6464
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
6565
"github.com/opencontainers/runtime-spec/specs-go"

‎client/client_opts.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ package client
1919
import (
2020
"time"
2121

22-
"github.com/containerd/containerd/v2/images"
22+
"github.com/containerd/containerd/v2/core/images"
23+
"github.com/containerd/containerd/v2/core/remotes"
24+
"github.com/containerd/containerd/v2/core/snapshots"
2325
"github.com/containerd/containerd/v2/platforms"
24-
"github.com/containerd/containerd/v2/remotes"
25-
"github.com/containerd/containerd/v2/snapshots"
2626
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
2727

2828
"google.golang.org/grpc"

‎client/container.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ import (
2727
"github.com/containerd/containerd/v2/api/services/tasks/v1"
2828
"github.com/containerd/containerd/v2/api/types"
2929
tasktypes "github.com/containerd/containerd/v2/api/types/task"
30-
"github.com/containerd/containerd/v2/cio"
31-
"github.com/containerd/containerd/v2/containers"
32-
"github.com/containerd/containerd/v2/errdefs"
33-
"github.com/containerd/containerd/v2/images"
34-
"github.com/containerd/containerd/v2/oci"
30+
"github.com/containerd/containerd/v2/core/containers"
31+
"github.com/containerd/containerd/v2/core/images"
32+
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
33+
"github.com/containerd/containerd/v2/pkg/cio"
34+
"github.com/containerd/containerd/v2/pkg/errdefs"
35+
"github.com/containerd/containerd/v2/pkg/oci"
3536
"github.com/containerd/containerd/v2/protobuf"
36-
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
3737
"github.com/containerd/fifo"
3838
"github.com/containerd/typeurl/v2"
3939
ver "github.com/opencontainers/image-spec/specs-go"

‎client/container_checkpoint_opts.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ import (
2424
"runtime"
2525

2626
tasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
27-
"github.com/containerd/containerd/v2/containers"
28-
"github.com/containerd/containerd/v2/diff"
29-
"github.com/containerd/containerd/v2/images"
27+
"github.com/containerd/containerd/v2/core/containers"
28+
"github.com/containerd/containerd/v2/core/diff"
29+
"github.com/containerd/containerd/v2/core/images"
30+
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
31+
"github.com/containerd/containerd/v2/pkg/rootfs"
3032
"github.com/containerd/containerd/v2/platforms"
3133
"github.com/containerd/containerd/v2/protobuf"
3234
"github.com/containerd/containerd/v2/protobuf/proto"
33-
"github.com/containerd/containerd/v2/rootfs"
34-
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
3535
"github.com/opencontainers/go-digest"
3636
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
3737
)

‎client/container_opts.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ import (
2222
"errors"
2323
"fmt"
2424

25-
"github.com/containerd/containerd/v2/containers"
26-
"github.com/containerd/containerd/v2/content"
27-
"github.com/containerd/containerd/v2/errdefs"
28-
"github.com/containerd/containerd/v2/images"
29-
"github.com/containerd/containerd/v2/namespaces"
30-
"github.com/containerd/containerd/v2/oci"
25+
"github.com/containerd/containerd/v2/core/containers"
26+
"github.com/containerd/containerd/v2/core/content"
27+
"github.com/containerd/containerd/v2/core/images"
28+
"github.com/containerd/containerd/v2/core/snapshots"
29+
"github.com/containerd/containerd/v2/pkg/errdefs"
30+
"github.com/containerd/containerd/v2/pkg/namespaces"
31+
"github.com/containerd/containerd/v2/pkg/oci"
3132
"github.com/containerd/containerd/v2/protobuf"
32-
"github.com/containerd/containerd/v2/snapshots"
3333
"github.com/containerd/typeurl/v2"
3434
"github.com/opencontainers/image-spec/identity"
3535
v1 "github.com/opencontainers/image-spec/specs-go/v1"

‎client/container_opts_unix.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"path/filepath"
2626
"syscall"
2727

28-
"github.com/containerd/containerd/v2/containers"
29-
"github.com/containerd/containerd/v2/errdefs"
30-
"github.com/containerd/containerd/v2/mount"
28+
"github.com/containerd/containerd/v2/core/containers"
29+
"github.com/containerd/containerd/v2/core/mount"
30+
"github.com/containerd/containerd/v2/pkg/errdefs"
3131
"github.com/opencontainers/image-spec/identity"
3232
)
3333

‎client/container_restore_opts.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"errors"
2222
"fmt"
2323

24-
"github.com/containerd/containerd/v2/containers"
25-
"github.com/containerd/containerd/v2/content"
26-
"github.com/containerd/containerd/v2/images"
24+
"github.com/containerd/containerd/v2/core/containers"
25+
"github.com/containerd/containerd/v2/core/content"
26+
"github.com/containerd/containerd/v2/core/images"
2727
"github.com/containerd/containerd/v2/protobuf/proto"
2828
ptypes "github.com/containerd/containerd/v2/protobuf/types"
2929
"github.com/opencontainers/image-spec/identity"

0 commit comments

Comments
 (0)