Commit Graph

8778 Commits

Author SHA1 Message Date
Derek McGowan
8706a355dd
Merge pull request #2889 from linxiulei/isolated_content
metadata: define content sharing policy
2019-01-14 13:15:38 -08:00
Mike Brown
8976690320
Merge pull request #1021 from Random-Liu/move-no-metadata-test
Move no metadata test
2019-01-09 11:25:40 -06:00
Lantao Liu
5c40fd9585 Move no metadata test
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-09 00:12:53 -08:00
Lantao Liu
76c5b20339
Merge pull request #1019 from teawater/add_test
Add integration test for RunPodSandbox and CreateContainer
2019-01-08 11:12:53 -08:00
Hui Zhu
ab84e3914d Add integration test for RunPodSandbox and CreateContainer
Fixes: #1009

Signed-off-by: Hui Zhu <teawater@hyper.sh>
2019-01-08 12:05:48 +08:00
Michael Crosby
adfaa697a8
Merge pull request #2887 from andrey-ko/args-fix
fix oci.WithImageConfigArgs for windows
2019-01-07 17:00:25 -05:00
Michael Crosby
b5a794649a
Merge pull request #2911 from estesp/security-audit
Add security audit report to README
2019-01-07 12:01:13 -05:00
Michael Crosby
fcf5462d49
Merge pull request #2914 from jterry75/runhcs_runtime_opts
Update runhcs options to include CRI Sandbox support
2019-01-07 11:54:41 -05:00
Michael Crosby
30003c4439
Merge pull request #2910 from jterry75/shim_shutdown_error_log
Fix spurious ttrpc client shutdown error log on success
2019-01-07 11:54:07 -05:00
Lantao Liu
a7d1b3c7dc
Merge pull request #1020 from Random-Liu/add-test-for-shared-pid-multi-process-container-stop
Add test for shared pid multi-process container stop.
2019-01-05 16:50:36 -08:00
Justin Terry (VM)
bc76e01a87 Update runhcs options to include CRI Sandbox support
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-04 14:37:10 -08:00
Lantao Liu
f0f68c1032 Add test for shared pid multi-process container stop.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-04 13:16:29 -08:00
Phil Estes
a79879e9dd
Add security audit report to README
Also remove weekly development reports section from README as those are
not being produced regularly at this time.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-01-04 09:56:03 -05:00
Justin Terry (VM)
dee0945e18 Fix spurious ttrpc client shutdown error log on success
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-03 13:44:29 -08:00
Lantao Liu
a22f1c3416
Merge pull request #1017 from Random-Liu/add-unit-test
Add unit test for DisableCgroup, RestrictOOMScoreAdj.
2019-01-03 13:39:52 -08:00
Lantao Liu
b1ad4ee9b6 Add unit test for DisableCgroup, RestrictOOMScoreAdj.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-03 10:47:34 -08:00
Lantao Liu
0fa8668aa4
Merge pull request #970 from AkihiroSuda/rootless
support DisableCgroup, DisableApparmor, RestrictOOMScoreAdj
2019-01-03 10:14:22 -08:00
Lantao Liu
1fbd06479e
Merge pull request #1010 from teawater/fix_crash
Fix the issue that pod or container config file without metadata will…
2019-01-03 10:10:26 -08:00
Hui Zhu
3bfef01589 Fix the issue that pod or container config file without metadata will crash containerd
Because RunPodSandbox and CreateContainer will access metadata
without check, pod or container config file without metadata will
crash containerd.

This patch add checks to handle the issue.

Fixes: #1009

Signed-off-by: Hui Zhu <teawater@hyper.sh>
2019-01-03 11:02:10 +08:00
Akihiro Suda
231bff7f60
Merge pull request #2909 from Random-Liu/update-cri
Update cri to 4b4b2abb2e.
2019-01-03 06:48:05 +09:00
Lantao Liu
64a0046416 Update cri-tools to v1.13.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-02 12:54:55 -08:00
Akihiro Suda
cd8231ab2a support DisableCgroup, DisableApparmor, RestrictOOMScoreAdj
Add following config for supporting "rootless" mode

* DisableCgroup: disable cgroup
* DisableApparmor: disable Apparmor
* RestrictOOMScoreAdj: restrict the lower bound of OOMScoreAdj

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2019-01-03 05:12:04 +09:00
Lantao Liu
b55c9c6c35 Update cri to 4b4b2abb2e.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-02 10:50:25 -08:00
Lantao Liu
4b4b2abb2e
Merge pull request #1000 from Random-Liu/teardown-network-after-stop
Teardown sandbox network after stop.
2019-01-02 10:04:56 -08:00
Akihiro Suda
6ba92a7921
Merge pull request #2908 from JoeWrightss/patch-2
Fix annotation typo errors
2019-01-01 16:08:02 +09:00
JoeWrightss
17b77aeb0e Fix annotation typo errors
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
2018-12-31 22:40:06 +08:00
Mike Brown
888f7a03a3
Merge pull request #1013 from JoeWrightss/patch-3
Fix return error message
2018-12-30 15:57:22 -06:00
JoeWrightss
55fb3b9fce Fix return error message
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
2018-12-30 18:08:04 +08:00
Wei Fu
5137fc6f11 bugfix: support application/octet-stream during pull
Even though application/octet-stream issue has been fixed in docker,
there exists lots of images which contains the invalid mediatype.

