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

1444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abhinandan Prativadi
860971025f vendoring latest go-cni with fixes 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2018-06-21 20:43:51 +00: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
Lantao Liu
07020dbdda
Merge pull request #820 from filbranden/usercap1 
Update github.com/opencontainers/runtime-tools to v0.6.0
 2018-06-21 09:49:51 -07: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
441a57aa56
Merge pull request #821 from Random-Liu/fix-snapshotter-panic 
Fix snapshotter nil panic.
 2018-06-20 10:31:01 -07:00
Lantao Liu
9cb82aaecd
Merge pull request #823 from Random-Liu/update-crictl 
Update crictl to v1.11.0.
 2018-06-20 10:30:34 -07:00
Lantao Liu
cfa88fca32
Merge pull request #824 from Random-Liu/make-max-log-size-configurable 
Make max container log line size configurable through cloud init.
 2018-06-20 10:30:18 -07:00
Lantao Liu
b5d053f327 Make max container log line size configurable through cloud init. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-20 01:25:02 +00:00
Lantao Liu
bdddbed4de Update crictl to v1.11.0. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-20 00:57:53 +00: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
ad29370136
Merge pull request #816 from Random-Liu/fix-double-dev-shm-mount 
Fix double /dev/shm mount.
 2018-06-15 13:50:30 -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
bf551b9c4c Add integration test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-14 14:24:17 -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
b39546ce2b
Merge pull request #815 from Random-Liu/support-cmd-for-sandbox-container 
Support `Cmd` for sandbox container.
 2018-06-12 23:03:55 -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
7e0cbbe6e9
Merge pull request #810 from Random-Liu/revert-#804 
Revert "Use pod ip instead of localhost in pod netns for portforward."
 2018-06-11 10:41:48 -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
96cfccec0d
Merge pull request #804 from Random-Liu/use-pod-ip-for-portforward 
Use pod ip instead of localhost in pod netns for portforward.
 2018-06-08 20:05:08 -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
Lantao Liu
de84f9c0cd
Merge pull request #806 from Random-Liu/update-kubernetes 
Update kubernetes to v1.11.0-beta.2
 2018-06-08 10:42:59 -07: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
2b48f8738f Update kubernetes to v1.11.0-beta.2 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-08 07:26:35 +00:00
Lantao Liu
dfae95ec9d
Merge pull request #802 from Random-Liu/remove-unused-files 
Remove unused files.
 2018-06-06 18:49:53 -07:00
Lantao Liu
db028fd208
Merge pull request #803 from Random-Liu/select-ipv4-first 
Select ipv4 first if there is one.
 2018-06-05 12:45:38 -07: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
ccc5f394f7 Remove unused files. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-05 17:34:26 +00:00
Lantao Liu
8bcb9a9539
Merge pull request #801 from Random-Liu/fix-ctr-timeout 
FIx ctr cri timeout.
 2018-06-05 00:27:02 -07:00
Lantao Liu
0faff1c22f Fix ctr cri timeout. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-05 01:24:28 +00:00
Lantao Liu
ecf8d99d06
Merge pull request #799 from AkihiroSuda/oci-content-store 
vendor containerd (#2135)
 2018-06-04 10:34:43 -07: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
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