Commit Graph

11956 Commits

Author SHA1 Message Date
Phil Estes
8f183b5ee9
Add basic manpages for ctr, containerd, containerd-config
Adds initial manpages for ctr, containerd, and containerd config
commands, as well as the config.toml configuration file.

Adds targets to Makefile for generating and installing manpages.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-02-14 15:17:31 -05:00
Michael Crosby
b2ec177bb2 Call temp mounts and unmount in containerd server
Fixes #2004

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-14 15:16:54 -05:00
Michael Crosby
bc974a7a32 Create temp mount location manager
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-14 15:14:02 -05:00
Lantao Liu
561d045d71
Merge pull request #612 from Random-Liu/health-monitor-initial-wait
Add initial wait for health-monitor and use pkill -x.
2018-02-14 11:36:45 -08:00
Phil Estes
002cabade8
Merge pull request #2131 from AkihiroSuda/split-pkg-cmd-containerd-2
cmd/containerd: split package for cli.App
2018-02-14 14:24:07 -05:00
Lantao Liu
9b2d2a203c Add initial wait for health-monitor and use pkill -x.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-14 18:51:22 +00:00
Akihiro Suda
d7280ce2fb cmd/containerd: split package for cli.App
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-14 17:44:22 +09:00
Lantao Liu
6d538ccbf6 Do not block on stream server close.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-14 08:41:29 +00:00
Lantao Liu
df461c0d48
Merge pull request #609 from Random-Liu/support-reopen-container-log
Support reopening container log.
2018-02-13 10:51:22 -08:00
Lantao Liu
a8264ec035 Support reopening container log.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-13 17:57:45 +00:00
Kenfe-Mickaël Laventure
af593cf5ab
Merge pull request #2130 from justincormack/environmnet
Fix typo in variable name
2018-02-13 07:23:22 -08:00
Justin Cormack
eab5d87af1 Fix typo in variable name
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-02-13 15:06:49 +00:00
Kenfe-Mickaël Laventure
dd920d99c8
Merge pull request #2125 from estesp/website-update
Carry #1951: Website update
2018-02-12 11:34:31 -08:00
Michael Crosby
efb813f18b
Merge pull request #2126 from dmcgowan/fix-2119
archive/diff: fix consecutive directory removal bug
2018-02-12 14:16:40 -05:00
Phil Estes
a929f9c746
Add further updates for website refresh
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-02-12 13:45:45 -05:00
Derek McGowan
ca3eb742fd
Update continuity vendor
Picks up fix for consecutive directory deletion

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-12 10:45:15 -08:00
Derek McGowan
2a2c8aafba
Add test for consecutive directory removal
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-12 10:43:16 -08:00
Micheal Waltz
43b655b557
Link Docker release notes for containerd version
Clarify which version of Docker use containerd versions and link to
release notes.

Signed-off-by: Micheal Waltz <ecliptik@gmail.com>
2018-02-12 13:38:07 -05:00
Micheal Waltz
38ef0b6d3c
Updates to containerd.io index page
- Fixes broken Dockercon link
- Attemps to clarify 1.0.0 release and support status

