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
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
Mike Brown
eb67aa5960
Merge pull request #1156 from Random-Liu/make-sure-exec-kill 
Make sure exec process is killed when context is canceled.
 2019-05-29 23:22:51 +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
Mike Brown
ac9f8e1c4d
Merge pull request #1153 from jterry75/max_search_error 
Update parseDNSOptions maxDNSSearches in error message
 2019-05-26 15:51:01 +02: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
Lantao Liu
d6af03abbd
Merge pull request #1146 from jterry75/forward_sandbox_to_pull 
Forward sandbox config to PullImage request
 2019-05-10 12:10:30 -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
Mike Brown
e4ebb718c6
Merge pull request #1142 from Random-Liu/better-logging-for-registry-try 
Log failed registry mirror attempt in debug.
 2019-05-09 10:04:42 -04: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
51910edf0d
Merge pull request #1140 from lifupan/fix_taskdelete 
Integration test task.Delete fix
 2019-05-08 18:21:20 -07:00
lifupan
47fc645682 Integration test task.Delete fix 
task.Delete() will try to kill the task before delete it,
but once the task is killed, the TaskExit event will also
tigger another task.Delete() which would conflict with this
test task.Delete(). To avoid this conflict, kill the task instead
of Delete it, and let TaskExit trigger task.Delete().

Signed-off-by: lifupan <lifupan@gmail.com>
 2019-05-08 12:28:22 +08:00
Lantao Liu
82ff9372ad
Merge pull request #1137 from Random-Liu/per-pod-shim 
Use per-pod shim.
 2019-04-29 15:36:34 -07:00
Lantao Liu
1626663e24 Include new go.mod file. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-29 14:06:57 -07:00
Lantao Liu
091182fdca Use per-pod shim. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-29 13:49:59 -07:00
Lantao Liu
2fc62db814
Merge pull request #1125 from Random-Liu/add-default-runtime-name 
Add default runtime name
 2019-04-25 18:48:33 -07:00
Lantao Liu
db90808477 Update doc and add deprecation policy for CRI options. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-25 16:11:16 -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
f207148811
Merge pull request #1134 from Random-Liu/use-ctr-import 
Use ctr images import.
 2019-04-16 12:09:24 -07:00
Lantao Liu
19e2b20c13 Use ctr images import. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-15 10:37:31 -07:00
Lantao Liu
a7021d687a
Merge pull request #1135 from Random-Liu/update-containerd 
Update containerd
 2019-04-12 16:07:12 -07:00
Lantao Liu
34754d4337 Add cri as required plugin. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-12 15:15:38 -07:00
Lantao Liu
603972523e Update containerd to 32e788a8be. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-12 15:13:45 -07:00
Lantao Liu
42aaca565a
Merge pull request #1129 from Random-Liu/use-v1-for-now 
Use runc.v1 for now for debugging.
 2019-04-11 10:46:09 -07:00
Lantao Liu
fa759f6a1b
Merge pull request #1130 from Random-Liu/fix-status-hang 
Update go-cni to 891c2a41e18144b2d7921f971d6c9789a68046b2.
 2019-04-10 14:35:33 -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
5e3de1f43a Use runc.v1 for now for debugging. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-09 10:58:59 -07:00
Lantao Liu
ebb0928057
Merge pull request #1124 from Random-Liu/use-golang-1-11-6 
Use golang 1.11.6 for now.
 2019-04-08 14:30:13 -07:00
Lantao Liu
c20ba1ef11 Use golang 1.11.6 for now. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-08 08:55:30 -07:00