Commit Graph

8778 Commits

Author SHA1 Message Date
Michael Crosby
fdceb13b14 Add cio.Load for loading io set
This adds a `Load` Opt for cio to load a tasks io/fifos without
attaching or starting the copy routines.

It adds the load method in `ctr` by default so that fifos or other IO
are removed from disk on delete methods inbetween command runs.  It is
not the default for all task loads for backwards compat. and a user may
want to keep io around to reuse or if log files are used.

Fixes #2421

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-06-26 11:48:26 -04:00
Michael Crosby
68e144c637 Set shim max procs via env var
This sets the shim's max procs to 2, like we already have hard coded in
the shim, with the env var so that it is set at go runtime boot.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-06-26 10:49:59 -04:00
Lantao Liu
f6ab733f9e Set stream server to serve on localhost on GCE.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-06-26 07:13:00 +00:00
Stephen Day
1ac546b3c4
Merge pull request #2411 from flx42/move-containerflags
Move ContainerFlags to "commands" package
2018-06-25 13:37:35 -07:00
Yu-Ju Hong
e23c0e708a
Fix link to GCE getting started guide
Signed-off-by: Yu-Ju Hong <yjhong@google.com>
2018-06-25 12:10:03 -07:00
Michael Crosby
e239f65590 Handle abs path for rootfs in oci hook
Fixes #2412

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-06-25 14:10:17 -04:00
Michael Crosby
f15c3be348
Merge pull request #2417 from dmcgowan/update-arm64-normalize
Normalize arm64 to an empty variant
2018-06-25 11:45:14 -04:00
Derek McGowan
db3c5afc6d
Normalize arm64 to an empty variant
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-23 16:35:46 -07:00
Derek McGowan
47a128d455
Merge pull request #2414 from dmcgowan/platform-arm-normalization
Fix arm platform matching
2018-06-22 13:15:23 -07:00
Phil Estes
995310cda9
Merge pull request #2408 from estesp/carry-2363
Update architecture.md (Carry PR 2363)
2018-06-22 11:49:23 -04:00
Derek McGowan
7049671465
Add support for proxy plugins in configuration
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-21 18:57:42 -07:00
Derek McGowan
37ab93e2c8
Fix arm platform matching
The normalization was being inconsistently applied causing a
failure to match some platforms in manifest lists.
Fix the matcher and normalization to be more consistent and
add changes to parser to prevent the defaulted variants from being
set in the platform structure.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-21 17:07:58 -07:00
Lantao Liu
4eb4a29577
Merge pull request #825 from abhi/cni_config
Change to keep in sync with latest cni config
2018-06-21 16:14:31 -07:00
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
Phil Estes
7ff2748f9c
Merge pull request #2410 from tonistiigi/mlist-error
images: provide better error for manifest list match error
2018-06-20 23:03:37 -04:00
Felix Abecassis
5dd22a20af Move ContainerFlags to "commands" package
Commit 05513284e7 exposed the "rootfs"
and "no-pivot" flags for the "containers" command, but it accidentally
removed them for "run" since package-level variables are initialized
before package-level init functions in golang. Hoisting these flags to
a package imported by both commands solves the problem.

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
2018-06-20 18:33:59 -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
Tonis Tiigi
53fe31d6de images: provide better error for manifest list match error
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-20 13:43:27 -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
Andrew Osheroff
3c5b0dcf27
Update architecture.md
Signed-off-by: Andrew Osheroff <andrewosh@gmail.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-06-19 18:13:14 -04: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
Phil Estes
c1e1f3d6d9
Merge pull request #2397 from harche/doc_fix
Docs: Fix incomplete instructions for building using docker
2018-06-13 17:37:41 -07:00
Harshal Patil
ef449aa38e Docs: Fix incomplete instructions for building using docker
Fixes: #2396

Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
2018-06-13 13:38:57 +05:30
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
Kenfe-Mickaël Laventure
0158a6fb34
Merge pull request #2393 from vdemeester/gotestyourself-with-tools
Update gotestyourself to gotest.tools
2018-06-11 07:35:25 -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
Vincent Demeester
832b05ae67
Update tests to use gotest.tools angel
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-08 21:02:01 +02:00
Vincent Demeester
3830180ce5
Replace gotestyourself by gotest.tools
github.com/gotestyourself/gotestyourself moved to gotest.tools with
version 2.0.0. Moving to that one, bumping it to v2.1.0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-08 21:00:45 +02: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
Michael Crosby
35887db096
Merge pull request #2370 from dmcgowan/update-maintainers-rules
Update adding maintainer section
2018-06-08 10:22:58 -04:00