Signed-off-by: Micheal Waltz <ecliptik@gmail.com>
2018-02-12 13:37:56 -05:00
Michael Crosby
7022a19a4c
Merge pull request #2024 from dnephin/replace-testify
Replace testify with gotestyourself/assert
2018-02-12 13:27:26 -05:00
Phil Estes
2cd6b83b9b
Merge pull request #2123 from BooleanCat/master
Fix typo in docs
2018-02-12 12:26:28 -05:00
Daniel Nephin
3279acca82 Check timestamps in snapshot storage test suite
also use t.Helper()
convert assertions to canonical

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-02-12 12:26:26 -05:00
Daniel Nephin
37aa41b164 Cleanup after migration
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-02-12 12:26:26 -05:00
Daniel Nephin
ef48a0268e Migrate to gotestyourself/assert
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-02-12 12:26:26 -05:00
Daniel Nephin
1719a6e17a Vendor gotestyourself
and remove testify and spew

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-02-12 12:26:23 -05:00
Tom Godkin
19e9e1642a Fix typo in docs
Signed-off-by: Tom Godkin <tgodkin@pivotal.io>
2018-02-12 17:11:05 +00:00
Michael Crosby
5471ba9445
Merge pull request #2117 from dmcgowan/update-fetch-handlers
content: support manifest labeling on completed content ingests on the client
2018-02-12 11:08:14 -05:00
Lantao Liu
8357315564
Merge pull request #608 from mikebrow/relax-author-case-sensitivity
adds lower case containerd to the list of authors
2018-02-09 15:21:16 -08:00
Derek McGowan
944a9ade37
Update fetch handling
Fix issue where manifest content must always be fetched
even if it is already fully downloaded or shared locally.
Simplify children label setting and platform filtering.
Prevent getting a fetcher when content shared locally.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-09 14:33:14 -08:00
Michael Crosby
d3a7a92d30
Merge pull request #2118 from AkihiroSuda/narrower-interface
*: use narrower content interfaces
2018-02-09 15:04:38 -05:00
Mike Brown
dd1682c84e adds lower case containerd to the list of authors
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-02-09 11:02:59 -06:00
Akihiro Suda
ee70879202 *: use narrower content interfaces
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-09 19:52:52 +09:00
Lantao Liu
50c7aac41f
Merge pull request #607 from Random-Liu/no-cni-fastbuild
Do not fast build.
2018-02-09 01:51:32 -08:00
Lantao Liu
944958722c
Merge pull request #601 from Random-Liu/support-new-cri-storage-id
Support new cri storage
2018-02-09 01:03:32 -08:00
Lantao Liu
09aff83bdd Do not fast build.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-09 08:53:26 +00:00
Lantao Liu
6900cbdada Use mountpoint as image fs identifier.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-09 07:46:49 +00:00
Lantao Liu
a555bc25b9 Update kubernetes
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-09 07:42:54 +00:00
Lantao Liu
3dbc24a701
Merge pull request #605 from mikebrow/runc-update
update runc vendor
2018-02-08 17:42:34 -08:00
Mike Brown
6e1c57ec01 update runc vendor and containerd
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-02-08 19:01:48 -06:00
Stephen Day
ee6ffdd91e
Merge pull request #2116 from crosbymichael/bump-runc
Update runc to a618ab5a0186905949ee463dbb762c3d23e
2018-02-08 15:09:43 -08:00
Lantao Liu
4f4d89da58
Merge pull request #556 from ijc/hack-versions
hack/versions: extract most from vendor.conf
2018-02-08 13:37:14 -08:00
Lantao Liu
f2e8497426
Merge pull request #606 from Random-Liu/remove-reset
kubeadm has supported reset with crictl.
2018-02-08 11:26:24 -08:00
Lantao Liu
4dec156418
Merge pull request #604 from Random-Liu/fix-kube-up-env
The ENV is finalized as KUBE_KUBELET_EXTRA_ARGS.
2018-02-08 11:25:11 -08:00
Derek McGowan
57011c5b89
Merge pull request #2114 from crosbymichael/stress-errors
Capture more error locations during stress tests
2018-02-08 10:58:17 -08:00
Lantao Liu
a904f47c76 The ENV is finalized as KUBE_KUBELET_EXTRA_ARGS.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-08 18:48:46 +00:00
Lantao Liu
f2cb57d441 kubeadm has supported reset with crictl.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-08 18:47:27 +00:00
Michael Crosby
5ae204ff65
Merge pull request #2115 from justincormack/fallthrough
Remove a really confusing fallthrough
2018-02-08 11:38:13 -05:00
Michael Crosby
73837b11db Update runc to a618ab5a0186905949ee463dbb762c3d23e
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-08 11:30:24 -05:00
Justin Cormack
35be3d5127 Remove a really confusing fallthrough
This is so confusing, and not needed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-02-08 16:22:29 +00:00
Ian Campbell
f6dd8c9e52 hack/versions: extract most from vendor.conf
This sets `$what_VERSION` and `$what_REPO` for runc, cni, containerd and
kubernetes based on vendor.conf, removing the need to duplicate things in
hack/versions.

With this `update_hack_versions` becomes redundant so remove it and both calls.

Since CONTAINERD_REPO is now unconditionally set we can also simplify the
fetching of vendor.conf in update-vendor.sh a bit, so do so. Further since
`*_REPO` are now unconditionally set we can support alternative clone paths for
all of these repos by adjusting checkout_repo to make the 3rd argument
non-optional and always passing it. Since `CRITOOL_VERSION` is not coming from
`vendor.conf` (since it is not used from Go code) we manually set
`CRITOOL_REPO` for consistency.

The final wrinkle is that `k8s.io/kubernetes` is has a Go specific redirect in
the form of HTML meta headers returned from https://k8s.io/kubernetes/?go-get=1
which point to the real repo to clone. Parsing that in shell is tricky so just
hardcode that.

Fixes #540.

Signed-off-by: Ian Campbell <ijc@docker.com>
2018-02-08 13:47:46 +00:00