github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Rename kubernetes-incubator/cri-containerd to containerd/cri-containerd.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2018-01-10 22:27:38 +00:00
parent 5bfa5e451a
commit 025ffe551f
62 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -16,7 +16,7 @@ GO := go
GOOS := $(shell $(GO) env GOOS) GOOS := $(shell $(GO) env GOOS)
GOARCH := $(shell $(GO) env GOARCH) GOARCH := $(shell $(GO) env GOARCH)
EPOCH_TEST_COMMIT := f9e02affccd51702191e5312665a16045ffef8ab EPOCH_TEST_COMMIT := f9e02affccd51702191e5312665a16045ffef8ab
PROJECT := github.com/kubernetes-incubator/cri-containerd PROJECT := github.com/containerd/cri-containerd
BINDIR := ${DESTDIR}/usr/local/bin BINDIR := ${DESTDIR}/usr/local/bin
BUILD_DIR := _output BUILD_DIR := _output
# VERSION is derived from the current tag for HEAD plus amends. Version is used # VERSION is derived from the current tag for HEAD plus amends. Version is used

4
README.md
View File

@ -4,8 +4,8 @@
<img src="https://github.com/containerd/containerd/blob/master/docs/images/containerd-dark.png" width="200" > <img src="https://github.com/containerd/containerd/blob/master/docs/images/containerd-dark.png" width="200" >
</p> </p>
[![Build Status](https://api.travis-ci.org/kubernetes-incubator/cri-containerd.svg?style=flat-square)](https://travis-ci.org/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/kubernetes-incubator/cri-containerd?style=flat-square)](https://goreportcard.com/report/github.com/kubernetes-incubator/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). `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).

6
cmd/cri-containerd/cri_containerd.go
View File

@ -33,9 +33,9 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/util/interrupt" "k8s.io/kubernetes/pkg/util/interrupt"
"github.com/kubernetes-incubator/cri-containerd/cmd/cri-containerd/options" "github.com/containerd/cri-containerd/cmd/cri-containerd/options"
"github.com/kubernetes-incubator/cri-containerd/pkg/server" "github.com/containerd/cri-containerd/pkg/server"
"github.com/kubernetes-incubator/cri-containerd/pkg/version" "github.com/containerd/cri-containerd/pkg/version"
) )
// Add \u200B to avoid the space trimming. // Add \u200B to avoid the space trimming.

6
cmd/cri-containerd/load.go
View File

