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

1958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lantao Liu
53c71e2b10
Merge pull request #1155 from kuramal/cni_plugin_conf_file_max_num 
add cni plugin config file max num config
 2019-06-10 10:14:35 -07:00
Mike Brown
bc3b49efdf
Merge pull request #1160 from Random-Liu/remove-unused-todo 
Remove an unused TODO.
 2019-06-10 16:21:42 +02:00
kuramal
b022de5f37 add cni plugin config file max num config, set go-cni to commit 22460c0 
Signed-off-by: kuramal <linxxnil@126.com>
 2019-06-10 12:14:35 +08:00
Lantao Liu
770621fe7a
Merge pull request #1158 from mikebrow/cni-debug-update 
adds cni config data to the cri status/info
 2019-06-07 16:46:04 -07:00
Lantao Liu
09f83a337f Remove an unused TODO. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-07 15:42:04 -07:00
Lantao Liu
0a89a04a3b
Merge pull request #1144 from ungureanuvladvictor/vladu/tls-auth 
Add TLS auth registry support
 2019-06-06 16:28:59 -07:00
Vlad Ungureanu
60a58af376 Add TLS auth registry support 
Signed-off-by: Vlad Ungureanu <ungureanuvladvictor@gmail.com>
 2019-06-06 14:55:53 -07:00
Mike Brown
b87c0d74a5 adds cni config data to the cri status/info 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-06-05 16:39:45 -05:00
Mike Brown
0ab79ff849
Merge pull request #1157 from jterry75/fix_a_few_typos 
Minor typo in toCNIBandWidth
 2019-05-30 21:35:26 +02:00
Justin Terry (VM)
b8ea1fa177 Minor typo in toCNIBandWidth 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-05-30 11:51:10 -07:00
Lantao Liu
35e9f39991
Merge pull request #1151 from johscheuer/add-bandwidth-capability 
Initial support for traffic shaping
 2019-05-30 10:28:06 -07:00
Johannes M. Scheuermann
5e2e7c6f7d Correct Egress limits and remove unnecessary check 
Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>
 2019-05-30 11:44:05 +02:00