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

1620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Lantao Liu
856534c846 Fix sandbox stop race condition. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-18 10:12:33 -07: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
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
Lantao Liu
77a33b10a9
Merge pull request #729 from Random-Liu/fix-portforward 
Add socat back.
 2018-04-10 23:08:57 -07:00
Lantao Liu
69b3f3aeac Add socat back. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-11 01:53:24 +00:00
Lantao Liu
b09489de96
Merge pull request #727 from Random-Liu/fix-symlink-layer 
Support symlink layer in image import.
 2018-04-10 18:32:29 -07:00
Lantao Liu
9f85c48e4c Support symlink layer in image import. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-10 22:08:45 +00:00
Lantao Liu
de0afd70ee
Merge pull request #728 from abhi/socat 
Minor cleanup of comment in ansible
 2018-04-09 16:34:38 -07:00
abhi
f7a0b43734 Minor cleanup of comment in ansible 
Signed-off-by: abhi <abhi@docker.com>
 2018-04-09 15:57:24 -07:00
Lantao Liu
3d0706c4e5
Merge pull request #691 from abhi/socat 
Getting rid of nsenter and socat
 2018-04-09 15:34:44 -07:00
abhi
c200cb4642 Updating ansible installer 
Signed-off-by: abhi <abhi@docker.com>
 2018-04-09 14:31:49 -07:00
Abhinandan Prativadi
1317854ec1 Updating travis.yml and Readme to remove nsenter and socal 
Signed-off-by: abhi <abhi@docker.com>
 2018-04-09 14:31:49 -07:00
abhi
02b952ec17 Getting rid of socat 
Signed-off-by: abhi <abhi@docker.com>
 2018-04-09 14:31:44 -07:00
Lantao Liu
304045491c
Merge pull request #725 from Random-Liu/fix-resolver-race 
Fix resolver race
 2018-04-09 13:10:44 -07:00
Lantao Liu
2e693ad4f6
Merge pull request #724 from Random-Liu/add-cni-config-template 
Add cni config template
 2018-04-09 13:10:05 -07:00
Lantao Liu
a68530c1e8 Port containerd fix #2276 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-09 18:36:06 +00:00
Lantao Liu
d8a3c5f254 Address comments. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-09 18:15:09 +00:00
Lantao Liu
b2099c2061 Add cni config template support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-07 06:34:45 +00:00
Lantao Liu
68ef2c338e Update containerd to v1.1.0-rc.1 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-07 00:49:58 +00:00
abhi
aeef99a76e Using netns to perform socat 
This commit removes the usage of nsenter and uses netns
to perform socat operation.

Signed-off-by: abhi <abhi@docker.com>
 2018-04-05 13:28:00 -07:00