github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
976 Commits 3 Branches 2 Tags 112 MiB
22b1d526ce
Commit Graph

976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
1fd8c2ffc3 Merge pull request #270 from Random-Liu/fix-checkpoint-recovery 
Fix checkpoint recovery.
 2017-09-22 00:48:00 -07:00
Lantao Liu
10df5f71a7 Merge pull request #212 from miaoyq/related-selinux 
Add build tags and Improve the test case of selinux
 2017-09-21 21:07:53 -07:00
Yanqiang Miao
7096027d21 Add build tags and Improve the test case of selinux 
- Add build tags
- Fixes a bug because of my negligence
- Improve the test case of selinux

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

test
 2017-09-22 11:39:32 +08:00
Lantao Liu
b50f06bb5b Merge pull request #234 from abhinandanpb/installer 
kubernetes + cri-containerd + containerd installer
 2017-09-21 18:12:19 -07:00
Lantao Liu
411c03b5c6 Merge pull request #219 from mikebrow/seccomp 
Adds seccomp support
 2017-09-21 16:06:25 -07:00
Mike Brown
78a925f57b vendor for new seccomp helpers 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-09-21 17:37:50 -05:00
Mike Brown
c0a2d152d9 adds seccomp support 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-09-21 17:22:11 -05:00
Lantao Liu
2ac9262091 Merge pull request #271 from Random-Liu/register-name-after-recover 
Should register container/sandbox name after restart.
 2017-09-21 15:10:39 -07:00
Lantao Liu
ce9d27bd94 Fix checkpoint recovery. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-21 21:10:38 +00:00
Lantao Liu
e132f9c1ea Should register container/sandbox name after restart. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-21 21:06:24 +00:00
Lantao Liu
9015b6ec68 Merge pull request #209 from Random-Liu/checkpoint-recovery 
Checkpoint recovery
 2017-09-21 11:32:49 -07:00
Lantao Liu
cc1b0b6709 Add restart recovery logic. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-21 17:59:46 +00:00
Abhinandan Prativadi
bafc7be9be kubernetes + containerd installer 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-20 22:32:09 -07:00
Lantao Liu
90d6e44c22 Merge pull request #267 from Random-Liu/fix-apparmor 
Fix apparmor empty case.
 2017-09-20 21:53:28 -07:00
Lantao Liu
dd3421c3c7 Fix apparmor empty case. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-21 04:07:39 +00:00
Lantao Liu
55a088763e Merge pull request #266 from Random-Liu/update-ocicni 
Update ocicni to fc9c77cc55795c09bf1f74b2afd92078a793a69e
 2017-09-20 16:42:24 -07:00
Lantao Liu
2907566565 Update ocicni to fc9c77cc55795c09bf1f74b2afd92078a793a69e 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-20 21:58:18 +00:00
Lantao Liu
5dbba596e6 Merge pull request #260 from yanxuean/use-containerd-extension 
Switch to containerd extension
 2017-09-20 10:36:57 -07:00
Abhinandan Prativadi
f3426cd6b9 Merge pull request #256 from abhinandanpb/crictl 
Adding crictl to install deps
 2017-09-20 09:25:33 -07:00
yanxuean
e1a7a0ea76 Switch to containerd extension 
fix #251

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-09-21 00:15:10 +08:00
Abhinandan Prativadi
e4077e915b Add crictl cli to install deps 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-20 07:38:29 -07:00
Lantao Liu
a2dbc6ec1c Merge pull request #261 from ijc/volume-copyup 
Implement volume copy up.
 2017-09-20 02:30:36 -07:00
Lantao Liu
9c533dca14 Merge pull request #262 from ijc/sandbox-getip-improvements 
Do not attempt to retrieve IP from host network namespace
 2017-09-20 02:22:07 -07:00
Ian Campbell
9c3c38d9ab Do not attempt to retrieve IP from host network namespace 
Since sandboxes which use the host network have no network namespace path this
would result in an invalid invocation of nsenter.

Rework the fetching of the sandbox to take this into account and also avoid
trying to get an IP when the network plugin is not yet ready.

Fixes #245.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-20 09:53:56 +01:00
Ian Campbell
8c6ba35038 Implement volume copy up. 
This pulls in and uses github.com/docker/docker/pkg/chrootarchive for the
actual copy up which is some battle hardened code to unpack avoiding things
like symlink traversal security issues.

