X Tutup
Skip to content

Commit b22b627

Browse files
dmcgowandmcgowan
committed
Move cri server packages under pkg/cri
Organizes the cri related server packages under pkg/cri Signed-off-by: Derek McGowan <derek@mcg.dev>
1 parent f44b072 commit b22b627

File tree

130 files changed

+109
-111
lines changed

Some content is hidden

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

130 files changed

+109
-111
lines changed

‎integration/main_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ import (
4141

4242
"github.com/containerd/containerd/integration/remote"
4343
dialer "github.com/containerd/containerd/integration/util"
44-
criconfig "github.com/containerd/containerd/pkg/config"
4544
"github.com/containerd/containerd/pkg/constants"
46-
"github.com/containerd/containerd/pkg/server"
45+
criconfig "github.com/containerd/containerd/pkg/cri/config"
46+
"github.com/containerd/containerd/pkg/cri/server"
4747
"github.com/containerd/containerd/pkg/util"
4848
)
4949

pkg/config/config.go renamed to pkg/cri/config/config.go

File renamed without changes.

pkg/config/config_test.go renamed to pkg/cri/config/config_test.go

File renamed without changes.

pkg/config/config_unix.go renamed to pkg/cri/config/config_unix.go

File renamed without changes.

pkg/config/config_windows.go renamed to pkg/cri/config/config_windows.go

File renamed without changes.

‎pkg/cri/cri.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ import (
3939
"github.com/sirupsen/logrus"
4040
"k8s.io/klog/v2"
4141

42-
criconfig "github.com/containerd/containerd/pkg/config"
4342
"github.com/containerd/containerd/pkg/constants"
4443
criplatforms "github.com/containerd/containerd/pkg/containerd/platforms"
45-
"github.com/containerd/containerd/pkg/server"
44+
criconfig "github.com/containerd/containerd/pkg/cri/config"
45+
"github.com/containerd/containerd/pkg/cri/server"
4646
)
4747

4848
// TODO(random-liu): Use github.com/pkg/errors for our errors.

pkg/server/io/container_io.go renamed to pkg/cri/io/container_io.go

File renamed without changes.

pkg/server/io/exec_io.go renamed to pkg/cri/io/exec_io.go

File renamed without changes.

pkg/server/io/helpers.go renamed to pkg/cri/io/helpers.go

File renamed without changes.

pkg/server/io/helpers_unix.go renamed to pkg/cri/io/helpers_unix.go

File renamed without changes.

0 commit comments

Comments
 (0)
X Tutup