github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
12,008 Commits 3 Branches 4 Tags
14714b94de664109ff73230d67f517c38d7b4d6c
Commit Graph

1434 Commits

Author SHA1 Message Date
Lantao Liu
7beac6fcc1 Merge pull request #849 from dmcgowan/remove-stringid 
Replace stringid call with simple random reader
 2018-07-12 18:32:28 -07:00
Derek McGowan
cce0a46c8a Seed random on ctr and containerd startup 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-07-12 17:51:55 -07:00
Derek McGowan
1984e451d5 Replace stringid with simple rand reader 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-07-12 16:40:45 -07:00
Lantao Liu
e4ad68098e Remove pkg/containerd/resolver package. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-07-09 19:08:48 -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
Lantao Liu
4eb4a29577 Merge pull request #825 from abhi/cni_config 
Change to keep in sync with latest cni config
 2018-06-21 16:14:31 -07:00
Abhinandan Prativadi
263b0b99d0 Change to keep in sync with latest cni config 
This commit contains change to pick the latest cni config
from the configured CNIConfDir.
With this change any changes made to the cni config file will
be picked up on the kubelet's runtime status check call.
Ofcourse this would lead to undefined behavior when the cni config
change is made in parallel during pod creation. However its
reasonable to assume that the operator is aware of the need to
drain the nodes of pods before making cni configuration change.
The behavior is currently not defined in kubernetes. However
I see that similar approach being adopted in the upstream kubernetes
with dockershim. Keeping the behavior consistent for now.

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2018-06-21 20:43:38 +00:00
Filipe Brandenburger
01d77d44f5 Update github.com/opencontainers/runtime-tools to v0.6.0 
Also add new dependencies on github.com/xeipuuv/gojson* (brought up by
new runtime-tools) and adapt the containerd/cri code to replace the APIs
that were removed by runtime-tools.

In particular, add new helpers to handle the capabilities, since
runtime-tools now split them into separate sets of functions for each
capability set.

Replace g.Spec() with g.Config since g.Spec() has been deprecated in the
runtime-tools API.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
 2018-06-20 13:52:50 -07:00
Lantao Liu
b60e456bd9 Fix snapshotter nil panic. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-20 00:43:44 +00:00
Lantao Liu
e3d57d240f Merge pull request #761 from Random-Liu/add-log-max-size 
Add log max size
 2018-06-15 15:56:04 -07:00
Lantao Liu
53f1ab4145 Fix double /dev/shm mount. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-14 19:03:19 -07:00
Lantao Liu
405f57f8e0 Add max_container_log_size 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-14 14:24:17 -07:00
Lantao Liu
46d621e4ac Support Cmd for sandbox container. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-12 14:38:55 -07:00
Lantao Liu
b7aac6396d Merge pull request #811 from Random-Liu/fix-volume-ownership 
Fix empty volume ownership.
 2018-06-11 10:42:04 -07:00
Lantao Liu
c55776377f Fix empty volume ownership. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-11 08:40:35 +00:00
Lantao Liu
c9216531ce Revert "Use pod ip instead of localhost in pod netns for portforward." 
This reverts commit dd886bc281.

Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-11 07:35:32 +00:00
Lantao Liu
d7abb5b489 Merge pull request #807 from Random-Liu/log-task-exit-event 
Log task exit event.
 2018-06-08 20:07:04 -07:00
Lantao Liu
5a1105c614 Merge pull request #808 from Random-Liu/erase-ambient-caps 
Erase ambient capabilities.
 2018-06-08 20:06:34 -07:00
