Skip to content

Commit

Permalink
Rename kubernetes-incubator/cri-containerd to containerd/cri-containerd.
Browse files Browse the repository at this point in the history 
Signed-off-by: Lantao Liu <lantaol@google.com>
  • Loading branch information
@Random-Liu
Random-Liu committed Jan 10, 2018
1 parent 5bfa5e4 commit 025ffe5
Show file tree
Hide file tree
Showing 62 changed files with 112 additions and 112 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<img src="https://github.com/containerd/containerd/blob/master/docs/images/containerd-dark.png" width="200" >
</p>

[![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).

Expand Down
6 changes: 3 additions & 3 deletions cmd/cri-containerd/cri_containerd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions cmd/cri-containerd/load.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion contrib/ansible/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/image_load_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions integration/test_utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion integration/truncindex_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/containerd/importer/importer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/os/testing/fake_os.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_attach.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions pkg/server/container_create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions pkg/server/container_create_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions pkg/server/container_execsync.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions pkg/server/container_list_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/server/container_remove.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_remove_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/server/container_start.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_stats_list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_status.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions pkg/server/container_status_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions pkg/server/container_stop.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/container_stop_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/server/container_update_resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/events.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions pkg/server/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/image_list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/image_list_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/server/image_load.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions pkg/server/image_pull.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/image_status.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/server/image_status_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/imagefs_info_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/instrumented_service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading

0 comments on commit 025ffe5

Please sign in to comment.