Skip to content

Commit 71ed61e

Browse files
estespestesp
authored
Merge pull request #4614 from mxpv/refactor
Refactor pkg packages
2 parents cb9572e + 3d02441 commit 71ed61e

43 files changed

Lines changed: 35 additions & 35 deletions

Some content is hidden

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

‎integration/main_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import (
4444
criconfig "github.com/containerd/containerd/pkg/cri/config"
4545
"github.com/containerd/containerd/pkg/cri/constants"
4646
"github.com/containerd/containerd/pkg/cri/server"
47-
"github.com/containerd/containerd/pkg/util"
47+
"github.com/containerd/containerd/pkg/cri/util"
4848
)
4949

5050
const (

‎pkg/cri/cri.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ import (
3939
"github.com/sirupsen/logrus"
4040
"k8s.io/klog/v2"
4141

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

‎pkg/cri/io/container_io.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"github.com/containerd/containerd/cio"
2626
"github.com/sirupsen/logrus"
2727

28+
"github.com/containerd/containerd/pkg/cri/util"
2829
cioutil "github.com/containerd/containerd/pkg/ioutil"
29-
"github.com/containerd/containerd/pkg/util"
3030
)
3131

3232
// streamKey generates a key for the stream.

pkg/containerd/opts/container.go renamed to pkg/cri/opts/container.go

File renamed without changes.

pkg/containerd/opts/spec.go renamed to pkg/cri/opts/spec.go

File renamed without changes.

pkg/containerd/opts/spec_linux.go renamed to pkg/cri/opts/spec_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ import (
4040
"golang.org/x/sys/unix"
4141
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
4242

43+
"github.com/containerd/containerd/pkg/cri/util"
4344
osinterface "github.com/containerd/containerd/pkg/os"
44-
"github.com/containerd/containerd/pkg/util"
4545
)
4646

4747
// WithAdditionalGIDs adds any additional groups listed for a particular user in the

pkg/containerd/opts/spec_linux_test.go renamed to pkg/cri/opts/spec_linux_test.go

File renamed without changes.

pkg/containerd/opts/spec_test.go renamed to pkg/cri/opts/spec_test.go

File renamed without changes.

pkg/containerd/opts/spec_windows.go renamed to pkg/cri/opts/spec_windows.go

File renamed without changes.

pkg/containerd/opts/task.go renamed to pkg/cri/opts/task.go

File renamed without changes.

0 commit comments

Comments
 (0)