From da15ce7edef3f16247eb62843d1ab2a0e8f29b9b Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Fri, 7 Sep 2018 10:36:36 +0800 Subject: [PATCH] Fix package paths after moving to kubernetes-sigs --- .travis.yml | 4 +- CHANGELOG.md | 177 ++++++++++++++++--------------- Makefile | 2 +- README.md | 8 +- cmd/crictl/main.go | 2 +- cmd/critest/cri_test.go | 8 +- docs/benchmark.md | 6 +- docs/crictl.md | 8 +- docs/validation.md | 6 +- hack/release.sh | 2 +- pkg/benchmark/benchmark.go | 2 +- pkg/benchmark/container.go | 2 +- pkg/benchmark/image.go | 2 +- pkg/benchmark/pod.go | 2 +- pkg/validate/apparmor.go | 2 +- pkg/validate/container.go | 2 +- pkg/validate/container_linux.go | 2 +- pkg/validate/e2e.go | 2 +- pkg/validate/image.go | 2 +- pkg/validate/networking.go | 2 +- pkg/validate/pod.go | 2 +- pkg/validate/runtime_info.go | 2 +- pkg/validate/security_context.go | 2 +- pkg/validate/selinux_linux.go | 2 +- pkg/validate/streaming.go | 2 +- 25 files changed, 132 insertions(+), 121 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1818983442..0da4c4c4d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ dist: trusty go: - "1.10.2" -go_import_path: github.com/kubernetes-incubator/cri-tools +go_import_path: github.com/kubernetes-sigs/cri-tools services: - docker @@ -27,6 +27,6 @@ jobs: script: - make release - stage: Test - script: + script: - make - sudo env PATH=$PATH GOPATH=$GOPATH hack/run-critest.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 7624570282..7f0f9a3ebb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,28 @@ - [v1.11.1](#v1111) + - [CRI CLI (crictl)](#cri-cli-crictl) - [v1.11.0](#v1110) + - [CRI validation testing (critest)](#cri-validation-testing-critest) + - [CRI CLI (crictl)](#cri-cli-crictl-1) - [v1.0.0-beta.1](#v100-beta1) + - [CRI validation testing (critest)](#cri-validation-testing-critest-1) + - [CRI CLI (crictl)](#cri-cli-crictl-2) - [v1.0.0-beta.0](#v100-beta0) + - [CRI validation testing (critest)](#cri-validation-testing-critest-2) + - [CRI CLI (crictl)](#cri-cli-crictl-3) - [v1.0.0-alpha.0](#v100-alpha0) + - [CRI validation testing (critest)](#cri-validation-testing-critest-3) + - [CRI CLI (crictl)](#cri-cli-crictl-4) - [v0.2](#v02) + - [CRI validation testing (critest)](#cri-validation-testing-critest-4) + - [CRI CLI (crictl)](#cri-cli-crictl-5) - [v0.1](#v01) - - [Features](#features) - - [CRI validation testing](#cri-validation-testing) - - [crictl](#crictl) - - [CRI performance benchmarking](#cri-performance-benchmarking) - - [Documentation](#documentation) + - [Features](#features) + - [CRI validation testing](#cri-validation-testing) + - [crictl](#crictl) + - [CRI performance benchmarking](#cri-performance-benchmarking) + - [Documentation](#documentation) @@ -21,9 +32,9 @@ cri-tools v1.11.1 mainly focused on UX improvement and bug fix. ## CRI CLI (crictl) -- [#338](https://github.com/kubernetes-incubator/cri-tools/pull/338) Allow filtering the pods with prefix matching of name and namespace -- [#342](https://github.com/kubernetes-incubator/cri-tools/pull/342) Clarify flag description in `crictl ps` and `crictl pods`. -- [#343](https://github.com/kubernetes-incubator/cri-tools/pull/343) Better terminal support in `crictl exec` and `crictl attach`, which also fixes issue [#288](https://github.com/kubernetes-incubator/cri-tools/issues/288) and [#181](https://github.com/kubernetes-incubator/cri-tools/issues/181). +- [#338](https://github.com/kubernetes-sigs/cri-tools/pull/338) Allow filtering the pods with prefix matching of name and namespace +- [#342](https://github.com/kubernetes-sigs/cri-tools/pull/342) Clarify flag description in `crictl ps` and `crictl pods`. +- [#343](https://github.com/kubernetes-sigs/cri-tools/pull/343) Better terminal support in `crictl exec` and `crictl attach`, which also fixes issue [#288](https://github.com/kubernetes-sigs/cri-tools/issues/288) and [#181](https://github.com/kubernetes-sigs/cri-tools/issues/181). # v1.11.0 @@ -31,19 +42,19 @@ cri-tools v1.11.0 mainly focused on stability improvements and multi-arch suppor ## CRI validation testing (critest) -- [#300](https://github.com/kubernetes-incubator/cri-tools/pull/300) Make image-user test images multi-arch. -- [#311](https://github.com/kubernetes-incubator/cri-tools/pull/311) Adds push-manifest into all target in the image-user Makefile. -- [#313](https://github.com/kubernetes-incubator/cri-tools/pull/313) Make hostnet-nginx test images multi-arch. -- [#315](https://github.com/kubernetes-incubator/cri-tools/pull/315) Makes image-test test images multi-arch. -- [#320](https://github.com/kubernetes-incubator/cri-tools/pull/320) Adds container host path validation tests. +- [#300](https://github.com/kubernetes-sigs/cri-tools/pull/300) Make image-user test images multi-arch. +- [#311](https://github.com/kubernetes-sigs/cri-tools/pull/311) Adds push-manifest into all target in the image-user Makefile. +- [#313](https://github.com/kubernetes-sigs/cri-tools/pull/313) Make hostnet-nginx test images multi-arch. +- [#315](https://github.com/kubernetes-sigs/cri-tools/pull/315) Makes image-test test images multi-arch. +- [#320](https://github.com/kubernetes-sigs/cri-tools/pull/320) Adds container host path validation tests. ## CRI CLI (crictl) -- [#306](https://github.com/kubernetes-incubator/cri-tools/pull/306) Fixes argument parsing for crictl exec. -- [#312](https://github.com/kubernetes-incubator/cri-tools/pull/312) Fixes a typo in inspecti usage. -- [#316](https://github.com/kubernetes-incubator/cri-tools/pull/316) Cleanups container and sandbox state. -- [#321](https://github.com/kubernetes-incubator/cri-tools/pull/321) Improves documentation and examples of crictl. -- [#325](https://github.com/kubernetes-incubator/cri-tools/pull/325) Upgrades kubernetes vendor to v1.11 branch. +- [#306](https://github.com/kubernetes-sigs/cri-tools/pull/306) Fixes argument parsing for crictl exec. +- [#312](https://github.com/kubernetes-sigs/cri-tools/pull/312) Fixes a typo in inspecti usage. +- [#316](https://github.com/kubernetes-sigs/cri-tools/pull/316) Cleanups container and sandbox state. +- [#321](https://github.com/kubernetes-sigs/cri-tools/pull/321) Improves documentation and examples of crictl. +- [#325](https://github.com/kubernetes-sigs/cri-tools/pull/325) Upgrades kubernetes vendor to v1.11 branch. # v1.0.0-beta.1 @@ -51,17 +62,17 @@ cri-tools v1.0.0-beta.1 mainly focused on critest coverage improvement, and bug ## CRI validation testing (critest) -- [#282](https://github.com/kubernetes-incubator/cri-tools/pull/282) Add RunAsGroup test. The test `runtime should return error if RunAsGroup is set without RunAsUser` only works with Kubernetes 1.11+. -- [#289](https://github.com/kubernetes-incubator/cri-tools/pull/289) Add host network pod portforward test. -- [#290](https://github.com/kubernetes-incubator/cri-tools/pull/290) Use busybox:1.28 instead of busybox:1.26 in the test to better support multi-arch. -- [#296](https://github.com/kubernetes-incubator/cri-tools/pull/296) Make `critest` binary statically linked. +- [#282](https://github.com/kubernetes-sigs/cri-tools/pull/282) Add RunAsGroup test. The test `runtime should return error if RunAsGroup is set without RunAsUser` only works with Kubernetes 1.11+. +- [#289](https://github.com/kubernetes-sigs/cri-tools/pull/289) Add host network pod portforward test. +- [#290](https://github.com/kubernetes-sigs/cri-tools/pull/290) Use busybox:1.28 instead of busybox:1.26 in the test to better support multi-arch. +- [#296](https://github.com/kubernetes-sigs/cri-tools/pull/296) Make `critest` binary statically linked. ## CRI CLI (crictl) -- [#278](https://github.com/kubernetes-incubator/cri-tools/pull/278) Remove "sandbox" from `crictl` command description. -- [#279](https://github.com/kubernetes-incubator/cri-tools/pull/279) Remove `oom-score-adj` flag from `crictl update` because it is not supported by `runc`. -- [#291](https://github.com/kubernetes-incubator/cri-tools/pull/291) Fix a bug that `crictl` generates a log file in `/tmp` directory each run. This can potentially fill `/tmp` directory. -- [#296](https://github.com/kubernetes-incubator/cri-tools/pull/296) Make `crictl` binary statically linked. +- [#278](https://github.com/kubernetes-sigs/cri-tools/pull/278) Remove "sandbox" from `crictl` command description. +- [#279](https://github.com/kubernetes-sigs/cri-tools/pull/279) Remove `oom-score-adj` flag from `crictl update` because it is not supported by `runc`. +- [#291](https://github.com/kubernetes-sigs/cri-tools/pull/291) Fix a bug that `crictl` generates a log file in `/tmp` directory each run. This can potentially fill `/tmp` directory. +- [#296](https://github.com/kubernetes-sigs/cri-tools/pull/296) Make `crictl` binary statically linked. # v1.0.0-beta.0 @@ -69,26 +80,26 @@ cri-tools v1.0.0-beta.0 is mainly focus on UX improvements, including make crict ## CRI validation testing (critest) -- [#227](https://github.com/kubernetes-incubator/cri-tools/pull/227) Set StdinOnce to true for attach test -- [#232](https://github.com/kubernetes-incubator/cri-tools/pull/232) Improves CRI log parser -- [#242](https://github.com/kubernetes-incubator/cri-tools/pull/242) Add validation of reopening container logs -- [#250](https://github.com/kubernetes-incubator/cri-tools/pull/250) Add validation of username not empty in ImageStatus -- [#252](https://github.com/kubernetes-incubator/cri-tools/pull/252) Improve image test and make test run in parallel -- [#257](https://github.com/kubernetes-incubator/cri-tools/pull/257) Add golang 1.10 and fix a race condition -- [#261](https://github.com/kubernetes-incubator/cri-tools/pull/261) [#273](https://github.com/kubernetes-incubator/cri-tools/pull/273) Remove dependency of source code -- [#267](https://github.com/kubernetes-incubator/cri-tools/pull/267) Add test for pid namespace -- [#269](https://github.com/kubernetes-incubator/cri-tools/pull/269) Add validation of tty settings for exec +- [#227](https://github.com/kubernetes-sigs/cri-tools/pull/227) Set StdinOnce to true for attach test +- [#232](https://github.com/kubernetes-sigs/cri-tools/pull/232) Improves CRI log parser +- [#242](https://github.com/kubernetes-sigs/cri-tools/pull/242) Add validation of reopening container logs +- [#250](https://github.com/kubernetes-sigs/cri-tools/pull/250) Add validation of username not empty in ImageStatus +- [#252](https://github.com/kubernetes-sigs/cri-tools/pull/252) Improve image test and make test run in parallel +- [#257](https://github.com/kubernetes-sigs/cri-tools/pull/257) Add golang 1.10 and fix a race condition +- [#261](https://github.com/kubernetes-sigs/cri-tools/pull/261) [#273](https://github.com/kubernetes-sigs/cri-tools/pull/273) Remove dependency of source code +- [#267](https://github.com/kubernetes-sigs/cri-tools/pull/267) Add test for pid namespace +- [#269](https://github.com/kubernetes-sigs/cri-tools/pull/269) Add validation of tty settings for exec ## CRI CLI (crictl) -- [#222](https://github.com/kubernetes-incubator/cri-tools/pull/222) Rename `sandboxes` subcommand to `pods` and rename`sandbox` to `podsandbox` in all subcommands -- [#225](https://github.com/kubernetes-incubator/cri-tools/pull/225) Add support of windows -- [#238](https://github.com/kubernetes-incubator/cri-tools/pull/238) Update CRI to v1alpha2 -- [#255](https://github.com/kubernetes-incubator/cri-tools/pull/255) Add support of multiple Ids to subcommands -- [#256](https://github.com/kubernetes-incubator/cri-tools/pull/256) Add `crictl ps -q` -- [#258](https://github.com/kubernetes-incubator/cri-tools/pull/258) Rename CRI endpoints environment variable to `CONTAINER_RUNTIME_ENDPOINT` and `IMAGE_SERVICE_ENDPOINT` -- [#268](https://github.com/kubernetes-incubator/cri-tools/pull/268) Avoid panic when runtimes are using truncated IDs -- [#274](https://github.com/kubernetes-incubator/cri-tools/pull/274) Add support of insecure TLS without auth +- [#222](https://github.com/kubernetes-sigs/cri-tools/pull/222) Rename `sandboxes` subcommand to `pods` and rename`sandbox` to `podsandbox` in all subcommands +- [#225](https://github.com/kubernetes-sigs/cri-tools/pull/225) Add support of windows +- [#238](https://github.com/kubernetes-sigs/cri-tools/pull/238) Update CRI to v1alpha2 +- [#255](https://github.com/kubernetes-sigs/cri-tools/pull/255) Add support of multiple Ids to subcommands +- [#256](https://github.com/kubernetes-sigs/cri-tools/pull/256) Add `crictl ps -q` +- [#258](https://github.com/kubernetes-sigs/cri-tools/pull/258) Rename CRI endpoints environment variable to `CONTAINER_RUNTIME_ENDPOINT` and `IMAGE_SERVICE_ENDPOINT` +- [#268](https://github.com/kubernetes-sigs/cri-tools/pull/268) Avoid panic when runtimes are using truncated IDs +- [#274](https://github.com/kubernetes-sigs/cri-tools/pull/274) Add support of insecure TLS without auth # v1.0.0-alpha.0 @@ -96,35 +107,35 @@ cri-tools v1.0.0-alpha.0 is mainly focus on UX improvements, including make cric ## CRI validation testing (critest) -- [#164](https://github.com/kubernetes-incubator/cri-tools/pull/164) Fix security context test to not rely on `/etc/hosts` -- [#165](https://github.com/kubernetes-incubator/cri-tools/pull/165) Validate IPv4 only for port mapping tests -- [#196](https://github.com/kubernetes-incubator/cri-tools/pull/196) Fix privileged container validation by replacing `ip link` with `brctl addbr` command -- [#197](https://github.com/kubernetes-incubator/cri-tools/pull/197) Fix hostIPC validation to support old ipcmk versions -- [#199](https://github.com/kubernetes-incubator/cri-tools/pull/199) [#201](https://github.com/kubernetes-incubator/cri-tools/pull/201) Fix container logs validation -- [#200](https://github.com/kubernetes-incubator/cri-tools/pull/200) Add SELinux validation tests +- [#164](https://github.com/kubernetes-sigs/cri-tools/pull/164) Fix security context test to not rely on `/etc/hosts` +- [#165](https://github.com/kubernetes-sigs/cri-tools/pull/165) Validate IPv4 only for port mapping tests +- [#196](https://github.com/kubernetes-sigs/cri-tools/pull/196) Fix privileged container validation by replacing `ip link` with `brctl addbr` command +- [#197](https://github.com/kubernetes-sigs/cri-tools/pull/197) Fix hostIPC validation to support old ipcmk versions +- [#199](https://github.com/kubernetes-sigs/cri-tools/pull/199) [#201](https://github.com/kubernetes-sigs/cri-tools/pull/201) Fix container logs validation +- [#200](https://github.com/kubernetes-sigs/cri-tools/pull/200) Add SELinux validation tests ## CRI CLI (crictl) -- [#156](https://github.com/kubernetes-incubator/cri-tools/pull/156) Fix empty RepoTags handling for `images` command -- [#163](https://github.com/kubernetes-incubator/cri-tools/pull/163) Add `--digest` option to `images` command -- [#167](https://github.com/kubernetes-incubator/cri-tools/pull/167) Add verbose for `status` command -- [#171](https://github.com/kubernetes-incubator/cri-tools/pull/171) Sort results by creation time for `ps`, `sandboxes` and `images` commands -- [#174](https://github.com/kubernetes-incubator/cri-tools/pull/174) Support select sandboxes by name for `sandboxes` and other commands -- [#178](https://github.com/kubernetes-incubator/cri-tools/pull/178) [#190](https://github.com/kubernetes-incubator/cri-tools/pull/190) Replace golang json with `protobuf/jsonpb` library -- [#182](https://github.com/kubernetes-incubator/cri-tools/pull/182) Fix stdout and stderr for `attach` and `exec` command -- [#183](https://github.com/kubernetes-incubator/cri-tools/pull/183) Add created time to `sandboxes` command -- [#186](https://github.com/kubernetes-incubator/cri-tools/pull/186) Use kubelet's log library instead of a copied one -- [#187](https://github.com/kubernetes-incubator/cri-tools/pull/187) Add image tag and attempt to `ps` command -- [#194](https://github.com/kubernetes-incubator/cri-tools/pull/194) Add `config` command -- [#217](https://github.com/kubernetes-incubator/cri-tools/pull/217) Add `--latest` and `--last` options to `ps` and `sandboxes` commands -- [#202](https://github.com/kubernetes-incubator/cri-tools/pull/202) [#203](https://github.com/kubernetes-incubator/cri-tools/pull/203) Add `--all`, `--latest`, `--last` and `--no-trunc` options to `ps` command -- [#205](https://github.com/kubernetes-incubator/cri-tools/pull/205) Improve logs command and add `--timestamps` and `--since` options -- [#206](https://github.com/kubernetes-incubator/cri-tools/pull/206) Add verbose debut output to `inspect` and `inspects` commands -- [#207](https://github.com/kubernetes-incubator/cri-tools/pull/207) Sort flags for all commands -- [#209](https://github.com/kubernetes-incubator/cri-tools/pull/209) Add `stats` command -- [#211](https://github.com/kubernetes-incubator/cri-tools/pull/211) Rewrite timestamps in container status and sandbox status to make them more user friendly -- [#213](https://github.com/kubernetes-incubator/cri-tools/pull/213) Add completion command -- [#216](https://github.com/kubernetes-incubator/cri-tools/pull/216) Add `--no-trunc` to `images` and `sandboxes` commands +- [#156](https://github.com/kubernetes-sigs/cri-tools/pull/156) Fix empty RepoTags handling for `images` command +- [#163](https://github.com/kubernetes-sigs/cri-tools/pull/163) Add `--digest` option to `images` command +- [#167](https://github.com/kubernetes-sigs/cri-tools/pull/167) Add verbose for `status` command +- [#171](https://github.com/kubernetes-sigs/cri-tools/pull/171) Sort results by creation time for `ps`, `sandboxes` and `images` commands +- [#174](https://github.com/kubernetes-sigs/cri-tools/pull/174) Support select sandboxes by name for `sandboxes` and other commands +- [#178](https://github.com/kubernetes-sigs/cri-tools/pull/178) [#190](https://github.com/kubernetes-sigs/cri-tools/pull/190) Replace golang json with `protobuf/jsonpb` library +- [#182](https://github.com/kubernetes-sigs/cri-tools/pull/182) Fix stdout and stderr for `attach` and `exec` command +- [#183](https://github.com/kubernetes-sigs/cri-tools/pull/183) Add created time to `sandboxes` command +- [#186](https://github.com/kubernetes-sigs/cri-tools/pull/186) Use kubelet's log library instead of a copied one +- [#187](https://github.com/kubernetes-sigs/cri-tools/pull/187) Add image tag and attempt to `ps` command +- [#194](https://github.com/kubernetes-sigs/cri-tools/pull/194) Add `config` command +- [#217](https://github.com/kubernetes-sigs/cri-tools/pull/217) Add `--latest` and `--last` options to `ps` and `sandboxes` commands +- [#202](https://github.com/kubernetes-sigs/cri-tools/pull/202) [#203](https://github.com/kubernetes-sigs/cri-tools/pull/203) Add `--all`, `--latest`, `--last` and `--no-trunc` options to `ps` command +- [#205](https://github.com/kubernetes-sigs/cri-tools/pull/205) Improve logs command and add `--timestamps` and `--since` options +- [#206](https://github.com/kubernetes-sigs/cri-tools/pull/206) Add verbose debut output to `inspect` and `inspects` commands +- [#207](https://github.com/kubernetes-sigs/cri-tools/pull/207) Sort flags for all commands +- [#209](https://github.com/kubernetes-sigs/cri-tools/pull/209) Add `stats` command +- [#211](https://github.com/kubernetes-sigs/cri-tools/pull/211) Rewrite timestamps in container status and sandbox status to make them more user friendly +- [#213](https://github.com/kubernetes-sigs/cri-tools/pull/213) Add completion command +- [#216](https://github.com/kubernetes-sigs/cri-tools/pull/216) Add `--no-trunc` to `images` and `sandboxes` commands # v0.2 @@ -132,22 +143,22 @@ cri-tools v0.2 enhances validation testings, improves crictl UX and also fixes s ## CRI validation testing (critest) -- [#127](https://github.com/kubernetes-incubator/cri-tools/pull/127) Adds validation tests for supplemental groups -- [#135](https://github.com/kubernetes-incubator/cri-tools/pull/135) [#137](https://github.com/kubernetes-incubator/cri-tools/pull/137) and [#144](https://github.com/kubernetes-incubator/cri-tools/pull/144) Adds validation tests for seccomp -- [#139](https://github.com/kubernetes-incubator/cri-tools/pull/139) Adds validation tests for sysctls -- [#140](https://github.com/kubernetes-incubator/cri-tools/pull/140) Adds validation tests for AppArmor -- [#141](https://github.com/kubernetes-incubator/cri-tools/pull/141) Adds validation tests for NoNewPrivs -- [#142](https://github.com/kubernetes-incubator/cri-tools/pull/142) Adds validation tests for mount propagation -- [#115](https://github.com/kubernetes-incubator/cri-tools/pull/115) Fixes image validation tests -- [#116](https://github.com/kubernetes-incubator/cri-tools/pull/116) Fixes validation message -- [#126](https://github.com/kubernetes-incubator/cri-tools/pull/126) Fixes sandbox leak in port forward validation tests +- [#127](https://github.com/kubernetes-sigs/cri-tools/pull/127) Adds validation tests for supplemental groups +- [#135](https://github.com/kubernetes-sigs/cri-tools/pull/135) [#137](https://github.com/kubernetes-sigs/cri-tools/pull/137) and [#144](https://github.com/kubernetes-sigs/cri-tools/pull/144) Adds validation tests for seccomp +- [#139](https://github.com/kubernetes-sigs/cri-tools/pull/139) Adds validation tests for sysctls +- [#140](https://github.com/kubernetes-sigs/cri-tools/pull/140) Adds validation tests for AppArmor +- [#141](https://github.com/kubernetes-sigs/cri-tools/pull/141) Adds validation tests for NoNewPrivs +- [#142](https://github.com/kubernetes-sigs/cri-tools/pull/142) Adds validation tests for mount propagation +- [#115](https://github.com/kubernetes-sigs/cri-tools/pull/115) Fixes image validation tests +- [#116](https://github.com/kubernetes-sigs/cri-tools/pull/116) Fixes validation message +- [#126](https://github.com/kubernetes-sigs/cri-tools/pull/126) Fixes sandbox leak in port forward validation tests ## CRI CLI (crictl) -- [#122](https://github.com/kubernetes-incubator/cri-tools/pull/122) Adds support for authenticated image pull -- [#123](https://github.com/kubernetes-incubator/cri-tools/pull/123) Improves crictl UX -- [#124](https://github.com/kubernetes-incubator/cri-tools/pull/124) Adds support for creating sandboxes and containers from yaml -- [#133](https://github.com/kubernetes-incubator/cri-tools/pull/133) Adds timeout support for container stop +- [#122](https://github.com/kubernetes-sigs/cri-tools/pull/122) Adds support for authenticated image pull +- [#123](https://github.com/kubernetes-sigs/cri-tools/pull/123) Improves crictl UX +- [#124](https://github.com/kubernetes-sigs/cri-tools/pull/124) Adds support for creating sandboxes and containers from yaml +- [#133](https://github.com/kubernetes-sigs/cri-tools/pull/133) Adds timeout support for container stop # v0.1 @@ -192,4 +203,4 @@ cri-tools provides a set of tools for Kubelet Container Runtime Interface (CRI): ## Documentation -See [cri-tools](https://github.com/kubernetes-incubator/cri-tools/#documentation). +See [cri-tools](https://github.com/kubernetes-sigs/cri-tools/#documentation). diff --git a/Makefile b/Makefile index 161b50f58a..3449cd4225 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ # limitations under the License. GO ?= go -PROJECT := github.com/kubernetes-incubator/cri-tools +PROJECT := github.com/kubernetes-sigs/cri-tools BINDIR := /usr/local/bin ifeq ($(GOPATH),) export GOPATH := $(CURDIR)/_output diff --git a/README.md b/README.md index 3e6fdc6d5a..d9193a13eb 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ CLI and validation tools for Kubelet Container Runtime Interface (CRI) . -[![Build Status](https://travis-ci.org/kubernetes-incubator/cri-tools.svg?branch=master)](https://travis-ci.org/kubernetes-incubator/cri-tools) -[![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-incubator/cri-tools)](https://goreportcard.com/report/github.com/kubernetes-incubator/cri-tools) +[![Build Status](https://travis-ci.org/kubernetes-sigs/cri-tools.svg?branch=master)](https://travis-ci.org/kubernetes-sigs/cri-tools) +[![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-sigs/cri-tools)](https://goreportcard.com/report/github.com/kubernetes-sigs/cri-tools) ## What is the scope of this project? @@ -38,7 +38,7 @@ We are currently working toward an beta version of CRI validation tests to be us ```sh VERSION="v1.11.1" -wget https://github.com/kubernetes-incubator/cri-tools/releases/download/$VERSION/crictl-$VERSION-linux-amd64.tar.gz +wget https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-$VERSION-linux-amd64.tar.gz sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin rm -f crictl-$VERSION-linux-amd64.tar.gz ``` @@ -47,7 +47,7 @@ rm -f crictl-$VERSION-linux-amd64.tar.gz ```sh VERSION="v1.11.1" -wget https://github.com/kubernetes-incubator/cri-tools/releases/download/$VERSION/critest-$VERSION-linux-amd64.tar.gz +wget https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/critest-$VERSION-linux-amd64.tar.gz sudo tar zxvf critest-$VERSION-linux-amd64.tar.gz -C /usr/local/bin rm -f critest-$VERSION-linux-amd64.tar.gz ``` diff --git a/cmd/crictl/main.go b/cmd/crictl/main.go index 00155d0b24..eb8e1931c3 100644 --- a/cmd/crictl/main.go +++ b/cmd/crictl/main.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/remote" "k8s.io/kubernetes/pkg/kubelet/util" - "github.com/kubernetes-incubator/cri-tools/pkg/version" + "github.com/kubernetes-sigs/cri-tools/pkg/version" ) const ( diff --git a/cmd/critest/cri_test.go b/cmd/critest/cri_test.go index 4f75fbbf14..59e92a9a08 100644 --- a/cmd/critest/cri_test.go +++ b/cmd/critest/cri_test.go @@ -31,11 +31,11 @@ import ( "github.com/onsi/ginkgo/reporters" "github.com/onsi/gomega" - "github.com/kubernetes-incubator/cri-tools/pkg/framework" - versionconst "github.com/kubernetes-incubator/cri-tools/pkg/version" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" + versionconst "github.com/kubernetes-sigs/cri-tools/pkg/version" - _ "github.com/kubernetes-incubator/cri-tools/pkg/benchmark" - _ "github.com/kubernetes-incubator/cri-tools/pkg/validate" + _ "github.com/kubernetes-sigs/cri-tools/pkg/benchmark" + _ "github.com/kubernetes-sigs/cri-tools/pkg/validate" ) const ( diff --git a/docs/benchmark.md b/docs/benchmark.md index ccdc45efb3..d6ff23256c 100644 --- a/docs/benchmark.md +++ b/docs/benchmark.md @@ -4,11 +4,11 @@ CRI performance benchmarking provides a benchmarking framework for CRI-compatibl ## Install -The benchmarking tests binary `critest` can be downloaded from [Releasing page](https://github.com/kubernetes-incubator/cri-tools/releases): +The benchmarking tests binary `critest` can be downloaded from [Releasing page](https://github.com/kubernetes-sigs/cri-tools/releases): ```sh VERSION="v1.11.1" -wget https://github.com/kubernetes-incubator/cri-tools/releases/download/$VERSION/critest-$VERSION-linux-amd64.tar.gz +wget https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/critest-$VERSION-linux-amd64.tar.gz sudo tar zxvf critest-$VERSION-linux-amd64.tar.gz -C /usr/local/bin rm -f critest-$VERSION-linux-amd64.tar.gz ``` @@ -17,7 +17,7 @@ For v1.0.0-alpha.0 and previous versions, Go and cri-tools source code are also ```sh # Replace branch name from version matrix in README.md -git clone https://github.com/kubernetes-incubator/cri-tools -b release-1.9 $GOPATH/src/github.com/kubernetes-incubator/cri-tools +git clone https://github.com/kubernetes-sigs/cri-tools -b release-1.9 $GOPATH/src/github.com/kubernetes-sigs/cri-tools ``` ## Running tests diff --git a/docs/crictl.md b/docs/crictl.md index eea04134e2..70a84add2a 100644 --- a/docs/crictl.md +++ b/docs/crictl.md @@ -2,15 +2,15 @@ crictl provides a CLI for CRI-compatible container runtimes. This allows the CRI runtime developers to debug their runtime without needing to set up Kubernetes components. -crictl is currently in Beta and still under quick iterations. It is hosted at the [cri-tools](https://github.com/kubernetes-incubator/cri-tools) repository. We encourage the CRI developers to report bugs or help extend the coverage by adding more functionalities. +crictl is currently in Beta and still under quick iterations. It is hosted at the [cri-tools](https://github.com/kubernetes-sigs/cri-tools) repository. We encourage the CRI developers to report bugs or help extend the coverage by adding more functionalities. ## Install crictl -crictl can be downloaded from cri-tools [release page](https://github.com/kubernetes-incubator/cri-tools/releases): +crictl can be downloaded from cri-tools [release page](https://github.com/kubernetes-sigs/cri-tools/releases): ```sh VERSION="v1.11.1" -wget https://github.com/kubernetes-incubator/cri-tools/releases/download/$VERSION/crictl-$VERSION-linux-amd64.tar.gz +wget https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-$VERSION-linux-amd64.tar.gz sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin rm -f crictl-$VERSION-linux-amd64.tar.gz ``` @@ -184,4 +184,4 @@ bin dev etc home proc root sys tmp usr var ## More information -Visit [kubernetes-incubator/cri-tools](https://github.com/kubernetes-incubator/cri-tools) for more information. +Visit [kubernetes-sigs/cri-tools](https://github.com/kubernetes-sigs/cri-tools) for more information. diff --git a/docs/validation.md b/docs/validation.md index be5cf8895f..6b0ded93e8 100644 --- a/docs/validation.md +++ b/docs/validation.md @@ -6,11 +6,11 @@ CRI validation testing is currently Alpha and still under quick iterations. We e ## Install -The benchmarking tests binary `critest` can be downloaded from [Releasing page](https://github.com/kubernetes-incubator/cri-tools/releases): +The benchmarking tests binary `critest` can be downloaded from [Releasing page](https://github.com/kubernetes-sigs/cri-tools/releases): ```sh VERSION="v1.11.1" -wget https://github.com/kubernetes-incubator/cri-tools/releases/download/$VERSION/critest-$VERSION-linux-amd64.tar.gz +wget https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/critest-$VERSION-linux-amd64.tar.gz sudo tar zxvf critest-$VERSION-linux-amd64.tar.gz -C /usr/local/bin rm -f critest-$VERSION-linux-amd64.tar.gz ``` @@ -25,7 +25,7 @@ For v1.0.0-alpha.0 and previous versions, Go and cri-tools source code are also ```sh # Replace branch name from version matrix in README.md -git clone https://github.com/kubernetes-incubator/cri-tools -b release-1.9 $GOPATH/src/github.com/kubernetes-incubator/cri-tools +git clone https://github.com/kubernetes-sigs/cri-tools -b release-1.9 $GOPATH/src/github.com/kubernetes-sigs/cri-tools ``` ## Running tests diff --git a/hack/release.sh b/hack/release.sh index e92bf49268..2735302980 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -39,7 +39,7 @@ CRI_TEST_PLATFORMS=( ) # Create releases output directory. -PROJECT="github.com/kubernetes-incubator/cri-tools" +PROJECT="github.com/kubernetes-sigs/cri-tools" CRI_TOOLS_ROOT="$GOPATH/src/$PROJECT" mkdir -p ${CRI_TOOLS_ROOT}/_output/releases diff --git a/pkg/benchmark/benchmark.go b/pkg/benchmark/benchmark.go index 1bec9760a5..bfed633e5c 100644 --- a/pkg/benchmark/benchmark.go +++ b/pkg/benchmark/benchmark.go @@ -25,7 +25,7 @@ import ( "time" "github.com/golang/glog" - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" "github.com/onsi/ginkgo/config" "github.com/onsi/ginkgo/reporters" diff --git a/pkg/benchmark/container.go b/pkg/benchmark/container.go index 42ccfee204..1a1a13fef0 100644 --- a/pkg/benchmark/container.go +++ b/pkg/benchmark/container.go @@ -17,7 +17,7 @@ limitations under the License. package benchmark import ( - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" diff --git a/pkg/benchmark/image.go b/pkg/benchmark/image.go index c9ad41a430..e33e1425f0 100644 --- a/pkg/benchmark/image.go +++ b/pkg/benchmark/image.go @@ -17,7 +17,7 @@ limitations under the License. package benchmark import ( - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" diff --git a/pkg/benchmark/pod.go b/pkg/benchmark/pod.go index eb14547212..835bb58708 100644 --- a/pkg/benchmark/pod.go +++ b/pkg/benchmark/pod.go @@ -17,7 +17,7 @@ limitations under the License. package benchmark import ( - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" diff --git a/pkg/validate/apparmor.go b/pkg/validate/apparmor.go index 21c17df9ba..fc1093c14a 100644 --- a/pkg/validate/apparmor.go +++ b/pkg/validate/apparmor.go @@ -24,7 +24,7 @@ import ( "os/exec" "time" - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" diff --git a/pkg/validate/container.go b/pkg/validate/container.go index 4897caa75e..6e5ad38cd2 100644 --- a/pkg/validate/container.go +++ b/pkg/validate/container.go @@ -28,7 +28,7 @@ import ( "time" "github.com/docker/docker/pkg/jsonlog" - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" diff --git a/pkg/validate/container_linux.go b/pkg/validate/container_linux.go index ce12832c7d..1f0401249b 100644 --- a/pkg/validate/container_linux.go +++ b/pkg/validate/container_linux.go @@ -22,7 +22,7 @@ import ( "path" "path/filepath" - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" "golang.org/x/sys/unix" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" diff --git a/pkg/validate/e2e.go b/pkg/validate/e2e.go index d94ad97f44..2deef1222c 100644 --- a/pkg/validate/e2e.go +++ b/pkg/validate/e2e.go @@ -25,7 +25,7 @@ import ( "time" "github.com/golang/glog" - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" "github.com/onsi/ginkgo/config" "github.com/onsi/ginkgo/reporters" diff --git a/pkg/validate/image.go b/pkg/validate/image.go index 0aa203f46a..d036d23e2d 100644 --- a/pkg/validate/image.go +++ b/pkg/validate/image.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" diff --git a/pkg/validate/networking.go b/pkg/validate/networking.go index 2939fc8e43..177d714452 100644 --- a/pkg/validate/networking.go +++ b/pkg/validate/networking.go @@ -21,7 +21,7 @@ import ( "strconv" "time" - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" diff --git a/pkg/validate/pod.go b/pkg/validate/pod.go index 5a084c0f89..39aa544c5a 100644 --- a/pkg/validate/pod.go +++ b/pkg/validate/pod.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" diff --git a/pkg/validate/runtime_info.go b/pkg/validate/runtime_info.go index 0a8aa28ab2..b7202bb9c7 100644 --- a/pkg/validate/runtime_info.go +++ b/pkg/validate/runtime_info.go @@ -17,7 +17,7 @@ limitations under the License. package validate import ( - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" diff --git a/pkg/validate/security_context.go b/pkg/validate/security_context.go index 7587c1f9e9..14e7c66cf5 100644 --- a/pkg/validate/security_context.go +++ b/pkg/validate/security_context.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" diff --git a/pkg/validate/selinux_linux.go b/pkg/validate/selinux_linux.go index 8864345a50..438ec3e633 100644 --- a/pkg/validate/selinux_linux.go +++ b/pkg/validate/selinux_linux.go @@ -19,7 +19,7 @@ package validate import ( "time" - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" "github.com/opencontainers/selinux/go-selinux" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" diff --git a/pkg/validate/streaming.go b/pkg/validate/streaming.go index 85728de504..ab3bd78662 100644 --- a/pkg/validate/streaming.go +++ b/pkg/validate/streaming.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/kubernetes-incubator/cri-tools/pkg/framework" + "github.com/kubernetes-sigs/cri-tools/pkg/framework" "k8s.io/client-go/rest" "k8s.io/client-go/tools/portforward" remoteclient "k8s.io/client-go/tools/remotecommand"