From 3de8c8bf19618dc0190d02064729f299fb5381c5 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Mon, 17 Sep 2018 10:54:42 -0700 Subject: [PATCH] Update cri-tools to 98eea54af789ae13edce79cba101fb9ac8e7b241. Signed-off-by: Lantao Liu --- README.md | 2 +- docs/crictl.md | 2 +- docs/installation.md | 2 +- docs/proposal.md | 2 +- docs/testing.md | 2 +- hack/utils.sh | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3ebdcffd8..a97c2fe3d 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ make BUILD_TAGS='seccomp apparmor' | selinux | selinux process and mount labeling | | | apparmor | apparmor profile support | | ### Validate Your `cri` Setup -A Kubernetes incubator project called [cri-tools](https://github.com/kubernetes-incubator/cri-tools) +A Kubernetes incubator project called [cri-tools](https://github.com/kubernetes-sigs/cri-tools) includes programs for exercising CRI implementations such as the `cri` plugin. More importantly, cri-tools includes the program `critest` which is used for running [CRI Validation Testing](https://github.com/kubernetes/community/blob/master/contributors/devel/cri-validation.md). diff --git a/docs/crictl.md b/docs/crictl.md index 22ccc7a01..db81dca86 100644 --- a/docs/crictl.md +++ b/docs/crictl.md @@ -196,5 +196,5 @@ $ crictl info } ``` ## More Information -See [here](https://github.com/kubernetes-incubator/cri-tools/blob/master/docs/crictl.md) +See [here](https://github.com/kubernetes-sigs/cri-tools/blob/master/docs/crictl.md) for information about crictl. diff --git a/docs/installation.md b/docs/installation.md index 0d5063cb6..9f3e2059e 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -11,7 +11,7 @@ As shown below, the release tarball contains: 1) `containerd`, `containerd-shim`, `containerd-stress`, `containerd-release`, `ctr`: binaries for containerd. 2) `runc`: runc binary. 3) `crictl`, `crictl.yaml`: command line tools for CRI container runtime and its config file. -4) `critest`: binary to run [CRI validation test](https://github.com/kubernetes-incubator/cri-tools/blob/master/docs/validation.md). +4) `critest`: binary to run [CRI validation test](https://github.com/kubernetes-sigs/cri-tools/blob/master/docs/validation.md). 5) `containerd.service`: Systemd unit for containerd. 6) `/opt/containerd/cluster/`: scripts for `kube-up.sh`. ```console diff --git a/docs/proposal.md b/docs/proposal.md index 73fd1cbd3..64db560db 100644 --- a/docs/proposal.md +++ b/docs/proposal.md @@ -76,7 +76,7 @@ Containerd plans to provide [image filesystem metrics](https://github.com/contai CRI image filesystem metrics needs to be defined ([#33048](https://github.com/kubernetes/kubernetes/issues/33048)). After that, we should make sure containerd provides the required metrics, and CRI-containerd should translate containerd image filesystem metrics into CRI image filesystem metrics. ### Out of Scope Following items are out of the scope of this design, we may address them in future version as enhancement or optimization. -* **Debuggability**: One of the biggest concern of CRI-containerd is debuggability. We should provide equivalent debuggability with Docker CLI through `kubectl`, [`cri-tools`](https://github.com/kubernetes-incubator/cri-tools) or containerd CLI. +* **Debuggability**: One of the biggest concern of CRI-containerd is debuggability. We should provide equivalent debuggability with Docker CLI through `kubectl`, [`cri-tools`](https://github.com/kubernetes-sigs/cri-tools) or containerd CLI. * **Built-in CRI support**: The [plugin model](https://github.com/containerd/containerd/blob/master/design/plugins.md) provided by containerd makes it possible to directly build CRI support into containerd as a plugin, which will eliminate one more hop from the stack. But because of the [limitation of golang plugin](https://github.com/containerd/containerd/issues/563), we have to either maintain our own branch or push CRI plugin upstream. * **Seccomp**: ([#36997](https://github.com/kubernetes/kubernetes/issues/36997)) Seccomp is supported in OCI runtime spec. However, current seccomp implementation in Kubernetes is experimental and docker specific, the api needs to be defined in CRI first before CRI-containerd implements it. * **Streaming server authentication**: ([#36666](https://github.com/kubernetes/kubernetes/issues/36666)) CRI-containerd will be out-of-process with Kubelet, so it could not reuse Kubelet authentication. Its streaming server should implement its own authentication mechanism. diff --git a/docs/testing.md b/docs/testing.md index b571e02bf..a85eb7834 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -42,7 +42,7 @@ make test-cri ```bash make test-cri FOCUS=REGEXP_TO_FOCUS SKIP=REGEXP_TO_SKIP ``` -[More information](https://github.com/kubernetes-incubator/cri-tools) about CRI validation test. +[More information](https://github.com/kubernetes-sigs/cri-tools) about CRI validation test. ## Node E2E Test [Node e2e test](https://github.com/kubernetes/community/blob/master/contributors/devel/e2e-node-tests.md) is a test framework testing Kubernetes node level functionalities such as managing pods, mounting volumes etc. It starts a local cluster with Kubelet and a few other minimum dependencies, and runs node functionality tests against the local cluster. * [Install dependencies](../README.md#install-dependencies). diff --git a/hack/utils.sh b/hack/utils.sh index 1f9d54c34..fac232187 100755 --- a/hack/utils.sh +++ b/hack/utils.sh @@ -17,9 +17,9 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/.. # Not from vendor.conf. -CRITOOL_VERSION=v1.11.0 -CRITOOL_PKG=github.com/kubernetes-incubator/cri-tools -CRITOOL_REPO=github.com/kubernetes-incubator/cri-tools +CRITOOL_VERSION=98eea54af789ae13edce79cba101fb9ac8e7b241 +CRITOOL_PKG=github.com/kubernetes-sigs/cri-tools +CRITOOL_REPO=github.com/kubernetes-sigs/cri-tools # VENDOR is the path to vendor.conf. VENDOR=${VENDOR:-"${ROOT}/vendor.conf"}