@ -25,9 +25,9 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"golang.org/x/net/context" "golang.org/x/net/context"
"github.com/kubernetes-incubator/cri-containerd/cmd/cri-containerd/options" "github.com/containerd/cri-containerd/cmd/cri-containerd/options"
api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1" api "github.com/containerd/cri-containerd/pkg/api/v1"
"github.com/kubernetes-incubator/cri-containerd/pkg/client" "github.com/containerd/cri-containerd/pkg/client"
) )
func dedent(s string) string { func dedent(s string) string {

2
contrib/ansible/README.md
View File

@ -26,7 +26,7 @@ $ cat hosts
## Step 1: ## Step 1:
At this point, the ansible playbook should be able to ssh into the machines in the hosts file. At this point, the ansible playbook should be able to ssh into the machines in the hosts file.
```console ```console
git clone https://github.com/kubernetes-incubator/cri-containerd git clone https://github.com/containerd/cri-containerd
cd ./cri-containerd/contrib/ansible cd ./cri-containerd/contrib/ansible
ansible-playbook -i hosts cri-containerd.yaml ansible-playbook -i hosts cri-containerd.yaml
``` ```

2
docs/installation.md
View File

@ -61,7 +61,7 @@ If you have other requirements for the binaries, e.g. selinux support, another a
### Download ### Download
The release tarball could be downloaded from either of the following sources: 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/. 2. Release GCS bucket https://storage.googleapis.com/cri-containerd-release/.
## Step 0: Install Dependent Libraries ## Step 0: Install Dependent Libraries

2
integration/image_load_test.go
View File

@ -27,7 +27,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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. // Test to load an image from tarball.

6
integration/test_utils.go
View File

@ -28,9 +28,9 @@ import (
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/remote" "k8s.io/kubernetes/pkg/kubelet/remote"
api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1" api "github.com/containerd/cri-containerd/pkg/api/v1"
"github.com/kubernetes-incubator/cri-containerd/pkg/client" "github.com/containerd/cri-containerd/pkg/client"
"github.com/kubernetes-incubator/cri-containerd/pkg/util" "github.com/containerd/cri-containerd/pkg/util"
) )
const ( const (

2
integration/truncindex_test.go
View File

@ -48,7 +48,7 @@ func TestTruncIndex(t *testing.T) {
// if you add n images at least two will share the same leading digit. // 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, // "sha256:n" where n is the a number from 0-9 where two images have the same trunc,
// for example sha256:9 // 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. // I am thinking how I get the two image which have same trunc.
// TODO(yanxuean): add test case for ListImages // TODO(yanxuean): add test case for ListImages

2
pkg/client/client.go
View File

@ -23,7 +23,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"k8s.io/kubernetes/pkg/kubelet/util" "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 // NewCRIContainerdClient creates grpc client of cri-containerd

2
pkg/containerd/importer/importer.go
View File

@ -36,7 +36,7 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "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. // This code reuses the docker import code from containerd/containerd#1602.

2
pkg/os/testing/fake_os.go
View File

@ -24,7 +24,7 @@ import (
containerdmount "github.com/containerd/containerd/mount" containerdmount "github.com/containerd/containerd/mount"
"golang.org/x/net/context" "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. // CalledDetail is the struct contains called function name and arguments.

2
pkg/server/container_attach.go
View File

@ -26,7 +26,7 @@ import (
"k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/tools/remotecommand"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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. // Attach prepares a streaming endpoint to attach to a running container, and returns the address.

10
pkg/server/container_create.go
View File

@ -45,10 +45,10 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
customopts "github.com/kubernetes-incubator/cri-containerd/pkg/containerd/opts" customopts "github.com/containerd/cri-containerd/pkg/containerd/opts"
cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io" cio "github.com/containerd/cri-containerd/pkg/server/io"
containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" containerstore "github.com/containerd/cri-containerd/pkg/store/container"
"github.com/kubernetes-incubator/cri-containerd/pkg/util" "github.com/containerd/cri-containerd/pkg/util"
) )
const ( const (
@ -68,7 +68,7 @@ const (
func init() { func init() {
typeurl.Register(&containerstore.Metadata{}, 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. // CreateContainer creates a new container in the given PodSandbox.

4
pkg/server/container_create_test.go
View File

@ -32,8 +32,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
ostesting "github.com/kubernetes-incubator/cri-containerd/pkg/os/testing" ostesting "github.com/containerd/cri-containerd/pkg/os/testing"
"github.com/kubernetes-incubator/cri-containerd/pkg/util" "github.com/containerd/cri-containerd/pkg/util"
) )
func checkMount(t *testing.T, mounts []runtimespec.Mount, src, dest, typ string, func checkMount(t *testing.T, mounts []runtimespec.Mount, src, dest, typ string,

6
pkg/server/container_execsync.go
View File

@ -31,9 +31,9 @@ import (
"k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/tools/remotecommand"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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"
cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io" cio "github.com/containerd/cri-containerd/pkg/server/io"
"github.com/kubernetes-incubator/cri-containerd/pkg/util" "github.com/containerd/cri-containerd/pkg/util"
) )
// ExecSync executes a command in the container, and returns the stdout output. // ExecSync executes a command in the container, and returns the stdout output.

2
pkg/server/container_list.go
View File

@ -21,7 +21,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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. // ListContainers lists all containers matching the filter.

4
pkg/server/container_list_test.go
View File

@ -25,8 +25,8 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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"
sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
) )
func TestToCRIContainer(t *testing.T) { func TestToCRIContainer(t *testing.T) {

4
pkg/server/container_remove.go
View File

@ -26,8 +26,8 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"github.com/kubernetes-incubator/cri-containerd/pkg/store" "github.com/containerd/cri-containerd/pkg/store"
containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" containerstore "github.com/containerd/cri-containerd/pkg/store/container"
) )
// RemoveContainer removes the container. // RemoveContainer removes the container.

2
pkg/server/container_remove_test.go
View File

@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert" "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 // TestSetContainerRemoving tests setContainerRemoving sets removing

4
pkg/server/container_start.go
View File

@ -27,8 +27,8 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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"
containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" containerstore "github.com/containerd/cri-containerd/pkg/store/container"
) )
// StartContainer starts the container. // StartContainer starts the container.

2
pkg/server/container_stats_list.go
View File

@ -26,7 +26,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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. // ListContainerStats returns stats of all running containers.

2
pkg/server/container_status.go
View File

@ -25,7 +25,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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. // ContainerStatus inspects the container and returns the status.

4
pkg/server/container_status_test.go
View File

@ -24,8 +24,8 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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"
imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" imagestore "github.com/containerd/cri-containerd/pkg/store/image"
) )
func getContainerStatusTestData() (*containerstore.Metadata, *containerstore.Status, func getContainerStatusTestData() (*containerstore.Metadata, *containerstore.Status,

4
pkg/server/container_stop.go
View File

@ -28,8 +28,8 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"github.com/kubernetes-incubator/cri-containerd/pkg/store" "github.com/containerd/cri-containerd/pkg/store"
containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" containerstore "github.com/containerd/cri-containerd/pkg/store/container"
) )
const ( const (

2
pkg/server/container_stop_test.go
View File

@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"golang.org/x/net/context" "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) { func TestWaitContainerStop(t *testing.T) {

4
pkg/server/container_update_resources.go
View File

@ -29,8 +29,8 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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"
"github.com/kubernetes-incubator/cri-containerd/pkg/util" "github.com/containerd/cri-containerd/pkg/util"
) )
// UpdateContainerResources updates ContainerConfig of the container. // UpdateContainerResources updates ContainerConfig of the container.

2
pkg/server/events.go
View File

@ -25,7 +25,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"golang.org/x/net/context" "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. // eventMonitor monitors containerd event and updates internal state correspondingly.

6
pkg/server/helpers.go
View File

@ -40,9 +40,9 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"github.com/kubernetes-incubator/cri-containerd/pkg/store" "github.com/containerd/cri-containerd/pkg/store"
imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" imagestore "github.com/containerd/cri-containerd/pkg/store/image"
"github.com/kubernetes-incubator/cri-containerd/pkg/util" "github.com/containerd/cri-containerd/pkg/util"
) )
const ( const (

2
pkg/server/helpers_test.go
View File

@ -22,7 +22,7 @@ import (
imagedigest "github.com/opencontainers/go-digest" imagedigest "github.com/opencontainers/go-digest"
"github.com/stretchr/testify/assert" "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. // TestGetUserFromImage tests the logic of getting image uid or user name of image user.

2
pkg/server/image_list.go
View File

@ -20,7 +20,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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. // ListImages lists existing images.

2
pkg/server/image_list_test.go
View File

@ -25,7 +25,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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) { func TestListImages(t *testing.T) {

6
pkg/server/image_load.go
View File

@ -24,9 +24,9 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1" api "github.com/containerd/cri-containerd/pkg/api/v1"
"github.com/kubernetes-incubator/cri-containerd/pkg/containerd/importer" "github.com/containerd/cri-containerd/pkg/containerd/importer"
imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" imagestore "github.com/containerd/cri-containerd/pkg/store/image"
) )
// LoadImage loads a image into containerd. // LoadImage loads a image into containerd.

4
pkg/server/image_pull.go
View File

@ -31,8 +31,8 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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"
"github.com/kubernetes-incubator/cri-containerd/pkg/util" "github.com/containerd/cri-containerd/pkg/util"
) )
// For image management: // For image management:

2
pkg/server/image_status.go
View File

@ -24,7 +24,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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" imagespec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
pkg/server/image_status_test.go
View File

@ -25,7 +25,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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) { func TestImageStatus(t *testing.T) {

2
pkg/server/imagefs_info_test.go
View File

@ -25,7 +25,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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) { func TestImageFsInfo(t *testing.T) {

2
pkg/server/instrumented_service.go
View File

@ -21,7 +21,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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. // instrumentedService wraps service and logs each operation.

4
pkg/server/io/container_io.go
View File

@ -26,8 +26,8 @@ import (
"github.com/containerd/containerd/cio" "github.com/containerd/containerd/cio"
"github.com/golang/glog" "github.com/golang/glog"
cioutil "github.com/kubernetes-incubator/cri-containerd/pkg/ioutil" cioutil "github.com/containerd/cri-containerd/pkg/ioutil"
"github.com/kubernetes-incubator/cri-containerd/pkg/util" "github.com/containerd/cri-containerd/pkg/util"
) )
// streamKey generates a key for the stream. // streamKey generates a key for the stream.

2
pkg/server/io/exec_io.go
View File

@ -24,7 +24,7 @@ import (
"github.com/containerd/containerd/cio" "github.com/containerd/containerd/cio"
"github.com/golang/glog" "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. // ExecIO holds the exec io.

2
pkg/server/io/logger.go
View File

@ -28,7 +28,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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 ( const (

2
pkg/server/io/logger_test.go
View File

@ -27,7 +27,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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) { func TestRedirectLogs(t *testing.T) {

8
pkg/server/restart.go
View File

@ -35,10 +35,10 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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"
containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" containerstore "github.com/containerd/cri-containerd/pkg/store/container"
imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" imagestore "github.com/containerd/cri-containerd/pkg/store/image"
sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
) )
// NOTE: The recovery logic has following assumption: when cri-containerd is down: // NOTE: The recovery logic has following assumption: when cri-containerd is down:

2
pkg/server/sandbox_list.go
View File

@ -26,7 +26,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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. // ListPodSandbox returns a list of Sandbox.

2
pkg/server/sandbox_list_test.go
View File

@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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) { func TestToCRISandbox(t *testing.T) {

2
pkg/server/sandbox_remove.go
View File

@ -26,7 +26,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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 // RemovePodSandbox removes the sandbox. If there are running containers in the

10
pkg/server/sandbox_run.go
View File

@ -34,14 +34,14 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
customopts "github.com/kubernetes-incubator/cri-containerd/pkg/containerd/opts" customopts "github.com/containerd/cri-containerd/pkg/containerd/opts"
sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
"github.com/kubernetes-incubator/cri-containerd/pkg/util" "github.com/containerd/cri-containerd/pkg/util"
) )
func init() { func init() {
typeurl.Register(&sandboxstore.Metadata{}, 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 // 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 { if err != nil {
return nil, fmt.Errorf("failed to get network status for sandbox %q: %v", id, err) 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 // rely on the assumption that CRI shim will not be querying the network namespace to check the
// network states such as IP. // network states such as IP.
// In furture runtime implementation should avoid relying on CRI shim implementation details. // In furture runtime implementation should avoid relying on CRI shim implementation details.

4
pkg/server/sandbox_run_test.go
View File

@ -28,8 +28,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
ostesting "github.com/kubernetes-incubator/cri-containerd/pkg/os/testing" ostesting "github.com/containerd/cri-containerd/pkg/os/testing"
sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
) )
func getRunPodSandboxTestData() (*runtime.PodSandboxConfig, *imagespec.ImageConfig, func(*testing.T, string, *runtimespec.Spec)) { func getRunPodSandboxTestData() (*runtime.PodSandboxConfig, *imagespec.ImageConfig, func(*testing.T, string, *runtimespec.Spec)) {

2
pkg/server/sandbox_status.go
View File

@ -28,7 +28,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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. // PodSandboxStatus returns the status of the PodSandbox.

2
pkg/server/sandbox_status_test.go
View File

@ -24,7 +24,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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) { func TestPodSandboxStatus(t *testing.T) {

16
pkg/server/service.go
View File

@ -37,14 +37,14 @@ import (
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/server/streaming" "k8s.io/kubernetes/pkg/kubelet/server/streaming"
"github.com/kubernetes-incubator/cri-containerd/cmd/cri-containerd/options" "github.com/containerd/cri-containerd/cmd/cri-containerd/options"
api "github.com/kubernetes-incubator/cri-containerd/pkg/api/v1" api "github.com/containerd/cri-containerd/pkg/api/v1"
osinterface "github.com/kubernetes-incubator/cri-containerd/pkg/os" osinterface "github.com/containerd/cri-containerd/pkg/os"
"github.com/kubernetes-incubator/cri-containerd/pkg/registrar" "github.com/containerd/cri-containerd/pkg/registrar"
containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" containerstore "github.com/containerd/cri-containerd/pkg/store/container"
imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" imagestore "github.com/containerd/cri-containerd/pkg/store/image"
sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
snapshotstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/snapshot" snapshotstore "github.com/containerd/cri-containerd/pkg/store/snapshot"
) )
const ( const (

16
pkg/server/service_test.go
View File

@ -17,14 +17,14 @@ limitations under the License.
package server package server
import ( import (
"github.com/kubernetes-incubator/cri-containerd/cmd/cri-containerd/options" "github.com/containerd/cri-containerd/cmd/cri-containerd/options"
ostesting "github.com/kubernetes-incubator/cri-containerd/pkg/os/testing" ostesting "github.com/containerd/cri-containerd/pkg/os/testing"
"github.com/kubernetes-incubator/cri-containerd/pkg/registrar" "github.com/containerd/cri-containerd/pkg/registrar"
servertesting "github.com/kubernetes-incubator/cri-containerd/pkg/server/testing" servertesting "github.com/containerd/cri-containerd/pkg/server/testing"
containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container" containerstore "github.com/containerd/cri-containerd/pkg/store/container"
imagestore "github.com/kubernetes-incubator/cri-containerd/pkg/store/image" imagestore "github.com/containerd/cri-containerd/pkg/store/image"
sandboxstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/sandbox" sandboxstore "github.com/containerd/cri-containerd/pkg/store/sandbox"
snapshotstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/snapshot" snapshotstore "github.com/containerd/cri-containerd/pkg/store/snapshot"
) )
const ( const (

2
pkg/server/snapshots.go
View File

@ -25,7 +25,7 @@ import (
snapshot "github.com/containerd/containerd/snapshots" snapshot "github.com/containerd/containerd/snapshots"
"github.com/golang/glog" "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 // snapshotsSyncer syncs snapshot stats periodically. imagefs info and container stats

2
pkg/server/version.go
View File

@ -20,7 +20,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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 ( const (

4
pkg/store/container/container.go
View File

@ -22,8 +22,8 @@ import (
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/docker/docker/pkg/truncindex" "github.com/docker/docker/pkg/truncindex"
cio "github.com/kubernetes-incubator/cri-containerd/pkg/server/io" cio "github.com/containerd/cri-containerd/pkg/server/io"
"github.com/kubernetes-incubator/cri-containerd/pkg/store" "github.com/containerd/cri-containerd/pkg/store"
) )
// Container contains all resources associated with the container. All methods to // Container contains all resources associated with the container. All methods to

4
pkg/store/container/container_test.go
View File

@ -23,8 +23,8 @@ import (
assertlib "github.com/stretchr/testify/assert" assertlib "github.com/stretchr/testify/assert"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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"
"github.com/kubernetes-incubator/cri-containerd/pkg/store" "github.com/containerd/cri-containerd/pkg/store"
) )
func TestContainerStore(t *testing.T) { func TestContainerStore(t *testing.T) {

2
pkg/store/image/image.go
View File

@ -24,7 +24,7 @@ import (
godigest "github.com/opencontainers/go-digest" godigest "github.com/opencontainers/go-digest"
imagespec "github.com/opencontainers/image-spec/specs-go/v1" 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 // Image contains all resources associated with the image. All fields

2
pkg/store/image/image_test.go
View File

@ -23,7 +23,7 @@ import (
imagespec "github.com/opencontainers/image-spec/specs-go/v1" imagespec "github.com/opencontainers/image-spec/specs-go/v1"
assertlib "github.com/stretchr/testify/assert" 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) { func TestImageStore(t *testing.T) {

2
pkg/store/sandbox/sandbox.go
View File

@ -22,7 +22,7 @@ import (
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/docker/docker/pkg/truncindex" "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 // Sandbox contains all resources associated with the sandbox. All methods to

2
pkg/store/sandbox/sandbox_test.go
View File

@ -22,7 +22,7 @@ import (
assertlib "github.com/stretchr/testify/assert" assertlib "github.com/stretchr/testify/assert"
"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "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) { func TestSandboxStore(t *testing.T) {

2
pkg/store/snapshot/snapshot.go
View File

@ -21,7 +21,7 @@ import (
snapshot "github.com/containerd/containerd/snapshots" 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. // Snapshot contains the information about the snapshot.

2
pkg/store/snapshot/snapshot_test.go
View File

@ -23,7 +23,7 @@ import (
snapshot "github.com/containerd/containerd/snapshots" snapshot "github.com/containerd/containerd/snapshots"
assertlib "github.com/stretchr/testify/assert" 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) { func TestSnapshotStore(t *testing.T) {