diff --git a/Makefile b/Makefile index bc12a5291..2ee79d3e9 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ GO := go GOOS := $(shell $(GO) env GOOS) GOARCH := $(shell $(GO) env GOARCH) EPOCH_TEST_COMMIT := f9e02affccd51702191e5312665a16045ffef8ab -PROJECT := github.com/kubernetes-incubator/cri-containerd +PROJECT := github.com/containerd/cri-containerd BINDIR := ${DESTDIR}/usr/local/bin BUILD_DIR := _output # VERSION is derived from the current tag for HEAD plus amends. Version is used diff --git a/README.md b/README.md index 9faef470d..84e56ff38 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@

-[![Build Status](https://api.travis-ci.org/kubernetes-incubator/cri-containerd.svg?style=flat-square)](https://travis-ci.org/kubernetes-incubator/cri-containerd) -[![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-incubator/cri-containerd?style=flat-square)](https://goreportcard.com/report/github.com/kubernetes-incubator/cri-containerd) +[![Build Status](https://api.travis-ci.org/containerd/cri-containerd.svg?style=flat-square)](https://travis-ci.org/containerd/cri-containerd) +[![Go Report Card](https://goreportcard.com/badge/github.com/containerd/cri-containerd?style=flat-square)](https://goreportcard.com/report/github.com/containerd/cri-containerd) `cri-containerd` is a [containerd](https://containerd.io/) based implementation of Kubernetes [container runtime interface (CRI)](https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/apis/cri/v1alpha1/runtime/api.proto). diff --git a/cmd/cri-containerd/cri_containerd.go b/cmd/cri-containerd/cri_containerd.go index 8efad7e2c..a045df86d 100644 --- a/cmd/cri-containerd/cri_containerd.go +++ b/cmd/cri-containerd/cri_containerd.go @@ -33,9 +33,9 @@ import ( "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/util/interrupt" - "github.com/kubernetes-incubator/cri-containerd/cmd/cri-containerd/options" - "github.com/kubernetes-incubator/cri-containerd/pkg/server" - "github.com/kubernetes-incubator/cri-containerd/pkg/version" + "github.com/containerd/cri-containerd/cmd/cri-containerd/options" + "github.com/containerd/cri-containerd/pkg/server" + "github.com/containerd/cri-containerd/pkg/version" ) // Add \u200B to avoid the space trimming. diff --git a/cmd/cri-containerd/load.go b/cmd/cri-containerd/load.go index 990e1564a..6ce662e36 100644 --- a/cmd/cri-containerd/load.go +++ b/cmd/cri-containerd/load.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/cobra" "golang.org/x/net/context" - "github.com/kubernetes-incubator/cri-containerd/cmd/cri-containerd/options" - api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1" - "github.com/kubernetes-incubator/cri-containerd/pkg/client" + "github.com/containerd/cri-containerd/cmd/cri-containerd/options" + api "github.com/containerd/cri-containerd/pkg/api/v1" + "github.com/containerd/cri-containerd/pkg/client" ) func dedent(s string) string { diff --git a/contrib/ansible/README.md b/contrib/ansible/README.md index 19244fa55..5497b5f74 100644 --- a/contrib/ansible/README.md +++ b/contrib/ansible/README.md @@ -26,7 +26,7 @@ $ cat hosts ## Step 1: At this point, the ansible playbook should be able to ssh into the machines in the hosts file. ```console -git clone https://github.com/kubernetes-incubator/cri-containerd +git clone https://github.com/containerd/cri-containerd cd ./cri-containerd/contrib/ansible ansible-playbook -i hosts cri-containerd.yaml ``` diff --git a/docs/installation.md b/docs/installation.md index a1330afa2..63dfefe6d 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -61,7 +61,7 @@ If you have other requirements for the binaries, e.g. selinux support, another a ### Download The release tarball could be downloaded from either of the following sources: -1. Release on github (see [here](https://github.com/kubernetes-incubator/cri-containerd/releases)); +1. Release on github (see [here](https://github.com/containerd/cri-containerd/releases)); 2. Release GCS bucket https://storage.googleapis.com/cri-containerd-release/. ## Step 0: Install Dependent Libraries diff --git a/integration/image_load_test.go b/integration/image_load_test.go index f6bf514ba..643aecad4 100644 --- a/integration/image_load_test.go +++ b/integration/image_load_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1" + api "github.com/containerd/cri-containerd/pkg/api/v1" ) // Test to load an image from tarball. diff --git a/integration/test_utils.go b/integration/test_utils.go index 574e0ded7..58080a9fc 100644 --- a/integration/test_utils.go +++ b/integration/test_utils.go @@ -28,9 +28,9 @@ import ( "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/remote" - api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1" - "github.com/kubernetes-incubator/cri-containerd/pkg/client" - "github.com/kubernetes-incubator/cri-containerd/pkg/util" + api "github.com/containerd/cri-containerd/pkg/api/v1" + "github.com/containerd/cri-containerd/pkg/client" + "github.com/containerd/cri-containerd/pkg/util" ) const ( diff --git a/integration/truncindex_test.go b/integration/truncindex_test.go index 33d9a5b6a..679b7d217 100644 --- a/integration/truncindex_test.go +++ b/integration/truncindex_test.go @@ -48,7 +48,7 @@ func TestTruncIndex(t *testing.T) { // if you add n images at least two will share the same leading digit. // "sha256:n" where n is the a number from 0-9 where two images have the same trunc, // for example sha256:9 - // https://github.com/kubernetes-incubator/cri-containerd/pull/352 + // https://github.com/containerd/cri-containerd/pull/352 // I am thinking how I get the two image which have same trunc. // TODO(yanxuean): add test case for ListImages diff --git a/pkg/client/client.go b/pkg/client/client.go index 276186153..39426dcc8 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -23,7 +23,7 @@ import ( "google.golang.org/grpc" "k8s.io/kubernetes/pkg/kubelet/util" - api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1" + api "github.com/containerd/cri-containerd/pkg/api/v1" ) // NewCRIContainerdClient creates grpc client of cri-containerd diff --git a/pkg/containerd/importer/importer.go b/pkg/containerd/importer/importer.go index 224f1ac5f..888a2b44f 100644 --- a/pkg/containerd/importer/importer.go +++ b/pkg/containerd/importer/importer.go @@ -36,7 +36,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" - "github.com/kubernetes-incubator/cri-containerd/pkg/util" + "github.com/containerd/cri-containerd/pkg/util" ) // This code reuses the docker import code from containerd/containerd#1602. diff --git a/pkg/os/testing/fake_os.go b/pkg/os/testing/fake_os.go index 33fd72459..660b30d70 100644 --- a/pkg/os/testing/fake_os.go +++ b/pkg/os/testing/fake_os.go @@ -24,7 +24,7 @@ import ( containerdmount "github.com/containerd/containerd/mount" "golang.org/x/net/context" - osInterface "github.com/kubernetes-incubator/cri-containerd/pkg/os" + osInterface "github.com/containerd/cri-containerd/pkg/os" ) // CalledDetail is the struct contains called function name and arguments. diff --git a/pkg/server/container_attach.go b/pkg/server/container_attach.go index bb9c0806f..75bcf7de2 100644 --- a/pkg/server/container_attach.go +++ b/pkg/server/container_attach.go @@ -26,7 +26,7 @@ import ( "k8s.io/client-go/tools/remotecommand" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io" + cio "github.com/containerd/cri-containerd/pkg/server/io" ) // Attach prepares a streaming endpoint to attach to a running container, and returns the address. diff --git a/pkg/server/container_create.go b/pkg/server/container_create.go index 218621ea5..4bf8140f8 100644 --- a/pkg/server/container_create.go +++ b/pkg/server/container_create.go @@ -45,10 +45,10 @@ import ( "golang.org/x/sys/unix" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - customopts "github.com/kubernetes-incubator/cri-containerd/pkg/containerd/opts" - cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" - "github.com/kubernetes-incubator/cri-containerd/pkg/util" + customopts "github.com/containerd/cri-containerd/pkg/containerd/opts" + cio "github.com/containerd/cri-containerd/pkg/server/io" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" + "github.com/containerd/cri-containerd/pkg/util" ) const ( @@ -68,7 +68,7 @@ const ( func init() { typeurl.Register(&containerstore.Metadata{}, - "github.com/kubernetes-incubator/cri-containerd/pkg/store/container", "Metadata") + "github.com/containerd/cri-containerd/pkg/store/container", "Metadata") } // CreateContainer creates a new container in the given PodSandbox. diff --git a/pkg/server/container_create_test.go b/pkg/server/container_create_test.go index 62ab7f48f..d878d9f7f 100644 --- a/pkg/server/container_create_test.go +++ b/pkg/server/container_create_test.go @@ -32,8 +32,8 @@ import ( "github.com/stretchr/testify/require" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - ostesting "github.com/kubernetes-incubator/cri-containerd/pkg/os/testing" - "github.com/kubernetes-incubator/cri-containerd/pkg/util" + ostesting "github.com/containerd/cri-containerd/pkg/os/testing" + "github.com/containerd/cri-containerd/pkg/util" ) func checkMount(t *testing.T, mounts []runtimespec.Mount, src, dest, typ string, diff --git a/pkg/server/container_execsync.go b/pkg/server/container_execsync.go index fc9ded393..11f6e5234 100644 --- a/pkg/server/container_execsync.go +++ b/pkg/server/container_execsync.go @@ -31,9 +31,9 @@ import ( "k8s.io/client-go/tools/remotecommand" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - cioutil "github.com/kubernetes-incubator/cri-containerd/pkg/ioutil" - cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io" - "github.com/kubernetes-incubator/cri-containerd/pkg/util" + cioutil "github.com/containerd/cri-containerd/pkg/ioutil" + cio "github.com/containerd/cri-containerd/pkg/server/io" + "github.com/containerd/cri-containerd/pkg/util" ) // ExecSync executes a command in the container, and returns the stdout output. diff --git a/pkg/server/container_list.go b/pkg/server/container_list.go index 6fb8ef1a3..f7c39dc13 100644 --- a/pkg/server/container_list.go +++ b/pkg/server/container_list.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" ) // ListContainers lists all containers matching the filter. diff --git a/pkg/server/container_list_test.go b/pkg/server/container_list_test.go index fbd188543..c4f31b386 100644 --- a/pkg/server/container_list_test.go +++ b/pkg/server/container_list_test.go @@ -25,8 +25,8 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" - sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" + sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox" ) func TestToCRIContainer(t *testing.T) { diff --git a/pkg/server/container_remove.go b/pkg/server/container_remove.go index c1c09901b..36ca6bbed 100644 --- a/pkg/server/container_remove.go +++ b/pkg/server/container_remove.go @@ -26,8 +26,8 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - "github.com/kubernetes-incubator/cri-containerd/pkg/store" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" + "github.com/containerd/cri-containerd/pkg/store" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" ) // RemoveContainer removes the container. diff --git a/pkg/server/container_remove_test.go b/pkg/server/container_remove_test.go index 57ee49e0b..2fe9cd4a3 100644 --- a/pkg/server/container_remove_test.go +++ b/pkg/server/container_remove_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" ) // TestSetContainerRemoving tests setContainerRemoving sets removing diff --git a/pkg/server/container_start.go b/pkg/server/container_start.go index a03d5c7ed..4e9dead66 100644 --- a/pkg/server/container_start.go +++ b/pkg/server/container_start.go @@ -27,8 +27,8 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" + cio "github.com/containerd/cri-containerd/pkg/server/io" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" ) // StartContainer starts the container. diff --git a/pkg/server/container_stats_list.go b/pkg/server/container_stats_list.go index 648cedafc..547ddb6d1 100644 --- a/pkg/server/container_stats_list.go +++ b/pkg/server/container_stats_list.go @@ -26,7 +26,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" ) // ListContainerStats returns stats of all running containers. diff --git a/pkg/server/container_status.go b/pkg/server/container_status.go index 4533da2a4..a4de30d5c 100644 --- a/pkg/server/container_status.go +++ b/pkg/server/container_status.go @@ -25,7 +25,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" ) // ContainerStatus inspects the container and returns the status. diff --git a/pkg/server/container_status_test.go b/pkg/server/container_status_test.go index d1cce81ff..d70b0f395 100644 --- a/pkg/server/container_status_test.go +++ b/pkg/server/container_status_test.go @@ -24,8 +24,8 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" - imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" + imagestore "github.com/containerd/cri-containerd/pkg/store/image" ) func getContainerStatusTestData() (*containerstore.Metadata, *containerstore.Status, diff --git a/pkg/server/container_stop.go b/pkg/server/container_stop.go index 1a56a570b..f0baf4c3b 100644 --- a/pkg/server/container_stop.go +++ b/pkg/server/container_stop.go @@ -28,8 +28,8 @@ import ( "golang.org/x/sys/unix" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - "github.com/kubernetes-incubator/cri-containerd/pkg/store" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" + "github.com/containerd/cri-containerd/pkg/store" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" ) const ( diff --git a/pkg/server/container_stop_test.go b/pkg/server/container_stop_test.go index a1d2cc349..6daa3d644 100644 --- a/pkg/server/container_stop_test.go +++ b/pkg/server/container_stop_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/net/context" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" ) func TestWaitContainerStop(t *testing.T) { diff --git a/pkg/server/container_update_resources.go b/pkg/server/container_update_resources.go index 3c5214339..fd4c5ce5d 100644 --- a/pkg/server/container_update_resources.go +++ b/pkg/server/container_update_resources.go @@ -29,8 +29,8 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" - "github.com/kubernetes-incubator/cri-containerd/pkg/util" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" + "github.com/containerd/cri-containerd/pkg/util" ) // UpdateContainerResources updates ContainerConfig of the container. diff --git a/pkg/server/events.go b/pkg/server/events.go index 14edeea21..5fc1357d1 100644 --- a/pkg/server/events.go +++ b/pkg/server/events.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" "golang.org/x/net/context" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" ) // eventMonitor monitors containerd event and updates internal state correspondingly. diff --git a/pkg/server/helpers.go b/pkg/server/helpers.go index 1f60583b6..4abfdff58 100644 --- a/pkg/server/helpers.go +++ b/pkg/server/helpers.go @@ -40,9 +40,9 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - "github.com/kubernetes-incubator/cri-containerd/pkg/store" - imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" - "github.com/kubernetes-incubator/cri-containerd/pkg/util" + "github.com/containerd/cri-containerd/pkg/store" + imagestore "github.com/containerd/cri-containerd/pkg/store/image" + "github.com/containerd/cri-containerd/pkg/util" ) const ( diff --git a/pkg/server/helpers_test.go b/pkg/server/helpers_test.go index 6a00181b5..3fb98bea5 100644 --- a/pkg/server/helpers_test.go +++ b/pkg/server/helpers_test.go @@ -22,7 +22,7 @@ import ( imagedigest "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" - "github.com/kubernetes-incubator/cri-containerd/pkg/util" + "github.com/containerd/cri-containerd/pkg/util" ) // TestGetUserFromImage tests the logic of getting image uid or user name of image user. diff --git a/pkg/server/image_list.go b/pkg/server/image_list.go index f6bbd090d..a5356f9d8 100644 --- a/pkg/server/image_list.go +++ b/pkg/server/image_list.go @@ -20,7 +20,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" + imagestore "github.com/containerd/cri-containerd/pkg/store/image" ) // ListImages lists existing images. diff --git a/pkg/server/image_list_test.go b/pkg/server/image_list_test.go index 81286a2a9..dc1c7a231 100644 --- a/pkg/server/image_list_test.go +++ b/pkg/server/image_list_test.go @@ -25,7 +25,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" + imagestore "github.com/containerd/cri-containerd/pkg/store/image" ) func TestListImages(t *testing.T) { diff --git a/pkg/server/image_load.go b/pkg/server/image_load.go index 4ebae480e..e55d738df 100644 --- a/pkg/server/image_load.go +++ b/pkg/server/image_load.go @@ -24,9 +24,9 @@ import ( "github.com/golang/glog" - api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1" - "github.com/kubernetes-incubator/cri-containerd/pkg/containerd/importer" - imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" + api "github.com/containerd/cri-containerd/pkg/api/v1" + "github.com/containerd/cri-containerd/pkg/containerd/importer" + imagestore "github.com/containerd/cri-containerd/pkg/store/image" ) // LoadImage loads a image into containerd. diff --git a/pkg/server/image_pull.go b/pkg/server/image_pull.go index 0f0675da8..836dce793 100644 --- a/pkg/server/image_pull.go +++ b/pkg/server/image_pull.go @@ -31,8 +31,8 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" - "github.com/kubernetes-incubator/cri-containerd/pkg/util" + imagestore "github.com/containerd/cri-containerd/pkg/store/image" + "github.com/containerd/cri-containerd/pkg/util" ) // For image management: diff --git a/pkg/server/image_status.go b/pkg/server/image_status.go index 8160d89df..d0dd8082e 100644 --- a/pkg/server/image_status.go +++ b/pkg/server/image_status.go @@ -24,7 +24,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" + imagestore "github.com/containerd/cri-containerd/pkg/store/image" imagespec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/server/image_status_test.go b/pkg/server/image_status_test.go index d55404d7b..750fa9700 100644 --- a/pkg/server/image_status_test.go +++ b/pkg/server/image_status_test.go @@ -25,7 +25,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" + imagestore "github.com/containerd/cri-containerd/pkg/store/image" ) func TestImageStatus(t *testing.T) { diff --git a/pkg/server/imagefs_info_test.go b/pkg/server/imagefs_info_test.go index f19e78012..158a24cff 100644 --- a/pkg/server/imagefs_info_test.go +++ b/pkg/server/imagefs_info_test.go @@ -25,7 +25,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - snapshotstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/snapshot" + snapshotstore "github.com/containerd/cri-containerd/pkg/store/snapshot" ) func TestImageFsInfo(t *testing.T) { diff --git a/pkg/server/instrumented_service.go b/pkg/server/instrumented_service.go index 7969b17b6..c2aff1cbb 100644 --- a/pkg/server/instrumented_service.go +++ b/pkg/server/instrumented_service.go @@ -21,7 +21,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1" + api "github.com/containerd/cri-containerd/pkg/api/v1" ) // instrumentedService wraps service and logs each operation. diff --git a/pkg/server/io/container_io.go b/pkg/server/io/container_io.go index 35deba754..65c500bbe 100644 --- a/pkg/server/io/container_io.go +++ b/pkg/server/io/container_io.go @@ -26,8 +26,8 @@ import ( "github.com/containerd/containerd/cio" "github.com/golang/glog" - cioutil "github.com/kubernetes-incubator/cri-containerd/pkg/ioutil" - "github.com/kubernetes-incubator/cri-containerd/pkg/util" + cioutil "github.com/containerd/cri-containerd/pkg/ioutil" + "github.com/containerd/cri-containerd/pkg/util" ) // streamKey generates a key for the stream. diff --git a/pkg/server/io/exec_io.go b/pkg/server/io/exec_io.go index 6b2006bd0..fc02636ed 100644 --- a/pkg/server/io/exec_io.go +++ b/pkg/server/io/exec_io.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/cio" "github.com/golang/glog" - cioutil "github.com/kubernetes-incubator/cri-containerd/pkg/ioutil" + cioutil "github.com/containerd/cri-containerd/pkg/ioutil" ) // ExecIO holds the exec io. diff --git a/pkg/server/io/logger.go b/pkg/server/io/logger.go index 11f85a625..2b85ff3e1 100644 --- a/pkg/server/io/logger.go +++ b/pkg/server/io/logger.go @@ -28,7 +28,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - cioutil "github.com/kubernetes-incubator/cri-containerd/pkg/ioutil" + cioutil "github.com/containerd/cri-containerd/pkg/ioutil" ) const ( diff --git a/pkg/server/io/logger_test.go b/pkg/server/io/logger_test.go index 1dbc03916..01e0e1c5f 100644 --- a/pkg/server/io/logger_test.go +++ b/pkg/server/io/logger_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - cioutil "github.com/kubernetes-incubator/cri-containerd/pkg/ioutil" + cioutil "github.com/containerd/cri-containerd/pkg/ioutil" ) func TestRedirectLogs(t *testing.T) { diff --git a/pkg/server/restart.go b/pkg/server/restart.go index 942147c19..c2079c8aa 100644 --- a/pkg/server/restart.go +++ b/pkg/server/restart.go @@ -35,10 +35,10 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" - imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" - sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" + cio "github.com/containerd/cri-containerd/pkg/server/io" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" + imagestore "github.com/containerd/cri-containerd/pkg/store/image" + sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox" ) // NOTE: The recovery logic has following assumption: when cri-containerd is down: diff --git a/pkg/server/sandbox_list.go b/pkg/server/sandbox_list.go index 43e767558..02378c470 100644 --- a/pkg/server/sandbox_list.go +++ b/pkg/server/sandbox_list.go @@ -26,7 +26,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" + sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox" ) // ListPodSandbox returns a list of Sandbox. diff --git a/pkg/server/sandbox_list_test.go b/pkg/server/sandbox_list_test.go index 46a60627e..ff4efe56d 100644 --- a/pkg/server/sandbox_list_test.go +++ b/pkg/server/sandbox_list_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" + sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox" ) func TestToCRISandbox(t *testing.T) { diff --git a/pkg/server/sandbox_remove.go b/pkg/server/sandbox_remove.go index 92e62f213..ccfe1e646 100644 --- a/pkg/server/sandbox_remove.go +++ b/pkg/server/sandbox_remove.go @@ -26,7 +26,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - "github.com/kubernetes-incubator/cri-containerd/pkg/store" + "github.com/containerd/cri-containerd/pkg/store" ) // RemovePodSandbox removes the sandbox. If there are running containers in the diff --git a/pkg/server/sandbox_run.go b/pkg/server/sandbox_run.go index 69c1b6f95..065a104e3 100644 --- a/pkg/server/sandbox_run.go +++ b/pkg/server/sandbox_run.go @@ -34,14 +34,14 @@ import ( "golang.org/x/sys/unix" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - customopts "github.com/kubernetes-incubator/cri-containerd/pkg/containerd/opts" - sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" - "github.com/kubernetes-incubator/cri-containerd/pkg/util" + customopts "github.com/containerd/cri-containerd/pkg/containerd/opts" + sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox" + "github.com/containerd/cri-containerd/pkg/util" ) func init() { typeurl.Register(&sandboxstore.Metadata{}, - "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox", "Metadata") + "github.com/containerd/cri-containerd/pkg/store/sandbox", "Metadata") } // RunPodSandbox creates and starts a pod-level sandbox. Runtimes should ensure @@ -123,7 +123,7 @@ func (c *criContainerdService) RunPodSandbox(ctx context.Context, r *runtime.Run if err != nil { return nil, fmt.Errorf("failed to get network status for sandbox %q: %v", id, err) } - // Certain VM based solutions like clear containers (Issue kubernetes-incubator/cri-containerd#524) + // Certain VM based solutions like clear containers (Issue containerd/cri-containerd#524) // rely on the assumption that CRI shim will not be querying the network namespace to check the // network states such as IP. // In furture runtime implementation should avoid relying on CRI shim implementation details. diff --git a/pkg/server/sandbox_run_test.go b/pkg/server/sandbox_run_test.go index 90f907c77..942c75a39 100644 --- a/pkg/server/sandbox_run_test.go +++ b/pkg/server/sandbox_run_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/require" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - ostesting "github.com/kubernetes-incubator/cri-containerd/pkg/os/testing" - sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" + ostesting "github.com/containerd/cri-containerd/pkg/os/testing" + sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox" ) func getRunPodSandboxTestData() (*runtime.PodSandboxConfig, *imagespec.ImageConfig, func(*testing.T, string, *runtimespec.Spec)) { diff --git a/pkg/server/sandbox_status.go b/pkg/server/sandbox_status.go index b5b61d799..6da474720 100644 --- a/pkg/server/sandbox_status.go +++ b/pkg/server/sandbox_status.go @@ -28,7 +28,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" + sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox" ) // PodSandboxStatus returns the status of the PodSandbox. diff --git a/pkg/server/sandbox_status_test.go b/pkg/server/sandbox_status_test.go index a85038c0c..945a22b05 100644 --- a/pkg/server/sandbox_status_test.go +++ b/pkg/server/sandbox_status_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" + sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox" ) func TestPodSandboxStatus(t *testing.T) { diff --git a/pkg/server/service.go b/pkg/server/service.go index c9b3e61e2..b23c44742 100644 --- a/pkg/server/service.go +++ b/pkg/server/service.go @@ -37,14 +37,14 @@ import ( "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/server/streaming" - "github.com/kubernetes-incubator/cri-containerd/cmd/cri-containerd/options" - api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1" - osinterface "github.com/kubernetes-incubator/cri-containerd/pkg/os" - "github.com/kubernetes-incubator/cri-containerd/pkg/registrar" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" - imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" - sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" - snapshotstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/snapshot" + "github.com/containerd/cri-containerd/cmd/cri-containerd/options" + api "github.com/containerd/cri-containerd/pkg/api/v1" + osinterface "github.com/containerd/cri-containerd/pkg/os" + "github.com/containerd/cri-containerd/pkg/registrar" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" + imagestore "github.com/containerd/cri-containerd/pkg/store/image" + sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox" + snapshotstore "github.com/containerd/cri-containerd/pkg/store/snapshot" ) const ( diff --git a/pkg/server/service_test.go b/pkg/server/service_test.go index a3fe6773a..34a234297 100644 --- a/pkg/server/service_test.go +++ b/pkg/server/service_test.go @@ -17,14 +17,14 @@ limitations under the License. package server import ( - "github.com/kubernetes-incubator/cri-containerd/cmd/cri-containerd/options" - ostesting "github.com/kubernetes-incubator/cri-containerd/pkg/os/testing" - "github.com/kubernetes-incubator/cri-containerd/pkg/registrar" - servertesting "github.com/kubernetes-incubator/cri-containerd/pkg/server/testing" - containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" - imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" - sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" - snapshotstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/snapshot" + "github.com/containerd/cri-containerd/cmd/cri-containerd/options" + ostesting "github.com/containerd/cri-containerd/pkg/os/testing" + "github.com/containerd/cri-containerd/pkg/registrar" + servertesting "github.com/containerd/cri-containerd/pkg/server/testing" + containerstore "github.com/containerd/cri-containerd/pkg/store/container" + imagestore "github.com/containerd/cri-containerd/pkg/store/image" + sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox" + snapshotstore "github.com/containerd/cri-containerd/pkg/store/snapshot" ) const ( diff --git a/pkg/server/snapshots.go b/pkg/server/snapshots.go index 3b6ee5c91..99822dde2 100644 --- a/pkg/server/snapshots.go +++ b/pkg/server/snapshots.go @@ -25,7 +25,7 @@ import ( snapshot "github.com/containerd/containerd/snapshots" "github.com/golang/glog" - snapshotstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/snapshot" + snapshotstore "github.com/containerd/cri-containerd/pkg/store/snapshot" ) // snapshotsSyncer syncs snapshot stats periodically. imagefs info and container stats diff --git a/pkg/server/version.go b/pkg/server/version.go index e909085ec..d7eb2737b 100644 --- a/pkg/server/version.go +++ b/pkg/server/version.go @@ -20,7 +20,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - "github.com/kubernetes-incubator/cri-containerd/pkg/version" + "github.com/containerd/cri-containerd/pkg/version" ) const ( diff --git a/pkg/store/container/container.go b/pkg/store/container/container.go index bfe754c18..6f636e228 100644 --- a/pkg/store/container/container.go +++ b/pkg/store/container/container.go @@ -22,8 +22,8 @@ import ( "github.com/containerd/containerd" "github.com/docker/docker/pkg/truncindex" - cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io" - "github.com/kubernetes-incubator/cri-containerd/pkg/store" + cio "github.com/containerd/cri-containerd/pkg/server/io" + "github.com/containerd/cri-containerd/pkg/store" ) // Container contains all resources associated with the container. All methods to diff --git a/pkg/store/container/container_test.go b/pkg/store/container/container_test.go index 0907b157a..710846b71 100644 --- a/pkg/store/container/container_test.go +++ b/pkg/store/container/container_test.go @@ -23,8 +23,8 @@ import ( assertlib "github.com/stretchr/testify/assert" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io" - "github.com/kubernetes-incubator/cri-containerd/pkg/store" + cio "github.com/containerd/cri-containerd/pkg/server/io" + "github.com/containerd/cri-containerd/pkg/store" ) func TestContainerStore(t *testing.T) { diff --git a/pkg/store/image/image.go b/pkg/store/image/image.go index 782900c73..22fa2cb46 100644 --- a/pkg/store/image/image.go +++ b/pkg/store/image/image.go @@ -24,7 +24,7 @@ import ( godigest "github.com/opencontainers/go-digest" imagespec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/kubernetes-incubator/cri-containerd/pkg/store" + "github.com/containerd/cri-containerd/pkg/store" ) // Image contains all resources associated with the image. All fields diff --git a/pkg/store/image/image_test.go b/pkg/store/image/image_test.go index a8a6b2a79..04bbab226 100644 --- a/pkg/store/image/image_test.go +++ b/pkg/store/image/image_test.go @@ -23,7 +23,7 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" assertlib "github.com/stretchr/testify/assert" - "github.com/kubernetes-incubator/cri-containerd/pkg/store" + "github.com/containerd/cri-containerd/pkg/store" ) func TestImageStore(t *testing.T) { diff --git a/pkg/store/sandbox/sandbox.go b/pkg/store/sandbox/sandbox.go index 5c00a7d14..e2089f8fd 100644 --- a/pkg/store/sandbox/sandbox.go +++ b/pkg/store/sandbox/sandbox.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd" "github.com/docker/docker/pkg/truncindex" - "github.com/kubernetes-incubator/cri-containerd/pkg/store" + "github.com/containerd/cri-containerd/pkg/store" ) // Sandbox contains all resources associated with the sandbox. All methods to diff --git a/pkg/store/sandbox/sandbox_test.go b/pkg/store/sandbox/sandbox_test.go index ee1e91ba9..288fc9ce2 100644 --- a/pkg/store/sandbox/sandbox_test.go +++ b/pkg/store/sandbox/sandbox_test.go @@ -22,7 +22,7 @@ import ( assertlib "github.com/stretchr/testify/assert" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - "github.com/kubernetes-incubator/cri-containerd/pkg/store" + "github.com/containerd/cri-containerd/pkg/store" ) func TestSandboxStore(t *testing.T) { diff --git a/pkg/store/snapshot/snapshot.go b/pkg/store/snapshot/snapshot.go index 73e20afb0..a1cd96f37 100644 --- a/pkg/store/snapshot/snapshot.go +++ b/pkg/store/snapshot/snapshot.go @@ -21,7 +21,7 @@ import ( snapshot "github.com/containerd/containerd/snapshots" - "github.com/kubernetes-incubator/cri-containerd/pkg/store" + "github.com/containerd/cri-containerd/pkg/store" ) // Snapshot contains the information about the snapshot. diff --git a/pkg/store/snapshot/snapshot_test.go b/pkg/store/snapshot/snapshot_test.go index 546ebc25b..92ffe5f9b 100644 --- a/pkg/store/snapshot/snapshot_test.go +++ b/pkg/store/snapshot/snapshot_test.go @@ -23,7 +23,7 @@ import ( snapshot "github.com/containerd/containerd/snapshots" assertlib "github.com/stretchr/testify/assert" - "github.com/kubernetes-incubator/cri-containerd/pkg/store" + "github.com/containerd/cri-containerd/pkg/store" ) func TestSnapshotStore(t *testing.T) {