https-github-com-bit
diff --git a/‎integration/main_test.go‎
Lines changed: 1 addition & 1 deletion b/‎integration/main_test.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/containerd/util/util.go‎
Lines changed: 1 addition & 1 deletion b/‎pkg/containerd/util/util.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/annotations/annotations.go‎ ‎pkg/cri/annotations/annotations.go‎pkg/annotations/annotations.go renamed to pkg/cri/annotations/annotations.go b/‎pkg/annotations/annotations.go‎ ‎pkg/cri/annotations/annotations.go‎pkg/annotations/annotations.go renamed to pkg/cri/annotations/annotations.go
diff --git a/‎pkg/cri/config/config_unix.go‎
Lines changed: 1 addition & 1 deletion b/‎pkg/cri/config/config_unix.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/cri/config/config_windows.go‎
Lines changed: 1 addition & 1 deletion b/‎pkg/cri/config/config_windows.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/constants/constants.go‎ ‎pkg/cri/constants/constants.go‎pkg/constants/constants.go renamed to pkg/cri/constants/constants.go b/‎pkg/constants/constants.go‎ ‎pkg/cri/constants/constants.go‎pkg/constants/constants.go renamed to pkg/cri/constants/constants.go
diff --git a/‎pkg/cri/cri.go‎
Lines changed: 1 addition & 1 deletion b/‎pkg/cri/cri.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/cri/server/container_create_linux.go‎
Lines changed: 1 addition & 1 deletion b/‎pkg/cri/server/container_create_linux.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/cri/server/container_create_linux_test.go‎
Lines changed: 1 addition & 1 deletion b/‎pkg/cri/server/container_create_linux_test.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pkg/cri/server/container_create_test.go‎
Lines changed: 1 addition & 1 deletion b/‎pkg/cri/server/container_create_test.go‎
Lines changed: 1 addition & 1 deletion
@@ -41,8 +41,8 @@ import (
 
 	"github.com/containerd/containerd/integration/remote"
 	dialer "github.com/containerd/containerd/integration/util"
-	"github.com/containerd/containerd/pkg/constants"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
+	"github.com/containerd/containerd/pkg/cri/constants"
 	"github.com/containerd/containerd/pkg/cri/server"
 	"github.com/containerd/containerd/pkg/util"
 )
 
@@ -22,7 +22,7 @@ import (
 	"github.com/containerd/containerd/namespaces"
 	"golang.org/x/net/context"
 
-	"github.com/containerd/containerd/pkg/constants"
+	"github.com/containerd/containerd/pkg/cri/constants"
 )
 
 // deferCleanupTimeout is the default timeout for containerd cleanup operations
 
@@ -21,7 +21,7 @@ package config
 import (
 	"github.com/BurntSushi/toml"
 	"github.com/containerd/containerd"
-	"github.com/containerd/containerd/pkg/streaming"
+	"github.com/containerd/containerd/pkg/cri/streaming"
 )
 
 // DefaultConfig returns default configurations of cri plugin.
 
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 
 	"github.com/containerd/containerd"
-	"github.com/containerd/containerd/pkg/streaming"
+	"github.com/containerd/containerd/pkg/cri/streaming"
 )
 
 // DefaultConfig returns default configurations of cri plugin.
 
@@ -39,9 +39,9 @@ import (
 	"github.com/sirupsen/logrus"
 	"k8s.io/klog/v2"
 
-	"github.com/containerd/containerd/pkg/constants"
 	criplatforms "github.com/containerd/containerd/pkg/containerd/platforms"
 	criconfig "github.com/containerd/containerd/pkg/cri/config"
+	"github.com/containerd/containerd/pkg/cri/constants"
 	"github.com/containerd/containerd/pkg/cri/server"
 )
 
 
@@ -34,8 +34,8 @@ import (
 	"github.com/pkg/errors"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	"github.com/containerd/containerd/pkg/annotations"
 	customopts "github.com/containerd/containerd/pkg/containerd/opts"
+	"github.com/containerd/containerd/pkg/cri/annotations"
 	"github.com/containerd/containerd/pkg/cri/config"
 )
 
 
