Commit Graph

11956 Commits

Author SHA1 Message Date
Lantao Liu
ceb540d823 Fix potential panic.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 22:09:58 +00:00
Mike Brown
ffea684c57 documents load image
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-05 15:57:44 -06:00
Lantao Liu
760248df77 Require ansible 2.4+.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 21:51:59 +00:00
Lantao Liu
05bcc3e88c Update makefile and all integration test
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 21:45:20 +00:00
Lantao Liu
d1e9960180 Remove standalone mode
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 21:45:20 +00:00
Derek McGowan
2b6b99b4a1
Merge pull request #2184 from kunalkushwaha/oci-error
better image config parse error.
2018-03-05 10:29:02 -08:00
Kenfe-Mickaël Laventure
a1b511fb80
Merge pull request #2177 from crosbymichael/file-io
Refactor shim to support file logging
2018-03-05 07:52:45 -08:00
Phil Estes
142ecddd0d
Merge pull request #2180 from AkihiroSuda/fix-ctr-c-create-unix
ctr: add UNIX-specific flags to `ctr c create`
2018-03-05 08:53:45 -05:00
Akihiro Suda
05513284e7 ctr: add UNIX-specific flags to ctr c create
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-03-05 15:26:03 +09:00
Akihiro Suda
125fdeff8a linux: fix runtime-root propagation
faf2781dd2 fixed the propagation for
ShimRemote but ShimLocal was not fixed in the commit.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-03-05 15:01:22 +09:00
Kunal Kushwaha
6ed4e9e106 better image config parse error.
compatible oci runtime version printed with parse error

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2018-03-05 14:04:08 +09:00
Kunal Kushwaha
3491b9ea4a Copyright header added
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2018-03-05 10:07:58 +09:00
Lantao Liu
64b098a293
Merge pull request #636 from Random-Liu/fix-default-config
Only overwrite when legacy options are specified.
2018-03-02 17:51:38 -08:00
Lantao Liu
f8fa536ff7
Merge pull request #635 from mikebrow/travis-golang-fix
fix travis golang issue
2018-03-02 17:51:25 -08:00
Lantao Liu
ef5b9d1e16 Only overwrite when legacy options are specified.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-03 01:03:34 +00:00
Mike Brown
8364abc0f3 fix travis golang issue
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-02 18:50:26 -06:00
Lantao Liu
ba6503870f
Merge pull request #637 from mikebrow/missing-tag
adds allways to ensure there is a version even if no tag
2018-03-02 16:16:03 -08:00
Mike Brown
d371d403b4 adds allways to ensure there is a version even if no tag
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-02 17:15:42 -06:00
Lantao Liu
3d382e2f5d
Merge pull request #632 from jcvenegas/tests-find-containerd-path
tests: Use path found to containerd.
2018-03-02 00:06:47 -08:00
Jose Carlos Venegas Munoz
ec05357463 tests: Use path found to containerd.
After check if containerd is intalled the command executed using sudo,
/usr/local/bin may not been in sudo secure_path, save the path where
containerd was installed and use it.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-03-01 21:50:49 -06:00
Phil Estes
e6a3dd3550
Merge pull request #2171 from ruediger-maass/resolver401
Adds handling of 401 for POST /v2/token without authentication
2018-03-01 15:31:30 -05:00
Derek McGowan
fd6335f74d
Merge pull request #2163 from AkihiroSuda/userns-mknod
archive: fix logic for skipping mknod when running in userns
2018-03-01 11:37:34 -08:00
Michael Crosby
c553882adc Refactor shim to support file logging
This changes the copyIO in the shim to support logging to files from
client requests in addition to fifos.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-03-01 14:33:23 -05:00
Lantao Liu
e186ef835d
Merge pull request #631 from Random-Liu/expose-cri-version
Expose cri version for CRI plugin.
2018-02-28 19:40:39 -08:00
Lantao Liu
36b4c05354 Report containerd version instead of cri-containerd version.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-01 01:26:37 +00:00
Lantao Liu
e4dd7c2e58 Expose cri version for CRI plugin.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-28 23:39:58 +00:00
Lantao Liu
30b840d620
Merge pull request #629 from mikebrow/golang-version-change
moving to go1.10 only
2018-02-28 13:21:28 -08:00
Phil Estes
949ddbabb5
Merge pull request #2168 from estesp/update-go-vers
Update recommended versions to Go 1.10
2018-02-28 13:17:58 -05:00
Phil Estes
b3a4e63c69
Merge pull request #2173 from AkihiroSuda/fix-shim-runtime-root
linux: propagate --runtime-root to shim properly
2018-02-28 13:17:28 -05:00
Mike Brown
c912afd7a9 moving to go1.10 only
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-02-28 10:39:10 -06:00
Akihiro Suda
faf2781dd2 linux: propagate --runtime-root to shim properly
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-28 14:15:22 +09:00
ruediger-maass
373f1e5612 Adds handling of 401 for POST /v2/token without authentication
This fix adds support for image registries that expect authentication for POST /v2/token such as used by the GET. E.g., JFrog Artifactory y has been observed to respond with a 401 (Unauthorized) in that case. Adding 401 in addition to the current handling of 405 and 404 in the resolver solves the authentication problem. Finally, this enables image pulls also for Artifactory.

