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

1620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
d3cacff8e1 Move context cancel into defer. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-07-25 15:00:43 -07:00
Lantao Liu
74d2b6947c
Merge pull request #1152 from jterry75/deadline_exceeded 
Return gRPC codes.DeadlineExceeded for all timeout operations
 2019-07-25 14:58:29 -07:00
Mike Brown
d2986eb5aa
Merge pull request #1187 from alculquicondor/feature/tcp 
Add option to register on TCP server
 2019-07-25 16:36:05 -05:00
Lantao Liu
240e19d7ac
Merge pull request #1202 from Random-Liu/not-cache-image-handler 
Do not cache image handler.
 2019-07-25 11:57:33 -07:00
Aldo Culquicondor
4b43303203 Add option to register on TCP server 
Signed-off-by: Aldo Culquicondor <acondor@google.com>
 2019-07-25 09:42:49 -04:00
Lantao Liu
5fdb4b8eef
Merge pull request #1204 from Random-Liu/fix-ctr-readiness-check 
Fix ctr readiness check in test.
 2019-07-25 00:25:20 -07:00
Lantao Liu
0f313f977d
Merge pull request #1205 from Random-Liu/no-snat 
Remove `noSnat`
 2019-07-25 00:24:37 -07:00
Lantao Liu
deb8e82502
Merge pull request #1206 from Random-Liu/add-font-art 
Add containerd font art.
 2019-07-25 00:24:18 -07:00
Lantao Liu
0c1ff73894 Add containerd font art. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-07-24 18:06:14 -07:00
Lantao Liu
c6a3662874 Remove noSnat 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-07-24 17:35:03 -07:00
Lantao Liu
e83fe56075 Fix ctr readiness check in test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-07-24 15:38:55 -07:00
Lantao Liu
fe0cb22026 Do not cache image handler. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-07-24 15:38:18 -07:00
Lantao Liu
64bf4bebf3
Merge pull request #1188 from alculquicondor/fix/doc 
Update docs to v2 config
 2019-07-24 14:25:42 -07:00
Lantao Liu
8faf3ea063
Merge pull request #1203 from Random-Liu/update-containerd 
Update containerd for config backward compatibility.
 2019-07-24 13:40:12 -07:00
Aldo Culquicondor
e2550f6285 Update docs to v2 config 
Signed-off-by: Aldo Culquicondor <acondor@google.com>
 2019-07-24 09:30:13 -04:00
Lantao Liu
0344ac239b Update containerd for config backward compatibility. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-07-23 19:14:28 -07:00
Mike Brown
b5e9d13261
Merge pull request #1173 from mikebrow/make-update-sync-cli 
synching up a bit with containerd Makefile
 2019-07-16 17:26:56 -05:00
Mike Brown
f30af565c8
Merge pull request #1176 from mikebrow/golang-1.12 
move up to golang 1.12.x
 2019-07-16 17:03:20 -05:00
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
Justin Terry (VM)
71cecedc44 StopContainer should block unless client context is canceled 
A call to StopContainer should only return if the client context is canceled or
its deadline was exceeded. The Timeout parameter on StopContainerRequest is now
used as the time AFTER sending the stop signal before the SIGKILL is delivered.
The call will remain until the container has exited or the client context has
finished.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-07-16 09:44:23 -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
Mike Brown
98c266fb86
Merge pull request #1177 from jterry75/togrpc_errors 
Return gRPC errors from instrumentedService
 2019-07-10 20:05:26 -05:00
Justin
1312801786
Merge pull request #1194 from joedborg/patch-1 
Correcting typo
 2019-07-05 12:23:06 -07:00
Joe Borg
9ebc10ec08 Correcting typo 
`/ec/` > `/etc/`

Signed-off-by: Joe Borg <joe@josephb.org>
 2019-07-04 14:12:20 -04:00
Mike Brown
41a9176b0d
Merge pull request #1190 from odinuge/dep/cgroups 
Update dependency containerd/cgroups
 2019-07-02 16:20:24 -05:00
Mike Brown
53c2230ec0
Merge pull request #1189 from thaJeztah/bump_libseccomp 
bump libseccomp-golang v0.9.1
 2019-06-25 19:15:53 -05:00
Odin Ugedal
c8a04d0994 Update dependency containerd/cgroups 
Signed-off-by: Odin Ugedal <odin@ugedal.com>
 2019-06-25 16:58:31 +02:00
