github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
1,444 Commits 3 Branches 2 Tags 112 MiB
effd82227c
Commit Graph

1444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
abhi
43c05efb22 Revert: Setting containerd shim cgroup same as pod cgroup 
Signed-off-by: abhi <abhi@docker.com>
 2017-12-01 16:03:38 -08:00
Mike Brown
009e40f280 correct some boilerplates 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-12-01 16:56:25 -06:00
Mike Brown
4c7974fe97 fixes for boilerplate 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-12-01 16:55:30 -06:00
Lantao Liu
cad87243e1
Merge pull request #454 from Random-Liu/revert-453 
Revert "Add gc.root back in vendored containerd client."
 2017-12-01 12:19:23 -08:00
Lantao Liu
3a0d40cc2c
Merge pull request #456 from Random-Liu/fix-shim-cgroup-change 
Move shim cgroup opts to pkg/containerd/opts.
 2017-12-01 12:18:34 -08:00
Lantao Liu
181d7d5076 Move shim cgroup opts to pkg/containerd/opts. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-01 19:18:26 +00:00
Lantao Liu
eb6cca3c49 Revert "Add gc.root back in vendored containerd client." 
This reverts commit 66ecfa70ad.

Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-01 18:43:32 +00:00
Lantao Liu
4a5431e10a
Merge pull request #451 from abhi/cgroup-shim 
Setting containerd shim cgroup same as pod cgroup
 2017-12-01 10:21:16 -08:00
abhi
0d6774f4af Setting containerd shim cgroup same as pod cgroup 
Signed-off-by: abhi <abhi@docker.com>
 2017-12-01 08:33:50 -08:00
Lantao Liu
b622aaa85d
Merge pull request #453 from Random-Liu/add-gc-root 
Add gc.root back in vendored containerd client.
 2017-11-30 21:23:04 -08:00
Lantao Liu
66ecfa70ad Add gc.root back in vendored containerd client. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-01 04:37:40 +00:00
yanxuean
fa8593ffa0 Add intergration test for truncindex 
fix #343

Signed-off-by: yason <yan.xuean@zte.com.cn>
 2017-12-01 10:06:21 +08:00
Lantao Liu
0a954e7a0d
Merge pull request #450 from Random-Liu/update-containerd 
Update containerd to fix fd leakage.
 2017-11-30 17:04:46 -08:00
Lantao Liu
76ba19d6c8
Merge pull request #449 from Random-Liu/add-ulimit-in-systemd-units 
Add LimitNPROC, LimitNOFILE and LimitCORE for containerd and cri-containerd.
 2017-11-30 17:04:01 -08:00
Lantao Liu
b47770eaee Update containerd to fix fd leakage. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-01 00:24:44 +00:00
Lantao Liu
5a17149a70 Add LimitNPROC, LimitNOFILE and LimitCORE for containerd and 
cri-containerd.

Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-01 00:16:58 +00:00
Lantao Liu
0db6e04ba1
Merge pull request #447 from Random-Liu/update-containerd 
Update containerd to fix long exec issue.
 2017-11-30 12:58:24 -08:00
Lantao Liu
5ed43ea1a3 Update containerd to fix long exec issue. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-30 19:24:14 +00:00
Lantao Liu
dc7066d23f
Merge pull request #445 from mikebrow/debug-container 
adding some verbose debug
 2017-11-30 11:15:34 -08:00
Mike Brown
33b93fb1d0 adding some verbose debug 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-11-30 09:51:03 -06:00
Lantao Liu
200ba370a3
Merge pull request #438 from yanxuean/import-lease 
add lease for importer
 2017-11-29 10:18:37 -08:00
yanxuean
089df25492 add lease for importer 
fix #389

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-11-29 14:02:54 +08:00
Lantao Liu
73bdd79cc3
Merge pull request #442 from yanxuean/upgrade-grpc 
upgrade protobuf and grpc
 2017-11-28 20:20:43 -08:00
