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

9017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
e073a48c7b
Merge pull request #2309 from crosbymichael/events-closed 
Correctly handle reading from events channel
 2018-04-25 13:42:14 -04:00
Michael Crosby
090687916d Correctly handle reading from events channel 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-04-25 11:21:22 -04: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
Kir Kolyshkin
bbe14f0a2e Switch from x/net/context to context 
Since Go 1.7, context is a standard package, superceding the
"x/net/context". Since Go 1.9, the latter only provides a few type
aliases from the former. Therefore, it makes sense to switch to the
standard package.

This commit was generated by the following script (with a couple of
minor fixups to remove extra changes done by goimports):

	#!/bin/bash

	if [ $# -ge 1 ]; then
		FILES=$*
	else
		FILES=$(git ls-files \*.go | grep -vF ".pb.go" | grep -v
	^vendor/)
	fi

	for f in $FILES; do
		printf .
		sed -i -e 's|"golang.org/x/net/context"$|"context"|' $f
		goimports -w $f
		awk '	/^$/ {e=1; next;}
			/[[:space:]]"context"$/ {e=0;}
			{if (e) {print ""; e=0}; print;}' < $f > $f.new && \
				mv $f.new $f
		goimports -w $f
	done
	echo

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-04-24 14:33:34 -07:00
Kir Kolyshkin
9d0d4b806c context pkg: untangle 
Since Go 1.7, "context" is a standard package, superceding the
"x/net/context". Since Go 1.9, the latter only provides type aliases
from the former. Therefore, it makes sense to switch to the standard
package, and the change is not disruptive in any sense.

This commit deals with a few cases where both packages happened to be
imported by the same source file. A choice between "context" and
"gocontext" was made for each file in order to minimize the patch.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-04-24 14:33:34 -07:00
Kir Kolyshkin
f337075620 Bump golang.org/x/net 
This version includes "x/net/context" which is fully compatible with
the standard Go "context" package, so the two can be mixed together.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-04-24 14:33:20 -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
Derek McGowan
209a7fc3e4
Merge pull request #2302 from dmcgowan/prepare-1.1 
Prepare 1.1.0 release
 2018-04-23 20:20:58 -07:00
Derek McGowan
1155371c7a
Prepare 1.1.0 release 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-04-23 18:29:33 -07:00
Derek McGowan
d8aef117f9
Merge pull request #2304 from Random-Liu/update-cri 
Update cri plugin to v1.0.0.
 2018-04-23 18:24:37 -07:00
Lantao Liu
9c9abec21c Update cri plugin to v1.0.0. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-23 16:34:17 -07:00
Michael Crosby
321c52a0bc
Merge pull request #2303 from juliengk/ctr_tasks_list 
Update ctr tasks list usage for quiet flag
 2018-04-23 15:39:26 -04:00
Julien Kassar
9d247718d7 Update ctr tasks list usage for quiet flag 
Signed-off-by: Julien Kassar <github@kassisol.com>
 2018-04-23 14:53:35 -04: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
Lantao Liu
09ff081784
Merge pull request #748 from Random-Liu/use-full-sock-path 
Add `unix://` prefix for socket addresses used by CRI remote client.
 2018-04-23 09:52:07 -07:00
Phil Estes
1381f8fddc
Merge pull request #2301 from HusterWan/zr/fix-misspell 
fix words misspell
 2018-04-23 08:32:00 -04:00
Michael Wan
7fd6d5e2be fix words misspell 
Signed-off-by: Michael Wan <zirenwan@gmail.com>
 2018-04-23 00:09:42 -04:00
Lantao Liu
06f53b4838 Add unix:// prefix for socket addresses used by CRI remote client. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-20 17:36:25 -07:00
Phil Estes
2ac13a8757
Merge pull request #2300 from dmcgowan/remove-content-helper-defers 
content: remove unnecessary defer in helpers
 2018-04-20 16:39:32 -04:00
Derek McGowan
3a6825e1a0
content: remove unnecessary defer in helpers 
Deferring the put back of the buffer is not necessary since
it can be done immediately after use, before checking error.
This decreases the amount of the time the buffer is out
of the pool and not in use.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-04-20 11:55:59 -07:00
Lantao Liu
59d7112bf9
Merge pull request #747 from Random-Liu/fix-fluentd-support 
Add KUBE_CONTAINER_RUNTIME_NAME to fix fluentd support.
 2018-04-20 11:23:31 -07:00
Lantao Liu
b3d15cf192 Add KUBE_CONTAINER_RUNTIME_NAME to fix fluentd support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-19 18:42:10 -07:00
Lantao Liu
b5906334fb
Merge pull request #745 from Random-Liu/use-preloaded-containerd 
Try using preloaded containerd if no version is specified.
 2018-04-19 14:45:36 -07:00
Lantao Liu
1a430d47c3 Try using preloaded containerd if no version is specified. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-19 01:31:23 -07:00
Lantao Liu
ba9b075683
Merge pull request #740 from Random-Liu/improve-gce-bootstrap 
Improve gce bootstrapping in various ways.
 2018-04-18 14:12:27 -07:00
Lantao Liu
d1ba950abc Add log level support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-18 13:34:19 -07:00
Lantao Liu
72ade6c4f5 Remove 10-containerd-net.conflist from cri-containerd-cni release tarball. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-18 13:34:19 -07:00
Lantao Liu
b2ebb735e7 Improve gce bootstrapping in various ways. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-18 13:34:19 -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
Derek McGowan
0a978d0b82
Merge pull request #2296 from tophj-ibm/cleanup-loopback-devices 
testing: cleanup loopback devices on test skip
 2018-04-18 10:44:19 -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
Christopher Jones
f1639bca4b
testing: cleanup loopback devices on test skip 
Fixes a case where loopback devices wouldn't get cleaned up
when a test was being skipped

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2018-04-18 12:39:21 -04:00
Phil Estes
e9114e3257
Merge pull request #2294 from fermayo/fix-cli-help 
ctr: fix --mount help message
 2018-04-18 08:29:06 -04:00
Lantao Liu
290eec8e34
Merge pull request #739 from Random-Liu/fix-hostnet-port-forward 
Fix portforward for host network.
 2018-04-17 21:39:17 -07:00
Lantao Liu
d970636147 Update CRI validation test to include hostnet portforward test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-17 19:19:03 -07:00
Fernando Mayo
0a26b0fe43 ctr: fix --mount help message 
Signed-off-by: Fernando Mayo <fermayo@gmail.com>
 2018-04-17 18:29:33 -07:00
Lantao Liu
c83a55d617
Merge pull request #734 from Random-Liu/update-containerd 
Update containerd.
 2018-04-17 10:01:48 -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
19882b8028
Merge pull request #735 from mikebrow/track-golang-point-releases 
start tracking golang updates for 1.10.x
 2018-04-16 22:45:25 -07:00
Lantao Liu
b7af412106
Merge pull request #731 from Random-Liu/add-release-instruction 
Add release instruction to make the release process written down.
 2018-04-16 18:40:27 -07:00
Mike Brown
5f87a2a0d9 start tracking golang updates for 1.10.x 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-04-16 08:03:52 -05:00
Lantao Liu
9aa9f85a03 Add release instruction to make the release process written down. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-16 06:46:22 +00:00
Lantao Liu
da285a10b9 Update containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-16 06:25:21 +00:00
Derek McGowan
f630d5f0a6
Merge pull request #2292 from dmcgowan/prepare-1.1.0-rc.2 
Prepare 1.1.0-rc.2
 2018-04-13 16:04:05 -07:00
Derek McGowan
dc47f11963
Prepare 1.1.0-rc.2 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-04-13 15:36:05 -07:00
Phil Estes
35f0ff957d
Merge pull request #2291 from dmcgowan/release-dependencies-changelog 
Clean up dependency output
 2018-04-13 18:23:29 -04:00
Derek McGowan
764d764f09
Merge pull request #2286 from dmcgowan/multiple-snapshot-links 
gc: add support for multiple snapshot labels
 2018-04-13 15:15:21 -07:00