github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
1,577 Commits 3 Branches 4 Tags
fe5eb76cb488e186584bbe923d61099d2c4b0f28
Commit Graph

38 Commits

Author SHA1 Message Date
Justin Terry (VM)
7b0c78bacd ExecSync should block unless client context is canceled 
A call to ExecSync should only return if the client context was canceled or
exceeded. The Timeout parameter to ExecSyncRequest is now used to send SIGKILL
if the exec'd process does not exit within Timeout but all paths wait for the
exec to exit.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-07-16 09:47:55 -07:00
Lantao Liu
d257c16dbc Make sure exec process is killed when context is canceled. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-05-28 12:25:03 -07:00
Justin Terry (VM)
c1468cdeec Move from unix to syscall package for SIG* signals 
To support cross compilation for SIG* signals perfer the syscall package over
the unix package.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-05-10 11:50:45 -07:00
Michael Crosby
5eddc1a2cc Use container'd oci opts for spec generation 
This bumps the containerd and sys packages in CRI

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Remove runtime-tools

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Update tests for oci opts package

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-03-27 16:57:04 -04:00
Filipe Brandenburger
01d77d44f5 Update github.com/opencontainers/runtime-tools to v0.6.0 
Also add new dependencies on github.com/xeipuuv/gojson* (brought up by
new runtime-tools) and adapt the containerd/cri code to replace the APIs
that were removed by runtime-tools.

In particular, add new helpers to handle the capabilities, since
runtime-tools now split them into separate sets of functions for each
capability set.

Replace g.Spec() with g.Config since g.Spec() has been deprecated in the
runtime-tools API.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
 2018-06-20 13:52:50 -07: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
387da59ee5 Rename all variables to remove "cricontainerd". 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-19 21:59:32 +00:00
Lantao Liu
e1fe1abff0 Use github.com/pkg/errors 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-17 02:24:38 +00:00
Mike Brown
d4e7154625 move links for cri-containerd to cri 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-03-13 17:06:26 -05:00
Lantao Liu
f01c6d73a6 Fix cleanup context. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-07 07:05:27 +00:00
Lantao Liu
605b4a7b6a Update imports 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-08 02:45:44 +00:00
Lantao Liu
3d68005c04 Replace glog with logrus 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-17 21:57:31 +00:00
Lantao Liu
025ffe551f Rename kubernetes-incubator/cri-containerd to containerd/cri-containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-10 22:35:33 +00:00
Lantao Liu
31bc964195 Enable HostSpecific option in runtime-tools generator. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-03 19:04:47 +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
Lantao Liu
3557cffbbb Fix container exec 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-10 21:03:29 +00:00
Lantao Liu
eec818e6ab Various fixes for container streaming. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-06 20:50:50 +00:00
Lantao Liu
61d598d00f Merge pull request #235 from yanxuean/truncindex 
Add Truncindex for container, sandbox and image
 2017-10-11 21:03:16 -07:00
yanxuean
5ee3423820 add truncindex 
fix #222

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-10-12 10:32:20 +08:00
Lantao Liu
e78c85f76b Use new container update function 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-06 17:57:26 +00:00
Lantao Liu
a81a47bf9b Fix update container resources 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-03 06:03:39 +00:00
Lantao Liu
73bb9696e8 Merge pull request #151 from Random-Liu/add-instrumented-service 
Add instrumented service.
 2017-08-24 11:26:39 -07:00
Lantao Liu
c6191122f2 Merge pull request #163 from abhinandanpb/containerd-alpha6 
Updating to container1.0-alpha
 2017-08-24 10:43:43 -07:00
Abhinandan Prativadi
728dced6a1 Updating to container1.0-alpha 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-08-23 23:17:21 -07:00
Lantao Liu
45ee2e554a Add container attach support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-23 23:48:31 +00:00
Lantao Liu
77b703f1e7 Move generateID to util. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-23 23:46:55 +00:00
Lantao Liu
195b52500f Add instrumented service. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-23 07:02:12 +00:00
Lantao Liu
ed640d3972 Some cleanup after switching to new client. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-18 21:04:38 +00:00
Lantao Liu
54286313ce Add container Exec support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-07 22:49:06 +00:00
Lantao Liu
8b56c91ec5 Extract execInContainer 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-07 22:35:50 +00:00
Lantao Liu
bf270fae1c Use containerd client for container execsync. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-04 18:32:39 +00:00
Mike Brown
73748840da Swicth to 1.0.0-alpha2 containerd api. 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-08-02 23:21:37 +00:00
Lantao Liu
7b16a35287 Use new metadata store. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-07-28 23:35:31 +00:00
Random-Liu
b398a161de Get runtime spec from container metadata. 
Signed-off-by: Random-Liu <lantaol@google.com>
 2017-07-28 16:26:20 +00:00
Lantao Liu
862d00a21c Update CRI to d779e9c9561b732adf06263c5424889e7564fdbd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-21 01:56:13 +00:00
Lantao Liu
9b79201aa5 Add ExecSync. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-16 22:28:48 +00:00
Crazykev
49e7ef2153 update kubernetes vendor for new CRI change 
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
 2017-05-24 10:25:55 +08:00
Random-Liu
f2925f58ac Add initial code framework 2017-04-14 19:04:26 -07:00