In order to pull those images, containerd client side modifies the
manifest content before insert/update image reference.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2018-12-29 13:58:36 +08:00
Wei Fu
568b5be936 runtime: add Add/Delete method in PlatformRuntime interface
The two new method Add/Delete can allow custom plugin to add or migrate
existing task into major Runtime plugin.

close: #2888

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2018-12-29 13:56:38 +08:00
Ace-Tang
7faaa64cf9 fix: miss remove temp file in createSnapshot
```
func foo() error {

defer func() {
    if err != nil {
	...
    }
}()
...
}
```
use defer func to do something when err not nil, if foo() not use
named error, `err != nil` can not catch all errors, since when err
re-defined in if condition, it is a new variable.

Signed-off-by: Ace-Tang <aceapril@126.com>
2018-12-24 23:01:56 +08:00
Phil Estes
47b328aab7
Merge pull request #2897 from crosbymichael/atomic-delete
Ensure bundle removal is atomic
2018-12-21 08:27:43 -05:00
Eric Lin
4247f2684d metadata: define content sharing policy
This changeset modifies the metadata store to allow one to set a
"content sharing policy" that defines how blobs are shared between
namespaces in the content store.

The default mode "shared" will make blobs available in all namespaces
once it is pulled into any namespace.  The blob will be pulled into
the namespace if a writer is opened with the "Expected" digest that
is already present in the backend.

The alternative mode, "isolated" requires that clients prove they have
access to the content by providing all of the content to the ingest
before the blob is added to the namespace.

Both modes share backing data, while "shared" will reduce total
bandwidth across namespaces, at the cost of allowing access to any
blob just by knowing its digest.

Note: Most functional codes and changelog of this commit originate from
Stephen J Day <stephen.day@docker.com>, see
40455aade8

Fixes #1713 Fixes #2865

Signed-off-by: Eric Lin <linxiulei@gmail.com>
2018-12-21 15:02:21 +08:00
akolomentsev
1be86af108 add test for WithImageConfigArgs
Signed-off-by: Andrey Kolomentsev <andrey.kolomentsev@docker.com>
2018-12-20 18:15:24 -08:00
Michael Crosby
36e4dc603e Ensure bundle removal is atomic
This makes bundle removal atomic by first renaming the bundle and
working directories to a hidden path before removing the underlying
directories.

Closes #2567
Closes #2327

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-12-20 13:45:18 -05:00
Phil Estes
06e04bc5a9
Merge pull request #2830 from Ace-Tang/support_cr_without_image
cr: support checkpoint/restore without image
2018-12-20 13:24:37 -05:00
Michael Crosby
9b366b2329
Merge pull request #2894 from thaJeztah/remove_website_leftovers
docs: remove website leftovers
2018-12-20 09:21:01 -05:00
Sebastiaan van Stijn
723797d320
docs: remove website leftovers
The website content moved to the github.com/containerd/containerd.io
repository.

Commit da1fba0050 removed all website-
related content, but there were some stray files left behind.

This patch removes those files, and updates the `.editorconfig` file
to only match Markdown files.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-12-20 10:01:51 +01:00
Ace-Tang
d4ecb00f6f checkpoint: return empty image if checkpointPath exist
Signed-off-by: Ace-Tang <aceapril@126.com>
2018-12-20 14:48:44 +08:00
akolomentsev
f2344db40a do not mutate defaults in replaceOrAppendEnvValues
Signed-off-by: Andrey Kolomentsev <andrey.kolomentsev@docker.com>
2018-12-19 16:38:22 -08:00
Lantao Liu
e5bd9b62d8
Merge pull request #1003 from Random-Liu/revert-#997
Revert "Temporary fix for golang regression #29241."
2018-12-19 13:08:29 -08:00
akolomentsev
da9471fb11 fix oci.WithImageConfigArgs for windows
Signed-off-by: Andrey Kolomentsev <andrey.kolomentsev@docker.com>
2018-12-19 12:25:36 -08:00
Lantao Liu
a9f3c86cc1
Merge pull request #1004 from Random-Liu/fix-build
Install libseccomp2 based on debian version
2018-12-19 12:02:43 -08:00
Lantao Liu
26640a29eb Install libseccomp2 package based on debian version.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-12-19 11:39:26 -08:00
Lantao Liu
5d5fc154ad Revert "Temporary fix for golang regression #29241."
This reverts commit d7f6721de5.

Signed-off-by: Lantao Liu <lantaol@google.com>
2018-12-19 10:45:01 -08:00
Phil Estes
48bebbb6e0
Merge pull request #2891 from thaJeztah/revert_temp_golang_fix
Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
2018-12-19 13:34:44 -05:00
Sebastiaan van Stijn
897afeaf35
Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
This reverts commit 52de371700.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-12-19 19:05:30 +01:00
Michael Crosby
f8fcf074bd
Merge pull request #2885 from jterry75/runtime_v2_docs
Update the delete docs for Runtime V2 on Windows
2018-12-18 11:52:45 -05:00
Lantao Liu
e98e307f3f
Merge pull request #1001 from Random-Liu/update-kubernetes
Update kubernetes to v1.13.0
2018-12-17 17:27:44 -08:00
Justin Terry (VM)
0ec6526fd3 Update the delete docs for Runtime V2 on Windows
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-12-17 13:26:57 -08:00