diff --git a/Gopkg.lock b/Gopkg.lock index 922ce2fa85..5cb1684df3 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -184,6 +184,13 @@ revision = "9002847aa1425fb6ac49077c0a630b3b67e0fbfd" version = "v18" +[[projects]] + digest = "1:04054595e5c5a35d1553a7f3464d18577caf597445d643992998643df56d4afd" + name = "github.com/cri-o/cri-o" + packages = ["pkg/annotations"] + pruneopts = "NUT" + revision = "3394b3b2d6af0e41d185bb695c6378be5dd4d61d" + [[projects]] digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec" name = "github.com/davecgh/go-spew" @@ -698,6 +705,7 @@ "github.com/clearcontainers/proxy/client", "github.com/containerd/cgroups", "github.com/containerd/containerd/api/events", + "github.com/containerd/containerd/api/types", "github.com/containerd/containerd/api/types/task", "github.com/containerd/containerd/errdefs", "github.com/containerd/containerd/events", @@ -712,6 +720,7 @@ "github.com/containerd/fifo", "github.com/containerd/typeurl", "github.com/containernetworking/plugins/pkg/ns", + "github.com/cri-o/cri-o/pkg/annotations", "github.com/dlespiau/covertool/pkg/cover", "github.com/docker/go-units", "github.com/firecracker-microvm/firecracker-go-sdk/client", diff --git a/Gopkg.toml b/Gopkg.toml index 4faefaa0d1..203c03ab63 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -11,7 +11,7 @@ revision = "20b96f641a5ea98f2f8619ff4f3e061cff4833bd" [[constraint]] - name = "github.com/kubernetes-incubator/cri-o" + name = "github.com/cri-o/cri-o" revision = "3394b3b2d6af0e41d185bb695c6378be5dd4d61d" [[constraint]] diff --git a/README.md b/README.md index 26a2f471b0..86ef4f2d56 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ hardware-virtualized containers. The runtime is [OCI](https://github.com/opencontainers/runtime-spec)-compatible, -[CRI-O](https://github.com/kubernetes-incubator/cri-o)-compatible, and +[CRI-O](https://github.com/cri-o/cri-o)-compatible, and [Containerd](https://github.com/containerd/containerd)-compatible, allowing it to work seamlessly with both Docker and Kubernetes respectively. diff --git a/vendor/github.com/kubernetes-incubator/cri-o/LICENSE b/vendor/github.com/cri-o/cri-o/LICENSE similarity index 100% rename from vendor/github.com/kubernetes-incubator/cri-o/LICENSE rename to vendor/github.com/cri-o/cri-o/LICENSE diff --git a/vendor/github.com/kubernetes-incubator/cri-o/pkg/annotations/annotations.go b/vendor/github.com/cri-o/cri-o/pkg/annotations/annotations.go similarity index 100% rename from vendor/github.com/kubernetes-incubator/cri-o/pkg/annotations/annotations.go rename to vendor/github.com/cri-o/cri-o/pkg/annotations/annotations.go diff --git a/versions.yaml b/versions.yaml index 4a66e8f78b..5e4325553d 100644 --- a/versions.yaml +++ b/versions.yaml @@ -185,7 +185,7 @@ externals: crio: description: | OCI-based Kubernetes Container Runtime Interface implementation - url: "https://github.com/kubernetes-incubator/cri-o" + url: "https://github.com/cri-o/cri-o" version: "v1.13.0" meta: openshift: "6273bea4c9ed788aeb3d051ebf2d030060c05b6c" diff --git a/virtcontainers/pkg/oci/utils.go b/virtcontainers/pkg/oci/utils.go index 6efa53aeeb..a255d50c3a 100644 --- a/virtcontainers/pkg/oci/utils.go +++ b/virtcontainers/pkg/oci/utils.go @@ -17,7 +17,7 @@ import ( "syscall" criContainerdAnnotations "github.com/containerd/cri-containerd/pkg/annotations" - crioAnnotations "github.com/kubernetes-incubator/cri-o/pkg/annotations" + crioAnnotations "github.com/cri-o/cri-o/pkg/annotations" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" diff --git a/virtcontainers/pkg/oci/utils_test.go b/virtcontainers/pkg/oci/utils_test.go index dd5db1a91c..b29726625d 100644 --- a/virtcontainers/pkg/oci/utils_test.go +++ b/virtcontainers/pkg/oci/utils_test.go @@ -16,7 +16,7 @@ import ( "strconv" "testing" - "github.com/kubernetes-incubator/cri-o/pkg/annotations" + "github.com/cri-o/cri-o/pkg/annotations" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" "golang.org/x/sys/unix"