github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
603 Commits 3 Branches 3 Tags 112 MiB
cd5886d647
Commit Graph

603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
abhi
cd5886d647 Adding kube pod and container labels to containerd 
Currently we have the pod and container labels part of
containerd metadata extensions. However for third party users
like cadvisor that depend on standard kube labels will need
to be aware of the way metadata is stored in containerd to
fetch the labels.

Signed-off-by: abhi <abhi@docker.com>
 2017-11-07 22:19:19 -08:00
Lantao Liu
8a1a2f2713
Merge pull request #390 from miaoyq/update-hack-version 
Update 'hack/versions'
 2017-11-03 10:22:10 -07:00
Yanqiang Miao
e79bf15dee Update 'hack/versions' and some Kubernetes repo 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-11-03 15:51:14 +08:00
Lantao Liu
9f2de2cd02
Merge pull request #382 from miaoyq/return-config 
"Status" function return cri-containerd config in json format
 2017-11-02 20:41:31 -07:00
Lantao Liu
e19e043a4c
Merge pull request #386 from Random-Liu/fix-spammy-cni-log 
Get rid of spammy CNI log.
 2017-11-02 20:40:50 -07:00
Yanqiang Miao
9b71208be9 "Status" function return cri-containerd config in json format 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-11-03 09:23:05 +08:00
Yanqiang Miao
72446e7e25 Update k8s to #53965 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-11-03 09:14:58 +08:00
Mike Brown
3e65b00310
Merge pull request #388 from Random-Liu/cleanup-load 
Cleanup image load code a bit.
 2017-11-02 20:10:09 -05:00
Lantao Liu
73c2cb5632 Fix spammy CNI log. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-03 01:08:07 +00:00
Lantao Liu
3312c2f560
Merge pull request #387 from Random-Liu/fix-node-e2e-test 
Fix our node e2e test.
 2017-11-02 16:37:31 -07:00
Lantao Liu
a77ba6b84b Cleanup image load code. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-02 23:09:43 +00:00
Lantao Liu
c2796dfab3
Merge pull request #384 from Random-Liu/update-containerd 
Update containerd to 564600ee79.
 2017-11-02 15:59:50 -07:00
