Commit Graph

8778 Commits

Author SHA1 Message Date
Phil Estes
def3069a67
Merge pull request #2245 from darrenstahlmsft/CloseFail
Make hcsshim layerwriter close a fatal error
2018-03-29 11:55:57 -04:00
Tobias Klauser
a74903a307 Drop libapparmor dependency from runc build docs
As of opencontainers/runc@db093f621f runc
no longer depends on libapparmor thus libapparmor-dev no longer needs to
be installed to build it. Adjust the documentation accordingly.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2018-03-29 09:18:45 +02:00
Darren Stahl
84f6fce240 Make hcsshim layerwriter close a fatal error
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-03-28 18:02:45 -07:00
Justin Cormack
9435aeeb30
The set of bounding capabilities is the largest group
No capabilities can be granted outside the bounding set, so there
is no point looking at any other set for the largest scope.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-03-28 17:36:46 -07:00
Lantao Liu
f99f0be5ae
Merge pull request #707 from Random-Liu/fix-log-output
Fix a log output.
2018-03-28 16:18:58 -07:00
Lantao Liu
0fc1372b77
Merge pull request #706 from tkellen/patch-1
fully specify --container-runtime-endpoint flag
2018-03-28 16:18:44 -07:00
Lantao Liu
71c8b6b9e0
Merge pull request #704 from Random-Liu/use-systemd
Use systemd service cgroup and oom score adj.
2018-03-28 14:53:24 -07:00
Lantao Liu
be43ad09da Fix a log output.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-28 21:31:44 +00:00
Tyler Kellen
11189f6e8b fully specify --container-runtime-endpoint flag
Resolves this warning:
"/run/containerd/containerd.sock" as endpoint is deprecated please
consider using full url format "unix:///run/containerd/containerd.sock"