Lantao Liu
dd886bc281 Use pod ip instead of localhost in pod netns for portforward. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-08 18:26:06 -07:00
Lantao Liu
b367f30097 Erase ambient capabilities. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-08 14:37:05 -07:00
Vincent Demeester
832b05ae67 Update tests to use gotest.tools angel 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-06-08 21:02:01 +02:00
Lantao Liu
e4e2585431 Log task exit event. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-08 08:33:12 +00:00
Lantao Liu
83e6b65566 Select ipv4 first if there is one. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-05 18:25:03 +00:00
Lantao Liu
0faff1c22f Fix ctr cri timeout. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-05 01:24:28 +00:00
Akihiro Suda
097249054d vendor containerd (#2135) 
For containerd/containerd#2135

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-06-02 23:10:59 +09:00
Lantao Liu
578b34f112 Merge pull request #794 from Random-Liu/panic-for-cri-start-failure 
Generate fatal error when cri plugin fail to start.
 2018-05-31 13:21:16 -07:00
Lantao Liu
b870ee7942 Generate fatal error when cri plugin fail to start. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-31 10:49:11 -07:00
Lantao Liu
b68fb075d4 Merge pull request #793 from Random-Liu/port-containerd-fix-#2364 
Port docker resolver fix #2364.
 2018-05-31 01:03:00 -07:00
Lantao Liu
0fae42b9b8 Port docker resolver fix #2364. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-30 17:25:46 -07:00
Evan Hazlett
d7d2212324 vendor bump 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

containerd: linux -> runtime/linux

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

fix utils to properly format vendor repo

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

test fixup

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-05-30 19:51:24 -04: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
Michael Crosby
009ba4d797 Move testutils to pkg 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-05-22 17:08:38 -04:00
Michael Crosby
927517de36 Move dialer to pkg 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-05-22 13:32:25 -04:00
Michael Crosby
ae4b78d1cc Move progress into pkg 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-05-22 13:32:25 -04:00
Ricardo Aravena
f79e0171ca Minor typo 
Signed-off-by: Ricardo Aravena <raravena80@gmail.com>
 2018-05-15 09:11:48 -07:00
Lantao Liu
5d29598a6d Fix workingset memory calculation. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-11 15:17:16 -07:00
Lantao Liu
a5d1332e8f Explicitly set rw for privileged container. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-07 15:13:14 -07:00
Lantao Liu
5f4035ae2f Merge pull request #754 from kolyshkin/mount 
os.Unmount: do not consult mountinfo
 2018-04-30 14:41:57 -07:00
Kir Kolyshkin
daeab40b45 os.Unmount: do not consult mountinfo, drop flags 
1. Currently, Unmount() call takes a burden to parse the whole nine yards
of /proc/self/mountinfo to figure out whether the given mount point is
mounted or not (and returns an error in case parsing fails somehow).

Instead, let's just call umount() and ignore EINVAL, which results
in the same behavior, but much better performance.

This also introduces a slight change: in case target does not exist,
the appropriate error (ENOENT) is returned -- document that.

2. As Unmount() is always used with MNT_DETACH flag, let's drop the
flags argument. This way, the only reason of EINVAL returned from
umount(2) can only be "target is not mounted".

3. While at it, remove the 'containerdmount' alias from the package.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-04-30 12:54:10 -07:00
Lantao Liu
279fa853a6 Always mount sysfs as rw. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-26 18:58:26 -07:00
Lantao Liu
daa9f6008c Merge pull request #743 from Random-Liu/fix-sandbox-stop-race 
Fix sandbox stop race condition.
 2018-04-18 13:28:54 -07:00
Lantao Liu
856534c846 Fix sandbox stop race condition. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-18 10:12:33 -07:00
Lantao Liu
5cb4744f27 Fix portforward for host network. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-17 08:24:44 +00:00
Lantao Liu
69b3f3aeac Add socat back. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-11 01:53:24 +00:00
Lantao Liu
b09489de96 Merge pull request #727 from Random-Liu/fix-symlink-layer 
Support symlink layer in image import.
 2018-04-10 18:32:29 -07:00
Lantao Liu
9f85c48e4c Support symlink layer in image import. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-10 22:08:45 +00:00
Lantao Liu
3d0706c4e5 Merge pull request #691 from abhi/socat 
Getting rid of nsenter and socat
 2018-04-09 15:34:44 -07:00
abhi
02b952ec17 Getting rid of socat 
Signed-off-by: abhi <abhi@docker.com>
 2018-04-09 14:31:44 -07:00
Lantao Liu
304045491c Merge pull request #725 from Random-Liu/fix-resolver-race 
Fix resolver race
 2018-04-09 13:10:44 -07:00