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

1958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
0a5c05bcd4
Merge pull request #776 from Random-Liu/disable-streaming 
Disable TLS streaming to work with new kubelet streaming proxy.
 2018-06-01 00:48:44 -07: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
Lantao Liu
8bb978e3d6
Merge pull request #785 from ehazlett/containerd-vendor-bump 
containerd vendor update
 2018-05-30 17:23:07 -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
Lantao Liu
40b60834a2
Merge pull request #789 from Random-Liu/configurable-containerd-build 
Make DEPLOY_PATH configurable.
 2018-05-30 09:37:58 -07:00
Lantao Liu
1892b30fa7 Make DEPLOY_PATH configurable. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-29 17:23:32 -07:00
Lantao Liu
52460ebf6e
Merge pull request #788 from BSWANG/patch-1 
Update cni.template
 2018-05-29 14:36:28 -07:00
Bingshen Wang
7bd86a2252 Update cni.template 
Format the cni.template, use `space` instead of some `tab`. Avoid indent issue in text editor.

Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
 2018-05-28 16:04:44 +08:00
Lantao Liu
574f9496ef
Merge pull request #786 from fuweid/remove_useless_check 
Remove useless error-check in createImageReference
 2018-05-24 23:51:30 -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
24a9642672
Merge pull request #784 from cpuguy83/bump_continuity 
Bump continuity to fix copy files > 2^32 bytes
 2018-05-24 14:01:35 -07:00
Brian Goff
fb6bc66f0a Bump continuity to fix copy files > 2^32 bytes 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2018-05-23 20:55:51 -04:00
Lantao Liu
450eb09a68
Merge pull request #782 from Random-Liu/update-containerd 
Update containerd
 2018-05-23 13:26:21 -07: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
4f00103c99 Disable restart plugin on GCE. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-23 12:39:14 -07:00
Lantao Liu
80188e253a Update containerd to d1435e6e4d. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-23 10:16:33 -07:00
Lantao Liu
a4ff7e9946
Merge pull request #781 from Random-Liu/fix-container-runtime-monitor 
Fix kube-container-runtime-monitor.
 2018-05-22 14:55:21 -07:00
Lantao Liu
ebed87fa95 Fix kube-container-runtime-monitor. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-22 14:07:08 -07:00
Lantao Liu
bafc79437b
Merge pull request #758 from Random-Liu/use-crictl-in-kube-up 
Use crictl installed in kube-up.sh
 2018-05-22 10:04:14 -07:00
Lantao Liu
927d37401d
Merge pull request #779 from Random-Liu/logo-fix 
Another logo fix.
 2018-05-22 10:03:13 -07:00
Lantao Liu
b4631cf707 Use crictl installed in kube-up.sh 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-21 18:55:19 -07:00
Lantao Liu
6c7ec48daf Another logo fix. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-21 18:05:30 -07:00
Lantao Liu
6f43d493f9 Disable TLS streaming to work with new kubelet streaming proxy. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-18 19:02:03 -07:00
Lantao Liu
8566a8962a
Merge pull request #775 from mikebrow/readme-pub-imgs 
use public logos for a while vs remote github logos not in this repo
 2018-05-18 16:31:10 -07:00
Mike Brown
e10a24926d use public logos for a while vs remote github logos that are not in this repo 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-05-18 13:05:53 -05:00
Lantao Liu
9f8e58123b
Merge pull request #647 from mikebrow/boiler-support-for-no-year 
makes copyright year optional
 2018-05-16 17:10:01 -07:00
Lantao Liu
8d60547eb2
Merge pull request #769 from raravena80/patch-1 
Minor typo
 2018-05-15 14:53:48 -07:00
Lantao Liu
67908190c5
Merge pull request #768 from Random-Liu/upgrade-crictl 
Upgrade cri-tools to v1.0.0-beta.1
 2018-05-15 11:40:25 -07:00
Ricardo Aravena
f79e0171ca
Minor typo 
Signed-off-by: Ricardo Aravena <raravena80@gmail.com>
 2018-05-15 09:11:48 -07:00
Lantao Liu
9763489008 Upgrade cri-tools to v1.0.0-beta.1 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-05-14 19:29:52 -07:00
Lantao Liu
66388aefd5
Merge pull request #766 from Random-Liu/fix-workingset-memory 
Fix workingset memory calculation.
 2018-05-11 15:48:13 -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
7a6369deb1
Merge pull request #763 from Random-Liu/fix-ro-sysfs 
Explicitly set `rw` for privileged container.
 2018-05-07 17:52:29 -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
6bbbec5a8a
Merge pull request #755 from Random-Liu/always-mount-sysfs-rw 
Always mount sysfs as `rw` for privileged container.
 2018-04-27 11:03:19 -07:00
Lantao Liu
03bac61890
Merge pull request #756 from Random-Liu/update-cri-tools 
Update cri-tools to fix `crictl logs` output.
 2018-04-27 01:33:38 -07:00
Lantao Liu
2f370f6f5d Update cri-tools to fix crictl logs output. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-26 19:17:45 -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
8fec0469d9
Merge pull request #751 from Random-Liu/fix-official-release 
Fix tarball ownership and containerd binary path for containerd.
 2018-04-24 16:04:03 -07:00
Lantao Liu
e0d7078251 Fix tarball ownership and containerd binary path for containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-24 13:05:31 -07:00
Lantao Liu
825563b20c
Merge pull request #750 from Random-Liu/download-from-official-release 
Download containerd binaries from official release.
 2018-04-24 11:31:54 -07:00
Lantao Liu
e22ebf420f Down containerd binaries from official release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-24 01:23:44 -07:00
Lantao Liu
906ea173e5
Merge pull request #749 from Random-Liu/update-containerd 
Update containerd before release.
 2018-04-23 11:18:52 -07:00
Lantao Liu
d77a0c117e Update containerd before release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-23 10:04:53 -07:00