However it does pull in a pretty huge pile of vendoring, including
github.com/docker/docker/pkg/reexec which we must then call at startup. It's
not immediately clear that this tradeoff is the correct one.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-20 09:52:27 +01:00
Lantao Liu
9d8f74227f Merge pull request #264 from Random-Liu/update-kubernetes 
Update Kubernetes to 14b32888de6403aa38aedc69086c5a3aff7a4ace
 2017-09-19 21:26:22 -07:00
Lantao Liu
5af5a04b6f Update Kubernetes to 14b32888de6403aa38aedc69086c5a3aff7a4ace 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-20 01:31:26 +00:00
Lantao Liu
3647ff5976 Merge pull request #263 from Random-Liu/fix-log 
Fix one line of log, we are writing not reading.
 2017-09-19 13:24:28 -07:00
Lantao Liu
45f98a0b39 Fix one line of log, we are writing not reading. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-19 18:53:45 +00:00
Lantao Liu
437131299b Merge pull request #230 from miaoyq/ensure-mount-shared-slave 
Ensure the mount point is propagated
 2017-09-19 00:56:27 -07:00
Yanqiang Miao
49eb38a5d4 Ensure the mount point is propagated 
mount with `rshared`, the host path should be shared.
mount with `rslave`, the host pash should be shared or slave.

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-09-19 14:21:21 +08:00
Lantao Liu
7d25e7a832 Merge pull request #258 from Random-Liu/gcr-private-registry 
Gcr private registry and node e2e fix
 2017-09-18 12:47:09 -07:00
Lantao Liu
7f8f563019 Enable gcr private registry node e2e test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-18 18:19:26 +00:00
Lantao Liu
91ca178275 Update containerd to include the gcr private registry fix 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-18 18:19:26 +00:00
Lantao Liu
a8d4940285 Merge pull request #227 from yanxuean/tomldefault 
Add a default config file
 2017-09-17 22:38:40 -07:00
Lantao Liu
06a305d7ea Merge pull request #255 from Random-Liu/use-config-in-service 
Use config in service.
 2017-09-17 22:37:06 -07:00
yanxuean
c24a5db242 Add a default config file 
fix #226

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-09-18 08:57:10 +08:00
Lantao Liu
c61757986e Merge pull request #253 from Random-Liu/format-code-a-bit 
Format the code a bit.
 2017-09-17 12:23:57 -07:00
Lantao Liu
8a03d551da Merge pull request #252 from abhinandanpb/rshared 
Setting rootfs mount propagation if the mount type is rshared/shared
 2017-09-17 12:23:39 -07:00
Abhinandan Prativadi
abba4e22f6 Setting rootfspropagation if the mount type shared or slave 
This is needed by runc to mount volume for containers that expect
biderectional file updates or host to container updates.

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-09-17 09:59:45 -07:00
Lantao Liu
71b0d0a043 Use config in service. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-17 06:46:40 +00:00
Lantao Liu
3f305e2cf4 Format the code a bit. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-17 03:22:21 +00:00
Lantao Liu
da31647ef8 Merge pull request #247 from ijc/volumes-support 
Add image volume support.
 2017-09-15 14:33:27 -07:00
Lantao Liu
cd27050425 Add image volume support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-15 11:25:55 +01:00
Ian Campbell
e0079125d2 Move resolveSymbolicLink to OS package and stub out for tests 
Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-15 11:25:45 +01:00
Ian Campbell
56539bd3a4 Require generateContainerSpec passes during tests and abort if not 
This is achieved by switching `assert.NoError` to `require.NoError` in several
places.

Otherwise the test code will continue and dereference a nil spec, leading to a
panic which obscures the real failure.

Signed-off-by: Ian Campbell <ijc@docker.com>
 2017-09-15 11:06:25 +01:00
Lantao Liu
3ac019fa36 Merge pull request #244 from mikebrow/containerd-update-9-13 
update vendor for containerd, cri-tools, and runc
 2017-09-14 13:59:45 -07:00
Mike Brown
8310fb4bfd update vendor 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-09-14 12:24:00 -05:00
Lantao Liu
5b44da76e8 Merge pull request #242 from Random-Liu/follow-symlink-for-mount 
Follow symlink for mount host path.
 2017-09-12 11:17:31 -07:00
Lantao Liu
1fadb5e573 Follow symlink for mount host path. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-09-12 07:12:03 +00:00