Commit Graph

55 Commits

Author SHA1 Message Date
Lantao Liu
c1ece0c801 Address comment.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-19 14:05:28 -07:00
Antonio Ojea
fcd6bf318b Report Additional POD IPs
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-18 17:21:37 -07:00
Lantao Liu
50c73e6dc5 Move unix specific logic into _unix.go
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-03 16:23:42 -07:00
Lantao Liu
28aef2fe38 Support CNI DNS capabilities.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-22 14:29:04 -07:00
Michael Crosby
3995efc7c1 Update cni and go-cni to the v0.7.1 release
Closes #1236

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-14 16:19:37 +00:00
Justin Terry (VM)
193918b702 Switch to containerd/log package
Moves to the containerd/log package over logrus directly. This benefits the
traces because if using any log context such as OpenCensus on the entry gRPC
API all traces for that gRPC method will now contain the appropriate TraceID,
SpanID for easy correlation.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-08-07 12:18:18 -07:00
Lantao Liu
ba8788c6b9 Update kubernetes dependency to 1.15.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-07-31 23:52:03 -07:00
Justin Terry (VM)
d7c3ecd0fb RunPodSandbox should block unless client context is canceled
A call to RunPodSandbox should only return timeout if the operation has timed
out because the clients context deadline was exceeded. On client cancelation
it should return gRPC Canceled otherwise it should block until the sandbox has
exited.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-07-16 09:35:56 -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
Lantao Liu
d1f9611cb0 Use wait instead of TaskExit.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-04-18 00:18:26 -07:00
Lantao Liu
1a0228d520 Do not SIGKILL container if container stop is cancelled.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-03-27 00:49:41 -07:00
Lantao Liu
83af4dad87 Support unknown state for sandbox and container
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-02-05 11:56:24 -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
JoeWrightss
55fb3b9fce Fix return error message
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
2018-12-30 18:08:04 +08:00
Lantao Liu
fbab182e5e Teardown sandbox network after stop.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-12-14 15:52:17 -08:00
Lantao Liu
de967051d4 Fix kill when shared pid namespace.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-12-04 01:53:09 -08:00
Lantao Liu
c1740d8291 Manage mount lifecycle and remove cached state
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-10-24 11:00:25 -07:00
Lantao Liu
c39f63eaf4 Teardown pod network even if the network namespace is closed
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-10-10 13:10:18 -07:00
Lantao Liu
bca304ff3e Fix an issue that container/sandbox can't be stopped.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-08-24 18:54:08 -07:00
Lantao Liu
856534c846 Fix sandbox stop race condition.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-18 10:12:33 -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
abhi
92110e1d74 Moving to use go-cni library from containerd
This fix aims to use the cni library form containerd.
The library avoid usage of nsenter.

Signed-off-by: abhi <abhi@docker.com>
2018-03-14 19:25:54 -07: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
605b4a7b6a Update imports
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-08 02:45:44 +00:00
Yanqiang Miao
61c1fdb098 Use channel to propagate the stop info of sandbox
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2018-01-26 16:58:13 +08:00
Lantao Liu
df58d6825d Avoid containerd access as much as possible.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-25 23:36:00 +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
cc1b0b6709 Add restart recovery logic.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-21 17:59:46 +00: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
f36ef46b35 Use new ocicni.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-07 00:14:12 +00:00
Lantao Liu
fda30c3ad2 Do not teardown when network namespace is removed already.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-28 05:10:30 +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
Abhinandan Prativadi
5a119200b8 Creating permanent sandbox namespace
This commit contains changes to create/delete permanent namespace
for a sandbox container.

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-08-24 10:43:42 -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
195b52500f Add instrumented service.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-23 07:02:12 +00:00
Lantao Liu
f6d99abcf4 Add hostport support
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-23 01:33:02 +00:00
Abhinandan Prativadi
32e0313418 Containerd client integration
This commit:
1) Replaces the usage of containerd GRPC APIs with the containerd client for all operations related to containerd.
2) Updated containerd to v1.0alpha4+
3) Updated runc to v1.0.0

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-08-16 14:43:22 -07: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
Lantao Liu
4317e6119a Remove sandbox truncindex.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-07-28 23:35:31 +00:00
Lantao Liu
4c48ad780f Do not teardown network namespace when using host network.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-29 01:30:04 +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
53367bbd14 Stop/remove all containers when stop/remove sandbox.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-16 17:19:19 +00:00
Lantao Liu
7f9e0262ad Unmount /dev/shm when stop sandbox.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-16 17:18:14 +00:00
Lantao Liu
6ca9c65578 Rename more container to task.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-16 02:34:43 +00:00
Mike Brown
484a326717 modify code to compile on updated containerd
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-06-15 23:14:21 +00:00
Lantao Liu
60e28a9460 Minor cleanup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-05-27 00:31:30 +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