Signed-off-by: Ruediger Maass <ruediger.maass@de.ibm.com>
2018-02-28 02:32:44 +00:00
Phil Estes
6aa612dfc2
Update recommended versions to Go 1.10
To match build requirements for containerd now that we are using 1.10.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-02-27 16:50:12 -08:00
Stephen Day
f334749967
Merge pull request #2165 from jessvalarezo/platforms-parse
Update Parse to return a Platform spec
2018-02-27 14:54:29 -08:00
Phil Estes
c3971b187f
Merge pull request #2164 from crosbymichael/density
Add density stress test
2018-02-27 17:27:16 -05:00
Jess Valarezo
ac8008437a update platforms Parse to return platform spec, decouple matcher
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
2018-02-27 14:21:49 -08:00
Lantao Liu
33851eb2c5
Merge pull request #618 from Random-Liu/add-generic-restart-test
Add generic restart test
2018-02-27 13:42:27 -08:00
Michael Crosby
a2ef6952f2 Add density stress test
Running the density tool will report Pss and Rss total and per container
values for shim memory usage. Values are reported in KB.

```bash
containerd-stress density --count 500
INFO[0000] pulling docker.io/library/alpine:latest
INFO[0000] generating spec from image
{"pss":421188,"rss":2439688,"pssPerContainer":842,"rssPerContainer":4879}
```

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-27 16:40:37 -05:00
Michael Crosby
fd2e1f6dec
Merge pull request #2162 from stevvooe/use-go1.10
build: bump to Go 1.10
2018-02-27 15:41:55 -05:00
Lantao Liu
e43def70c1 Fix travis test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-27 19:33:41 +00:00
Lantao Liu
31c377db6d Update containerd to 25c403415a.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-27 19:33:41 +00:00
Lantao Liu
09294fca40 Add generic restart test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-27 18:21:09 +00:00
Lantao Liu
00cd5b6a0c
Merge pull request #621 from mikebrow/golang-sync-with-containerd
adds go 1.10 to ci test
2018-02-27 10:12:00 -08:00
Lantao Liu
1617181196
Merge pull request #625 from Random-Liu/enable-log-rotation
Enable container log rotation.
2018-02-27 10:11:03 -08:00
Akihiro Suda
fffc111ba8 archive: fix logic for skipping mknod when running in userns
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-28 03:01:02 +09:00
Michael Crosby
25c403415a
Merge pull request #2151 from Random-Liu/fix-load-task
Fix task load.
2018-02-27 11:10:45 -05:00
Mike Brown
af818b7dcf
Merge pull request #622 from Random-Liu/update-support-matrix
Update support matrix.
2018-02-27 09:45:52 -06:00
Mike Brown
9810257487 adds go 1.10 to ci test
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-02-27 07:26:18 -06:00
Lantao Liu
ae7303dfbf Enable container log rotation.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-27 10:44:32 +00:00
Lantao Liu
b450950d54 Update support matrix.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-27 07:48:16 +00:00