yanxuean
9a03957090 upgrade protobuf and grpc 
fix #435

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-11-29 09:44:17 +08:00
Lantao Liu
d4ee7aacc5
Merge pull request #441 from Random-Liu/update-containerd 
Update containerd and add synchronous image deletion.
 2017-11-28 15:26:30 -08:00
Lantao Liu
5f0fba4204 Update containerd and add synchronous image deletion. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-28 22:44:25 +00:00
Mike Brown
4934098e27
Merge pull request #440 from dnephin/use-oci-package 
Use containerd.oci package
 2017-11-28 16:41:26 -06:00
Lantao Liu
6b8ffc53c3
Merge pull request #437 from cpuguy83/unpack_on_error_only 
Remove explicit unpack on all container creates
 2017-11-28 13:47:42 -08:00
Daniel Nephin
85d3bf0660 Use SpecOpts from new oci package 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-11-28 15:30:11 -05:00
Brian Goff
f6fe36d17a Remove explicit unpack on all container creates 
This only performs an unpack if there is an error when creating the
container snapshot (and only if it's a "not found' error) since it should
already be unpacked.

Signed-off-by: Brian Goff <brian.goff@docker.com>
 2017-11-28 14:28:20 -05:00
Daniel Nephin
bf5f17ac1e Update containerd vendor 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-11-28 14:09:58 -05:00
Lantao Liu
4b4714eaca
Merge pull request #432 from mikebrow/vet-fixes 
fixing vet errors
 2017-11-27 12:03:30 -08:00
Lantao Liu
80c7d18703
Merge pull request #431 from Random-Liu/update-containerd 
Update containerd
 2017-11-27 12:03:18 -08:00
Lantao Liu
1b05f088b5
Merge pull request #375 from yanxuean/image-trunc 
support get image by truncindex
 2017-11-27 11:36:58 -08:00
Lantao Liu
2e3c510c92 Update containerd to 70e0c8443f. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-27 19:24:14 +00:00
yanxuean
50cb8a0571 update containerd for refactor 
fix #423

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-11-27 19:24:14 +00:00
Mike Brown
983994dc87 fixing vet errors 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-11-27 13:13:21 -06:00
Mike Brown
34340f502d
Merge pull request #428 from antony360/fix-readme-bug 
contrib instead of contib
 2017-11-26 14:06:17 -06:00
Antoine Huret
7814230fd9 contrib instead of contib 
Signed-off-by: Antoine Huret <huret.antoine@yahoo.fr>
 2017-11-26 16:54:30 +01:00
yanxuean
b4ebf2d7a7 improve localResolve 
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-11-23 10:56:12 +08:00
yanxuean
cbe7f0dd5a use docker.digestSet store image truncid 
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-11-23 10:55:59 +08:00
Lantao Liu
18df4338e6
Merge pull request #429 from Random-Liu/update-hack-versions 
Update kubernetes version in `hack/versions`
 2017-11-22 11:42:14 -08:00
Lantao Liu
f6bc65bf7a Update kubernetes version in hack/versions 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-22 18:46:15 +00:00
Lantao Liu
6104fcba3c
Merge pull request #421 from Random-Liu/add-new-cri-log-support 
Add new cri log support
 2017-11-21 13:09:57 -08:00
Lantao Liu
48726ecd27 Add support for CRI partial log. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-21 19:24:12 +00:00
Lantao Liu
cb0d97e74c Update kubernetes version. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-21 19:24:12 +00:00
Lantao Liu
ce29d516d5
Merge pull request #427 from Random-Liu/clean-sandbox-remove 
Do not remove sandbox when netns is not closed.
 2017-11-21 10:00:36 -08:00
Lantao Liu
76268ea242 Do not remove sandbox when netns is not closed. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-21 01:22:19 +00:00
Lantao Liu
74df3cc146
Merge pull request #424 from Random-Liu/duplicate-name-test 
Should not be able to create existing sandbox/container.
 2017-11-20 11:07:33 -08:00
Lantao Liu
6ab809f712 Should not be able to create existing sandbox/container. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-20 04:05:14 +00:00