Signed-off-by: Tyler Kellen <tyler@sleekcode.net>
2018-03-28 17:23:43 -04:00
Stephen Day
79963209f6
Merge pull request #2239 from estesp/fix-test-typeurl
Fix typo in metadata test typeurl string
2018-03-28 12:05:29 -07:00
Lantao Liu
2073d270a5
Merge pull request #705 from Random-Liu/update-vendors
Update cri-tools, containerd and kubernetes version.
2018-03-28 09:56:53 -07:00
Phil Estes
dd1085c922
Fix typo in metadata test typeurl string
Incorrectly spelled "containerd" in test string.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-03-28 12:35:42 -04:00
Phil Estes
fec0a1ba89
Merge pull request #2237 from dmcgowan/fix-pull-uncompressed-label
client/pull: fix label being put on snapshot instead of content
2018-03-28 12:32:28 -04:00
Phil Estes
bfa7e59cba
Merge pull request #2236 from dmcgowan/update-releases-md
Add CRI API to releases file
2018-03-28 09:27:42 -04:00
Derek McGowan
d608e3d9dc
Fix label being put on snapshot instead of content
The uncompressed label should be placed on content instead
of snapshots. Currently the uncompressed label is getting
passed into as a label option for apply, which is used to commit
snapshots. The content is already committed, but after apply
the uncompressed diff digest is verified and can be reliably used
to update the content with the label.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-27 17:55:35 -07:00
Lantao Liu
bb480ceabd Update cri-tools, containerd and kubernetes version.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-28 00:45:01 +00:00
Lantao Liu
ddda05211b Use systemd service cgroup and oom score adj.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-28 00:30:59 +00:00
Derek McGowan
e0424e2c76
Add CRI API to releases file
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-27 16:33:47 -07:00
Derek McGowan
7833fb49fd
Merge pull request #2225 from dmcgowan/prepare-1.1.0-rc0
Prepare 1.1.0-rc.0 release
2018-03-27 09:19:04 -07:00
Derek McGowan
92198a60c5
Prepare 1.1.0-rc.0 release
Add the release notes and update release docs.
Increments version number.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-27 00:10:41 -07:00
Derek McGowan
ea37521fda
Merge pull request #2233 from Random-Liu/update-cri
Update cri to v1.0.0-rc.0
2018-03-27 00:06:34 -07:00
Lantao Liu
74e45c0392 Update cri validation test version.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-27 05:15:14 +00:00
Lantao Liu
896e347000
Merge pull request #701 from Random-Liu/fix-event-monitor-panic
Fix event monitor panic.
2018-03-26 20:59:10 -07:00
Lantao Liu
277edb2d3b Fix event monitor panic.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-27 01:41:35 +00:00
Lantao Liu
8958b489ba Update to cri v1.0.0-rc.0
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-26 22:24:25 +00:00
Stephen Day
2aa2aecbb3
Merge pull request #2229 from stevvooe/timeout-fifo-creation
linux/prox: timeout fifo creation
2018-03-26 12:37:41 -07:00
Derek McGowan
ad6d02b881
Merge pull request #2221 from AkihiroSuda/content-small-blob
services/content: fix reading a blob which is smaller than the read buffer
2018-03-26 10:43:23 -07:00
Lantao Liu
796cae72d8
Merge pull request #700 from Random-Liu/update-pause-image
Use pause image from new source.
2018-03-26 10:26:39 -07:00
Stephen J Day
a76f230984
content/testsuite: include small blob test in standard suite
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-26 08:39:39 -07:00
Michael Crosby
a0c1abba47
Merge pull request #2228 from stevvooe/allow-configuration-msg-size
server: allow configuration default send/recv message sizes
2018-03-26 11:26:44 -04:00
Lantao Liu
f0655ecfe0 Use pause image from new source.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-26 07:11:41 +00:00
Lantao Liu
356a41c424
Merge pull request #697 from Random-Liu/fs-layout-change
adds volatile state directory to the fs plan for cntrs/pods/fifo
2018-03-23 19:24:19 -07:00
Lantao Liu
f4c9ef2647 Add symlink follow into unmount util.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-24 01:25:31 +00:00
Mike Brown
94df315de8 adds volatile state directory to the fs plan for cntrs/pods/fifo
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-24 00:05:52 +00:00
Lantao Liu
2ab611a2f2
Merge pull request #698 from Random-Liu/update-dependencies
Update dependencies
2018-03-23 16:48:14 -07:00
Stephen J Day
acc71293c5
server: allow configuration default send/recv message sizes
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-23 16:17:23 -07:00
Lantao Liu
aa83a7a0aa Change for new containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-23 23:03:16 +00:00
Lantao Liu
e5f6cbce51 Update kubernetes to v1.10.0-rc.1
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-23 23:03:07 +00:00
Lantao Liu
776929c52e Update containerd to 8a7e17ef96
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-23 23:03:00 +00:00
Stephen J Day
9754696ff5
linux/prox: timeout fifo creation
Under certain conditions in the client, the fifo for a container may not
be created. A timeout has been added to this operation to ensure the
shim can recover when the client fails to open the fifos.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-23 14:53:13 -07:00
Lantao Liu
205892d935
Merge pull request #696 from Random-Liu/update-document
Update documents.
2018-03-23 14:47:33 -07:00
Lantao Liu
b05744478a Update documents.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-23 21:03:46 +00:00
Derek McGowan
8a7e17ef96
Merge pull request #2227 from stevvooe/include-aufs-default
cmd/containerd: include aufs by default
2018-03-23 12:33:04 -07:00
Stephen J Day
ab8e05ac50
cmd/containerd: include aufs by default
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-23 11:27:12 -07:00
Michael Crosby
3e8e9d3ed7
Merge pull request #2223 from dmcgowan/with-lease-context
lease: pass in context to lease done function in client
2018-03-23 10:27:39 -04:00
Lantao Liu
7f64f9b85c
Merge pull request #695 from miaoyq/add-doc-for-config
Add a document for cri plugin config
2018-03-23 00:55:26 -07:00
Yanqiang Miao
559581e18a Add a document for cri plugin config
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2018-03-23 15:08:58 +08:00
Lantao Liu
c6fecb2115
Merge pull request #688 from Random-Liu/cleanup-kata-code
Address comments for privileged runtime code.
2018-03-22 23:01:31 -07:00
Akihiro Suda
7b323b1402 services/content: fix reading a blob which is smaller than the read buffer.
The newly added test fails without this fix in services/content/service.go:

    $ go test -c . && sudo ./containerd.test -test.v -test.root -test.run TestContentClient
    ...
        --- FAIL: TestContentClient/SmallBlob (0.02s)
            provideringester.go:62: rpc error: code = OutOfRange desc = read
    past object length 6 bytes
            helpers.go:67: drwx------       4096
    /tmp/content-suite-ContentClient-286788688
    FAIL

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-03-23 12:51:28 +09:00
Lantao Liu
ca67f94ee0 Address comments for privileged runtime code.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-23 02:17:46 +00:00