Sebastiaan van Stijn
3f49760d76
bump libseccomp-golang v0.9.1 
full diff: 32f571b700...689e3c1541

Release notes:

* Version 0.9.1 - May 21, 2019
- Minimum supported version of libseccomp bumped to v2.2.0 (fc0298087f)
  - PowerPC and S390(x) architectures are unavailable below library version v2.3.0 and will return errors if used with incompatible libraries
- Use Libseccomp's `seccomp_version` API to retrieve library version
- Unconditionally set TSync attribute for filters, due to Go's heavily threaded nature
- Fix [CVE-2017-18367](https://nvd.nist.gov/vuln/detail/CVE-2017-18367) - Multiple syscall arguments were incorrectly combined with logical-OR, instead of logical-AND (06e7a29f36)
- Fix a failure to build on Debian-based distributions due to CGo code
- Fix unit test failures on 32-bit architectures
- Improve several errors to be more verbose about their causes
- Add support for SCMP_ACT_LOG (with libseccomp versions 2.4.x and higher), permitting syscalls but logging their execution
- Add support for SCMP_FLTATR_CTL_LOG (with libseccomp versions 2.4.x and higher), logging not-allowed actions when they are denied

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-06-25 10:28:02 +02:00
Lantao Liu
eaf792ed7b
Merge pull request #1180 from Random-Liu/fix-version 
Fix runc and critools version in release.
 2019-06-21 08:37:55 -07:00
Justin Terry (VM)
cfeb2fed81 Return gRPC errors from instrumetedService 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-06-19 10:11:18 -07:00
Lantao Liu
6afd137c02 Fix runc and critools version in release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-19 08:07:04 -07:00
Lantao Liu
806c2641a1
Merge pull request #1178 from mikebrow/fix-slack-link 
use dynamic slack link
 2019-06-19 07:38:37 -07:00
Mike Brown
cdf48f2f45 use dynamic slack link 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-06-18 10:00:14 -05:00
Mike Brown
0635ecf708 move up to golang 1.12.x 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-06-13 15:41:06 -05:00
Mike Brown
00b18fd728 synching up a bit with containerd Makefile 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-06-13 15:31:45 -05:00
Lantao Liu
bb020275cb
Merge pull request #1170 from Random-Liu/remove-ctr-cri-load 
Remove ctr cri load
 2019-06-12 14:41:49 -07:00
Lantao Liu
4a417fb083
Merge pull request #1171 from Random-Liu/add-http-proxy-support 
Fix http proxy ENV when TLS is enabled.
 2019-06-12 14:40:58 -07:00
Lantao Liu
72819d68d1 Update vendor 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-12 11:18:55 -07:00
Lantao Liu
199ee362e8 Update test and run test containerd in a different directory. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-12 11:18:55 -07:00
Lantao Liu
322cd48965 Remove load image support 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-12 11:14:11 -07:00
Lantao Liu
55e5ce0e95 Fix http client when TLS is enabled. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-12 11:09:53 -07:00
Lantao Liu
78b4a39f5b
Merge pull request #1163 from Random-Liu/config-v2 
Use the new v2 config
 2019-06-12 10:29:11 -07:00
Lantao Liu
b3f733f0ad
Merge pull request #1166 from mikebrow/doc-cni-maxnum 
doc update for cni max num
 2019-06-11 10:55:28 -07:00
Lantao Liu
1275d6ded3
Merge pull request #1162 from Random-Liu/fix-image-pull 
Add cri managed image label when pulling the image.
 2019-06-11 10:51:34 -07:00
Mike Brown
1c826eb689
Merge pull request #1165 from ZYecho/fix-link 
fix: fix CRI dead link
 2019-06-11 17:16:25 +02:00
Mike Brown
3ba04c01cc doc update for cni max num 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-06-11 08:35:22 -05:00
zhangyue
397adbab85 fix: fix CRI dead link 
Signed-off-by: zhangyue <zy675793960@yeah.net>
 2019-06-11 14:49:36 +08:00
Lantao Liu
150232325e Use v2 config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-10 20:51:18 -07:00
Lantao Liu
efba8e147f Update containerd to 2f69be5594. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-10 19:34:46 -07:00
Lantao Liu
66d1870d25 Add cri managed image label when pulling the image. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-10 15:13:38 -07:00