Lantao Liu
69c16929e3 Fix our node e2e test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-02 22:50:27 +00:00
Mike Brown
df6f4a3655 adds help for load command (#383) 
* adds help for load command

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

* vendor restrom/dedent

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-11-02 15:38:24 -07:00
Lantao Liu
1d61b7464b Update containerd to 564600ee79. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-02 22:17:38 +00:00
Lantao Liu
4fa0975f9d
Add e2e test. (#353) 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-02 15:06:44 -07:00
Zhenhao Zhang
0c1839047c add pprof endpoint (#370) 
Add pprof endpoint

Signed-off-by: zhangzhenhao <zhangzhenhao@outlook.com>
 2017-11-02 11:41:37 -07:00
Lantao Liu
1117430076
Merge pull request #377 from spiffxp/assignees-to-approvers 
Rename OWNERS assignees: to approvers:
 2017-11-01 23:50:48 +01:00
Lantao Liu
8679d10733
Merge pull request #380 from Random-Liu/fix-deadlock 
Do not call `Usage` inside `Walk`.
 2017-11-01 22:04:10 +01:00
Lantao Liu
2453c03daa Do not call Usage inside Walk. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-01 18:11:11 +00:00
Aaron Crickenberger
04373a934d Rename OWNERS assignees: to approvers: 
They are effectively the same, assignees is deprecated

Signed-off-by: Aaron Crickenberger <spiffxp@gmail.com>
 2017-11-01 08:49:17 -07:00
Lantao Liu
2cb1572667
Merge pull request #379 from yanxuean/unpack 
Use image.IsUnpacked
 2017-11-01 07:50:12 +01:00
Lantao Liu
e5eac0af83
Merge pull request #376 from Random-Liu/update-cri-containerd-version-in-ansible 
Update cri-containerd version to 1.0.0-alpha.1 in ansible.
 2017-11-01 06:56:38 +01:00
yanxuean
9027a02e8e Use image.IsUnpacked 
fix #361
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-11-01 13:51:25 +08:00
Lantao Liu
964aebfb51
Merge pull request #378 from Random-Liu/rename-tarball 
Rename release tarball for node e2e to cri-containerd-cni.
 2017-11-01 03:58:42 +01:00
Lantao Liu
1d228cbc38 Rename release tarball for node e2e to cri-containerd-cni. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-01 01:31:21 +00:00
Lantao Liu
10ada61fe6 Update cri-containerd version to 1.0.0-alpha.1 in ansible. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-01 00:06:22 +00:00
Lantao Liu
c44f798145
Merge pull request #371 from Random-Liu/fix-removing 
Fix removing state recover.
 2017-10-31 22:29:53 +01:00
Lantao Liu
4eaaee380f Fix removing state recover. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-31 20:03:58 +00:00
Lantao Liu
95067d76a7
Merge pull request #374 from Random-Liu/add-runtime-cgroup 
Add runtime cgroup and put containerd and cri-containerd into it.
 2017-10-31 20:59:13 +01:00
Lantao Liu
95dfd3c039 Add runtime cgroup and put containerd and cri-containerd into it. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-31 06:21:20 +00:00
Lantao Liu
b27a4c1723
Merge pull request #373 from Random-Liu/update-cri-tools 
Update cri-tools version to 8e989f8b7a716534896ee082b7b1fb47bd66df21.
 2017-10-30 16:57:27 +01:00
Lantao Liu
dcb22bebae
Merge pull request #372 from Random-Liu/add-container-log-path 
Add the missing container log path in container status.
 2017-10-30 16:57:10 +01:00
Lantao Liu
5d46a90b7f Update cri-tools version to 8e989f8b7a716534896ee082b7b1fb47bd66df21. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-30 06:39:19 +00:00
Lantao Liu
4e6e1cab0d Add the missing container log path in container status. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-30 06:03:52 +00:00
Lantao Liu
1d14c11dcb
Merge pull request #368 from Random-Liu/not-log-output 
Do not log container output in error log.
 2017-10-28 05:50:14 +02:00
Lantao Liu
f2fa351a1f Do not log container output in error log. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-28 02:16:43 +00:00
Lantao Liu
c3b03f8fec
Merge pull request #366 from Random-Liu/add-dump-stack 
Add stack dump.
 2017-10-28 02:15:17 +02:00
Lantao Liu
439ee0a973 Add stack dump. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-27 22:45:38 +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
7f11eff42d Add integration test for image load 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-27 21:51:04 +00: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
64c719622a
Merge pull request #365 from Random-Liu/random-fix 
Fix a log line and also set containerd log level to debug in node e2e.
 2017-10-27 19:44:15 +02: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
c6fd18ddc3 Update cobra and pflag 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-27 06:42:18 +00:00
Lantao Liu
1d5cd86207 Merge pull request #364 from Random-Liu/revert-#338 
Revert "Put containerd-shim into pod cgroup"
 2017-10-27 08:13:44 +02:00
Lantao Liu
f10cc58362 Revert "Put containerd-shim into pod cgroup" 
This reverts commit e9cf1d5909.

Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-27 05:33:55 +00:00
Lantao Liu
486d7628c0 Merge pull request #363 from Random-Liu/fix-node-e2e 
Add `--ipv4` in `curl`.
 2017-10-27 06:19:06 +02:00
Lantao Liu
22adf92f66 Add --ipv4 in curl. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-27 02:57:34 +00:00
Lantao Liu
4b40fe74b9 Merge pull request #362 from Random-Liu/add-log 
Add log of generated id for debugging.
 2017-10-27 04:47:25 +02:00