github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
11,956 Commits 3 Branches 2 Tags 112 MiB
13bd93847d
Commit Graph

11956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenfe-Mickaël Laventure
ab67fd50dc
Merge pull request #1715 from thaJeztah/nit-fix-printf 
Align version output and minor code cleanup
 2017-11-03 10:08:57 -07:00
Sebastiaan van Stijn
65d5b8b937
Align version output and minor code cleanup 
This patch changes the output of `ctr version` to align version and revision.
It also changes `.Printf()` to `.Println()`, to make the code slightly easier
to read.

Before this change:

    $ ctr version
    Client:
      Version: v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

    Server:
      Version: v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

With this patch applied:

    $ ctr version
    Client:
      Version:  v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

    Server:
      Version:  v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-11-03 17:49:23 +01:00
Michael Crosby
a045575998 Strip binaries in Makefile 
This will make the binaries around 8MB smaller.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-11-03 11:44:41 -04: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
Stephen Day
99595e0b84
Merge pull request #1714 from dnephin/remove-deadcode-from-release 
Remove deadcode from cmd/containerd-release
 2017-11-02 16:57:16 -07: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
Daniel Nephin
393e8cc332 Remove deadcode from cmd/containerd-release 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-11-02 17:45:41 -04:00
Derek McGowan
5acf187697
Merge pull request #1712 from stevvooe/defaults-package 
defaults: add package to contain server defaults
 2017-11-02 14:11:02 -07:00
Stephen J Day
0a1a13448b
defaults: add package to contain server defaults 
To reduce the binary size of containerd, we no longer import the
`server` package for only a few defaults. This reduces the size of `ctr`
by 2MB. There are probably other gains elsewhere.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-11-02 13:59:34 -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
Michael Crosby
564600ee79
Merge pull request #1707 from dmcgowan/snapshot-storage-db 
Open snapshot database only once
 2017-11-02 13:45:36 -04:00
Derek McGowan
68d3c77eae
Open snapshot database only once 
Prevents having multiple database connections open to a connection,
preventing bugs with locking by relying on the boltdb database
object to handle synchronization rather than file locking.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-11-02 10:32:13 -07:00
Kenfe-Mickaël Laventure
7a91c66d25
Merge pull request #1710 from AkihiroSuda/print-revision 
containerd --version: print version.Revision
 2017-11-02 07:56:41 -07:00
Akihiro Suda
dfdcd4decb containerd --version: print version.Revision 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-11-02 07:56:17 +00: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
Stephen Day
c933088381
Merge pull request #1663 from dmcgowan/content-local-labels 
content: add support for label storage in local content store
 2017-11-01 11:24:15 -07: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
Stephen Day
a7a869f14e
Merge pull request #1703 from estesp/remove-copyright 
Update LICENSE.docs with proper CC-BY-4.0 text
 2017-11-01 10:49:13 -07:00
Phil Estes
aa3516487c
Merge pull request #1704 from jessvalarezo/ctr-move-tasks 
ctr: move commands (tasks, run, pprof, shim)
 2017-11-01 12:57:07 -04: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
Derek McGowan
7b08bcdb65
Add support for label storage in local content store 
Allows running tests which require labels on the content store

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-10-31 12:59:52 -07: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
Jess Valarezo
864b16a2cb ctr: alphabetize commands, rename signals 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2017-10-31 11:57:49 -07:00
Jess Valarezo
f654b7b71e ctr: move pprof to commands package 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2017-10-31 11:57:49 -07:00
Jess Valarezo
a827a17f1d ctr: move shim to commands 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2017-10-31 11:57:49 -07:00
Jess Valarezo
c3b70f1d0b ctr: move tasks, run to commands package 
Signed-off-by: Jess Valarezo <valarezo.jessica@gmail.com>
 2017-10-31 11:57:41 -07:00
Phil Estes
7d6017a954
Update LICENSE.docs with proper CC-BY-4.0 text 
Follow-on to #1702 to correct the actual license text of the CC-BY-4.0
license. Also clean up Licenses section of README.md and link to
LICENSE.code file. Remove unecessary copyright and "rights reserved"
statement.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2017-10-31 11:46:59 -04:00
Kenfe-Mickaël Laventure
fe3d9a70fa
Merge pull request #1702 from estesp/fix-cc-by-lic 
Fix CC-BY license reference in README.md
 2017-11-01 01:47:11 +11:00
Phil Estes
474d4df2aa
Merge pull request #1692 from dmcgowan/gc-fix-sweep-race 
Fix race in gc sweep
 2017-10-31 10:28:33 -04:00