@@ -40,9 +40,9 @@ import (
 	"github.com/stretchr/testify/require"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	"github.com/containerd/containerd/pkg/annotations"
 	"github.com/containerd/containerd/pkg/containerd/opts"
 	ctrdutil "github.com/containerd/containerd/pkg/containerd/util"
+	"github.com/containerd/containerd/pkg/cri/annotations"
 	"github.com/containerd/containerd/pkg/cri/config"
 	ostesting "github.com/containerd/containerd/pkg/os/testing"
 	"github.com/containerd/containerd/pkg/util"
 
@@ -28,9 +28,9 @@ import (
 	"github.com/stretchr/testify/require"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 
-	"github.com/containerd/containerd/pkg/constants"
 	"github.com/containerd/containerd/pkg/containerd/opts"
 	"github.com/containerd/containerd/pkg/cri/config"
+	"github.com/containerd/containerd/pkg/cri/constants"
 )
 
 func checkMount(t *testing.T, mounts []runtimespec.Mount, src, dest, typ string,
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ import (`
`41`	`41`
`42`	`42`	`"github.com/containerd/containerd/integration/remote"`
`43`	`43`	`dialer "github.com/containerd/containerd/integration/util"`
`44`		`- "github.com/containerd/containerd/pkg/constants"`
`45`	`44`	`criconfig "github.com/containerd/containerd/pkg/cri/config"`
	`45`	`+ "github.com/containerd/containerd/pkg/cri/constants"`
`46`	`46`	`"github.com/containerd/containerd/pkg/cri/server"`
`47`	`47`	`"github.com/containerd/containerd/pkg/util"`
`48`	`48`	`)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"github.com/containerd/containerd/namespaces"`
`23`	`23`	`"golang.org/x/net/context"`
`24`	`24`
`25`		`- "github.com/containerd/containerd/pkg/constants"`
	`25`	`+ "github.com/containerd/containerd/pkg/cri/constants"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`// deferCleanupTimeout is the default timeout for containerd cleanup operations`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ package config`
`21`	`21`	`import (`
`22`	`22`	`"github.com/BurntSushi/toml"`
`23`	`23`	`"github.com/containerd/containerd"`
`24`		`- "github.com/containerd/containerd/pkg/streaming"`
	`24`	`+ "github.com/containerd/containerd/pkg/cri/streaming"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`// DefaultConfig returns default configurations of cri plugin.`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"path/filepath"`
`24`	`24`
`25`	`25`	`"github.com/containerd/containerd"`
`26`		`- "github.com/containerd/containerd/pkg/streaming"`
	`26`	`+ "github.com/containerd/containerd/pkg/cri/streaming"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`// DefaultConfig returns default configurations of cri plugin.`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,9 @@ import (`
`39`	`39`	`"github.com/sirupsen/logrus"`
`40`	`40`	`"k8s.io/klog/v2"`
`41`	`41`
`42`		`- "github.com/containerd/containerd/pkg/constants"`
`43`	`42`	`criplatforms "github.com/containerd/containerd/pkg/containerd/platforms"`
`44`	`43`	`criconfig "github.com/containerd/containerd/pkg/cri/config"`
	`44`	`+ "github.com/containerd/containerd/pkg/cri/constants"`
`45`	`45`	`"github.com/containerd/containerd/pkg/cri/server"`
`46`	`46`	`)`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ import (`
`34`	`34`	`"github.com/pkg/errors"`
`35`	`35`	`runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"`
`36`	`36`
`37`		`- "github.com/containerd/containerd/pkg/annotations"`
`38`	`37`	`customopts "github.com/containerd/containerd/pkg/containerd/opts"`
	`38`	`+ "github.com/containerd/containerd/pkg/cri/annotations"`
`39`	`39`	`"github.com/containerd/containerd/pkg/cri/config"`
`40`	`40`	`)`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@ import (`
`28`	`28`	`"github.com/stretchr/testify/require"`
`29`	`29`	`runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"`
`30`	`30`
`31`		`- "github.com/containerd/containerd/pkg/constants"`
`32`	`31`	`"github.com/containerd/containerd/pkg/containerd/opts"`
`33`	`32`	`"github.com/containerd/containerd/pkg/cri/config"`
	`33`	`+ "github.com/containerd/containerd/pkg/cri/constants"`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`func checkMount(t *testing.T, mounts []runtimespec.Mount, src, dest, typ string,`