github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,778 Commits 3 Branches 2 Tags 112 MiB
498eebe860
Commit Graph

8778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Brown
1c826eb689
Merge pull request #1165 from ZYecho/fix-link 
fix: fix CRI dead link
 2019-06-11 17:16:25 +02:00
Derek McGowan
bb00872800
Add user agent header to all requests 
Currently the user agent is only being used on the initial
resolve request, then switching to the default user agent.
This ensures the correct user agent is always used. There is
a larger fix in progress which does this is a cleaner way, but
the scope of this change is fixing the user agent issue.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-06-11 22:57:58 +08: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
Wei Fu
2f69be5594
Merge pull request #3322 from crosbymichael/configs 
Add v2 server config support with plugin URIs
 2019-06-11 09:56:08 +08: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
Michael Crosby
9547d269a1 Add v2 server config support with plugin URIs 
Closes #3210

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-06-10 17:54:20 +00: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
Michael Crosby
42f4bb98ac
Merge pull request #3311 from jing-rui/shimlog 
fix shim std logs not close after shim exit
 2019-06-10 12:05:35 -04:00
Michael Crosby
94a21fc9cf
Merge pull request #3328 from carlosedp/riscv64 
Update x/sys, x/net and bbolt modules to support Risc-V architecture
 2019-06-10 12:04:14 -04: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
Jing Rui
9e0cd529d3 fix shim std logs not close after shim exit 
Signed-off-by: Jing Rui <jingrui@huawei.com>
 2019-06-10 11:50:07 +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
CarlosEDP
fb6b0ae4c6 Update x/sys, x/net and bbolt modules to support Risc-V 
Signed-off-by: CarlosEDP <me@carlosedp.com>
 2019-06-07 17:54:32 -03: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
Wei Fu
02ed02eca5
Merge pull request #3325 from crosbymichael/unmount 
Unmount rootfs with separate Remove() in bundle
 2019-06-06 11:50:03 +08: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
Michael Crosby
ed308ea1e6 Unmount rootfs with separate Remove() in bundle 
This ensures that a container does not have a mounted rootfs in the
bundle directory before RemoveAll is called.  Having the rootfs removed
first with a Remove ensures that the directory is not mounted and empty
before the bundle directory is removed.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-06-05 20:37:35 +00:00
Michael Crosby
40f54dc076
Merge pull request #3324 from crosbymichael/content-close 
Ensure close in content test
 2019-06-05 16:37:05 -04:00
Michael Crosby
cf7fb14efa Update timestamp atomic write 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-06-05 19:34:55 +00:00
Michael Crosby
4f6ba8286d Ensure close in content test 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-06-04 19:26:34 +00:00
Phil Estes
04e7747e29
Merge pull request #3321 from crosbymichael/ttrpc-namespace 
Update ttrpc for metadata and namespace support
 2019-06-04 13:46:51 -04:00
Phil Estes
15ae6b74fd
Merge pull request #3318 from hinshun/ignore-readat-eof 
Ignore EOF from ReadAt in content.ReadBlob
 2019-06-04 13:46:32 -04:00
Edgar Lee
faf925ba25 Handle EOF from ReadAt in content.ReadBlob 
Signed-off-by: Edgar Lee <edgarl@netflix.com>
 2019-06-04 10:18:36 -07:00
Michael Crosby
fa6a9f0635 Add ttrpc namespace support 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-06-04 15:21:10 +00:00
Michael Crosby
42f24b57e4 Update ttrpc to a5bd8ce9e40bc7c065a11c6936f4d032ce 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-06-04 15:14:06 +00:00
Wei Fu
faa5f55189
Merge pull request #3302 from crosbymichael/mkroot 
Ensure that the rootfs dir is created in the bundle
 2019-06-04 09:24:47 +08:00
Michael Crosby
d4e7efbb93
Merge pull request #3304 from fuweid/me-update-lease 
leases: support resource management
 2019-06-03 16:43:34 -04:00
Michael Crosby
7531c66d5a Ensure that the rootfs dir is created in the bundle 
This fixes issues running gvisor on top of containerd without docker.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-06-03 19:56:19 +00:00
Michael Crosby
7451dd1a48
Merge pull request #3308 from jterry75/handle_grpc_context_error 
Add support to gRPC errdefs for context cancel/deadline exceeded
 2019-06-03 15:35:00 -04:00
Phil Estes
48a1fca855
Merge pull request #3314 from KentaTada/fix-clone-seccomp-cgroupns 
Fix seccomp contributed profile for clone syscall
 2019-06-03 17:51:55 +01:00
Michael Crosby
2ec2089b05
Merge pull request #3123 from stefanberger/extend_apply_call_with_options_parameter 
Extend Applier's Apply() method with an optional options parameter
 2019-06-03 11:13:40 -04:00
Michael Crosby
efe6d8ddad
Merge pull request #3319 from Vanient/master 
Close file r.log after used to release resources.
 2019-06-03 10:43:27 -04:00
Danni Xia
bf24fb0cad Close file r.log after used to release resources. 
Signed-off-by: Danni Xia <xiadanni1@huawei.com>
 2019-06-04 06:41:38 +08:00
Kenta Tada
5b9a43d2e7 Fix seccomp contributed profile for clone syscall 
All clone flags for namespace should be denied.
Also x/sys should be used instead of syscall.

Signed-off-by: Kenta Tada <Kenta.Tada@sony.com>
 2019-06-03 14:23:34 +09:00
Phil Estes
1c5b384b30
Merge pull request #3313 from kevpar/service-restart-delay 
Change restart delay for Windows service to 15s
 2019-05-31 15:30:59 +01: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
Kevin Parsons
cee19d1e6e Change restart delay for Windows service to 15s 
Previously we waited for 60 seconds after the service faults to restart
it. However, there isn't much benefit to waiting this long. We expect
15 seconds to be a more reasonable delay.

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
 2019-05-29 16:41:27 -07: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
Wei Fu
8a388d6238 leases: support resource management 
Add three methods for lease service so that the client can use it to
manage the resource by lease, not just gc.root label. With the following
methods, it is easy for client to maintain their own cache system.

```
 - AddResource(context.Context, Lease, Resource) error
 - RemoveResource(context.Context, Lease, Resource) error
 - ListResources(context.Context, Lease) ([]Resource, error)
```

And the resource is to be

```golang
type Resource {
  ID   string
  Type string
}
```

For the snapshots, the Type field will be formatted by
snapshots/%{type}, like snapshots/overlayfs.

fix: #3295

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-05-29 11:00:32 +08:00
Justin Terry (VM)
ac4485c76a Add support to gRPC errdefs for context cancel/deadline exceeded 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-05-28 17:02:29 -07:00