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

614 Commits

Author SHA1 Message Date
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
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
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
Lantao Liu
150232325e Use v2 config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-10 20:51:18 -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
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
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
Johannes M. Scheuermann
4f0948eed5 Remove capitalized letter in error message 
Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>
 2019-05-29 08:20:21 +02: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)
f544955e4a Update parseDNSOptions maxDNSSearches in error message 
Minor correctness. We should use the value of the const in the error message
instead of hard coding it in the string so if maxDNSSearches ever changes so
does the error.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-05-24 14:42:56 -07:00
Johannes M. Scheuermann
0d439c3474 Implement bandwidth capabilties 
Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>
 2019-05-24 10:29:52 +02:00
Johannes M. Scheuermann
42eb3c49af Initial support for traffic shaping 
Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>
 2019-05-24 09:01:02 +02:00
Lantao Liu
6e14e01307 Merge pull request #1148 from congliu01/log 
Override container log path to empty if either of sandbox log directory or container log path is empty.
 2019-05-14 15:50:20 -07:00
Cong Liu
fda2902f30 Validate log paths in sandbox and container config. 
Only compose full container log path if neither of the paths is empty. Otherwise container won't start properly.

Signed-off-by: Cong Liu <conliu@google.com>
 2019-05-14 13:46:52 -04:00
Lantao Liu
ebce49f0ea Merge pull request #1145 from jterry75/fix_typo 
Fix typo in WithoutRunMount
 2019-05-12 23:55:06 -07:00
Justin Terry (VM)
8ba5c02f8f Fix typo in WithoutRunMount 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-05-10 13:30:22 -07:00
Lantao Liu
179ca59478 Merge pull request #1147 from jterry75/unix_to_syscall_signal 
Move from unix to syscall package for SIG* signals
 2019-05-10 13:14:10 -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
Justin Terry (VM)
bc445d7595 Forward sandbox config to PullImage request 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-05-10 11:35:09 -07:00
Lantao Liu
4037806184 Log failed registry mirror attempt in debug. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-05-08 23:56:29 -07:00
Lantao Liu
ba4a04ae70 Add DefaultRuntimeName option. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-18 11:18:25 -07:00
Lantao Liu
a5c5d55c90 Merge pull request #1133 from Random-Liu/use-wait 
Use wait instead of `TaskExit`.
 2019-04-18 11:10:21 -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
e425bd019a Update go-cni to 891c2a41e18144b2d7921f971d6c9789a68046b2. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-10 12:07:59 -07:00
Lantao Liu
fae4f79060 Enable runc.v2 as the default runtime in test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-03 18:47:25 -07:00
Lantao Liu
b23b406fed Merge pull request #1102 from Random-Liu/uts-namespace-and-fix-array 
Uts namespace and fix array
 2019-04-01 09:22:37 -07:00
Sebastiaan van Stijn
7b397f0322 bump opencontainers/selinux to v1.2 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-03-29 01:33:35 +01:00
Lantao Liu
4b4182cf59 Do not assume there is no duplicated elements in arrays. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-28 13:05:55 -07:00
Lantao Liu
9bd49c98c6 No UTS namespace for hostnetwork. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-27 15:07:36 -07:00
Lantao Liu
8777224600 Merge pull request #1099 from Random-Liu/do-not-kill-if-cancelled 
Do not SIGKILL container if container stop is cancelled.
 2019-03-27 14:55:18 -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
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
238658719f Cleanup pod annotation test and only support tailing wildcard. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-25 12:54:34 -07:00
Harshal Patil
effd82227c Add support for passing sandbox annotations to runtime 
Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
 2019-03-21 14:38:14 +05:30
Mike Brown
bf4e7a885c test filtering of container create masks when privileged 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-03-14 08:17:56 -05:00
Lantao Liu
3691cb6550 Fix /etc/hostname backward compatibility issue for in-place upgrade. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-03-12 01:17:41 -07:00
Lantao Liu
25442a865c Merge pull request #1080 from zhsj/rm-partial-docker 
Use ParseSignal and AtomicWriteFile functions from containerd
 2019-03-08 10:53:05 -08:00
Lantao Liu
8a0bd84b9a Merge pull request #1056 from Random-Liu/add-sandbox-log-dir-annotation 
Add an OCI annotation for sandbox log directory.
 2019-03-08 01:32:38 -08:00