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

76 Commits

Author SHA1 Message Date
ktock
c1b7bcf395 Enable to pass additional handler on pull for stargz-based remote snapshots 
Throughout container lifecycle, pulling image is one of the time-consuming
steps. Recently, containerd community started to tackle this issue with
stargz-based remote snapshots, as a non-core
subproject(https://github.com/containerd/stargz-snapshotter).

This snapshotter is implemented as a standard proxy plugin but it requires the
client to pass some additional information (image ref and layer digest) for each
pull operation to query layer contents on the registry. Stargz snapshotter
project provides an image handler to do this and stargz snapshot users need to
pass this handler to containerd client.

This commit enables to use stargz-based remote snapshots through CRI by passing
the handler to containerd client on pull operation.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-04-16 20:53:52 +09:00
Shengjing Zhu
4263229a7b Replace docker/distribution/reference with containerd/reference/docker 
Since https://github.com/containerd/containerd/pull/3728
The docker/distribution/reference package is copied into containerd core

Signed-off-by: Shengjing Zhu <i@zhsj.me>
 2020-04-16 03:29:58 +08:00
Brandon Lum
8d5a8355d0 Updated docs and code for default nil behavior 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-27 23:42:03 +00:00
Brandon Lum
ffcef9dc32 Addressed nits 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum
c43a7588f6 Refactor encrypted opts and added unit test 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Brandon Lum
f0579c7b4d Implmented node key model for image encryption 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-02-24 20:45:57 +00:00
Lantao Liu
ab6701bd11 Add insecure_skip_verify option. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-11-26 13:25:52 -08:00
Erik Wilson
7cc3938717 Set default scheme in registryEndpoints for host 
Signed-off-by: Erik Wilson <Erik.E.Wilson@gmail.com>
 2019-10-31 10:30:17 -07:00
Lantao Liu
65b9c31805 Use http for localhost, 127.0.0.1 and ::1 by default. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-10-28 19:07:43 -07:00
Nishchay
f41675d234
fix: support empty auth config for anonymous registry 
- empty username means caller wants to use no credentials, typically for anonymous registry
- Fixes https://github.com/containerd/cri/issues/1249

Signed-off-by: Nishchay Kumar <mrawesomenix@gmail.com>
 2019-08-28 10:24:31 -07:00
Lantao Liu
81ca274c6f Add wildcard mirror support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-08-13 12:02:57 -07:00
Lantao Liu
8021850e91
Merge pull request #1233 from AkihiroSuda/allow-ca-without-client-certs 
allow non-mutual TLS
 2019-08-11 17:07:57 -07:00
Lantao Liu
fd6c732cd7
Merge pull request #1232 from Random-Liu/avoid-schema1-roundtrip 
Remove extra roundtrip for checking schema1.
 2019-08-10 10:25:46 -07:00
Akihiro Suda
28e492fce0 allow non-mutual TLS 
Previously, client keypair had needed to be specified even when unused.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-08-10 21:48:03 +09:00
Lantao Liu
d64fa3b6b8 Remove extra roundtrip for checking schema1. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-08-09 18:47:40 -07:00
Lantao Liu
005f9f7378 Consider endpoint path when checking default host. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-08-09 18:22:08 -07:00
Lantao Liu
53e94c6753 Use containerd registry mirror library. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-08-09 14:39:30 -07:00
Justin Terry (VM)
193918b702 Switch to containerd/log package 
Moves to the containerd/log package over logrus directly. This benefits the
traces because if using any log context such as OpenCensus on the entry gRPC
API all traces for that gRPC method will now contain the appropriate TraceID,
SpanID for easy correlation.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-08-07 12:18:18 -07:00
Lantao Liu
ba8788c6b9 Update kubernetes dependency to 1.15.0. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-07-31 23:52:03 -07:00
Lantao Liu
c78caf902d Add max concurrent downloads support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-07-26 18:15:17 -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
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
Vlad Ungureanu
60a58af376 Add TLS auth registry support 
Signed-off-by: Vlad Ungureanu <ungureanuvladvictor@gmail.com>
 2019-06-06 14:55:53 -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
Sebastiaan van Stijn
51affb8839
Replace util.NormalizeImageRef with reference.ParseDockerRef 
Using the utility caused other project to have containerd/cri
as a dependency, only for this utility. The new `reference.ParseDockerRef`
function does the same (it's a copy of this function).

Tests were kept for now, but could be removed in future.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-02-07 13:22:58 +01:00
JoeWrightss
d53bcba991 Fix some typo errors 
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
 2018-12-11 22:13:03 +08:00
Lantao Liu
3e4cf68a3f Use Authorizer. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-10-08 15:16:15 -07:00
Lantao Liu
db68300a5a Manage unmanaged images in k8s.io namespace 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-27 11:19:11 -07:00
Lantao Liu
953d67d250 Create image reference cache. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-09-10 11:30:52 -07:00
Lantao Liu
952e53bf58 Add registry auth config, and use docker resolver in containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-07-09 19:08:48 -07:00
Wei Fu
e28b77c08c Remove useless error-check in createImageReference 
Signed-off-by: Wei Fu <fhfuwei@163.com>
 2018-05-25 10:23:13 +08:00
Lantao Liu
60b0d08a6f Use containerd.WithPullUnpack. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-23 12:39:14 -07:00
Lantao Liu
387da59ee5 Rename all variables to remove "cricontainerd". 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-19 21:59:32 +00:00
Lantao Liu
e1fe1abff0 Use github.com/pkg/errors 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-03-17 02:24:38 +00:00
Mike Brown
d4e7154625 move links for cri-containerd to cri 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-03-13 17:06:26 -05:00
Lantao Liu
605b4a7b6a Update imports 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-08 02:45:44 +00:00
abhi
f3ccd85891 Adding Registry Mirror support 
This commit aims to add registy mirror support similar to
docker. The UI is similar to docker where user can
provide mirror urls and the image resolves against the provided
mirrors before fetching from default docker regitry mirror url.

Signed-off-by: abhi <abhi@docker.com>
 2018-01-31 10:47:34 -08:00
Lantao Liu
3d68005c04 Replace glog with logrus 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-17 21:57:31 +00:00
Lantao Liu
025ffe551f Rename kubernetes-incubator/cri-containerd to containerd/cri-containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-10 22:35:33 +00:00
Lantao Liu
a9c7237e67
Merge pull request #470 from mikebrow/debug-image 
adding info map for verbose image status
 2017-12-12 15:09:57 -08:00
Mike Brown
31223fd5b1 adds oci image spec to image info placed into imagestore 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-12-12 15:58:07 -06:00
yason
5f6d9a5fcc reliably remove image when content missing 
Signed-off-by: yason <yan.xuean@zte.com.cn>
 2017-12-12 18:44:59 +08:00
yason
4762b3e273 remove taskService and imageStoreService 
Signed-off-by: yason <yan.xuean@zte.com.cn>
 2017-12-12 16:51:22 +08:00
yason
41c8763e2b improve calling for content 
Signed-off-by: yason <yan.xuean@zte.com.cn>
 2017-12-11 15:28:10 +08:00
Lantao Liu
572e354a2d Revert debug code. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-05 07:40:11 +00:00
Lantao Liu
a23bdf25d8 Check and dump rootfs. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-03 11:39:54 +00:00
Lantao Liu
6cded68bac
Merge pull request #360 from Random-Liu/add-image-load 
Add image load
 2017-10-28 00:43:20 +02:00
Lantao Liu
25fdf72692 Add image load. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-27 21:51:04 +00:00
Lantao Liu
32806fa375 Fix a log line and also set containerd log level to debug in node e2e. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-27 07:21:37 +00:00
Lantao Liu
acc3f74d5c Also unpack image during creation. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-26 17:57:53 +00:00