Commit Graph

10590 Commits

Author SHA1 Message Date
Lantao Liu
8c6d5e0ca2 Add systemd unit files for containerd and cri-containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-08 17:44:29 +00:00
Michael Crosby
52fbc5f03a Merge pull request #1490 from ijc/defalt
Correct spelling of default.
2017-09-08 10:47:55 -04:00
Phil Estes
a791f0442a Merge pull request #1489 from crosbymichael/list-state
Handle locking and errors for process state
2017-09-07 20:03:14 -04:00
Ian Campbell
128aaf6eec Correct spelling of default.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-09-07 23:16:05 +01:00
Brian Goff
3552ce5688 Add field to Container for client-defined data
This field allows a client to store specialized information in the
container metadata rather than having to store this itself and keep
the data in sync with containerd.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-09-07 16:54:47 -04:00
Michael Crosby
951c129bf1 Handle locking and errors for process state
ref: #1464

This tries to solve issues with races around process state.  First it
adds the process mutex around the state call so that any state changes,
deletions, etc will be handled in order.

Second, for IsNoExist errors from the runtime, return a stopped state if
a process has been removed from the underlying OCI runtime but not from
the shim yet.  This shouldn't happen with the lock from above but its
hare to verify this issue.

Third, handle shim disconnections and return an ErrNotFound.

Forth, don't abort returning all tasks if one task is unable to return
its state.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-07 16:22:00 -04:00
Kenfe-Mickaël Laventure
17901fafa0 Merge pull request #1488 from crosbymichael/prom-containers
Add config for exporting container metrics to prom
2017-09-07 13:21:12 -07:00
Lantao Liu
062abad648 Run node e2e for both cron and branch update
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-07 18:00:11 +00:00
Michael Crosby
72bcdb8fa9 Add config for exporting container metrics to prom
This adds an option for the cgroups monitor to include container metrics
in the prometheus output.  We will have to use the plugin to emit oom
events via the events service but when the `no_prom` setting is set for
the plugin container metrics will not be included in the prom output.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-07 13:40:55 -04:00
Lantao Liu
777f001432 Merge pull request #200 from yanxuean/tomlconfig
Add config file for cri-containerd
2017-09-07 10:36:32 -07:00
Michael Crosby
aa8bd16ae7 Merge pull request #1487 from crosbymichael/guide
[carry] Improve getting started guide
2017-09-07 11:21:45 -04:00
Michael Crosby
9c207952b0 Add go build and ./main to guide
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-07 11:14:37 -04:00
Roy Inganta Ginting
34a58ce0d4 Improve the getting started guide
Here is list of improvement:
- Add 2 intermediate full samples of code that can be compiled and ran
- Link to Runc.md page for runc installation
- Fix typo at the "Task Wait and Start" section
- Fix missing commands to run sample code at the getting stated guide
- Explicitly State go 1.8.x or above and link back to golang install page

Signed-off-by: Roy Inganta Ginting <ringanta.ginting@gmail.com>
2017-09-07 11:12:37 -04:00
Michael Crosby
2cfd7df257 Merge pull request #1456 from ijc/ctr-list-no-labels
ctr: drop labels from `ctr containers` subcommand list
2017-09-07 11:07:05 -04:00
yason
e1a8968f5a add config file for cri-containerd
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-09-07 15:07:47 +08:00
Akihiro Suda
2f08032924 remotes/docker: add scope (registry:foo/bar:pull)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-09-07 05:10:48 +00:00
Akihiro Suda
aaae706067 remotes/docker: allow 404 for POST /v2/token
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-09-07 04:58:44 +00:00
Kunal Kushwaha
b6fb234142 Testcase added for deletion of files in lower layer
Files/folders deleted in lower layer and commited,
 it should not reflect on upper layer

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2017-09-07 13:34:33 +09:00
Kunal Kushwaha
121d337713 Added testcase Removal of intermediate snapshot
Removal of intermediate snapshot layer must fail.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2017-09-07 13:31:04 +09:00
Lantao Liu
7a75a91578 Merge pull request #225 from Random-Liu/update-ocicni
Update ocicni to 73f1309d6bc5c3eac78c1382408921cd771ff22e
2017-09-06 21:04:45 -07:00
Lantao Liu
3e4b4234c6 Merge pull request #218 from miaoyq/fixes-185
Update kubernetes version and support mount propagation
2017-09-06 21:03:56 -07:00
Yanqiang Miao
9da460ec0a Support mount propagation
fixex #185

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-09-07 08:58:20 +08:00
Lantao Liu
f36ef46b35 Use new ocicni.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-07 00:14:12 +00:00
Lantao Liu
1c0385a650 Update ocicni to 73f1309d6bc5c3eac78c1382408921cd771ff22e
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-07 00:14:01 +00:00
Lantao Liu
a316d1557f Merge pull request #223 from Random-Liu/remove-unused-todo
Remove an addressed TODO.
2017-09-06 17:11:36 -07:00
Lantao Liu
8bc991b545 Merge pull request #211 from Random-Liu/upload-log-to-gcs
Upload node e2e test log to gcs
2017-09-06 16:36:04 -07:00
Lantao Liu
2b6302d91d Remove an addressed TODO.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-06 23:29:27 +00:00
Stephen Day
d0457b2213 Merge pull request #1481 from stevvooe/beta0
release: prepare 1.0.0-beta.0
2017-09-06 16:26:13 -07:00
Lantao Liu
49bcfb3665 Upload node e2e test log to gcs
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-06 23:09:50 +00:00
Stephen J Day
a2e89919d9
release: prepare 1.0.0-beta.0
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-06 16:06:04 -07:00
Stephen Day
3b282ba7b1 Merge pull request #1480 from dmcgowan/unique-unpack-keys
Support simultaneous unpacking of same layer
2017-09-06 16:00:03 -07:00
Derek McGowan
09f24214a6 Merge pull request #1466 from AkihiroSuda/snapshotkey
api: RootFS -> SnapshotKey
2017-09-06 15:46:23 -07:00
Derek McGowan
597d0d76ae
Support simultaneous unpacking of same layer
Prevent unpack failures due to id collision or the need to
wait for another process to finish unpacking. Always attempt
to unpack a layer and handle collisions on commit. Commit
collisions are easily handled as it could be considered the
same as a successful unpack.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-09-06 15:45:31 -07:00
Akihiro Suda
e30e0c8b75
api: RootFS -> SnapshotKey
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-06 15:22:19 -07:00
Derek McGowan
8b63386924 Merge pull request #1479 from stevvooe/baseline-api-txt
api, linux/runcopts: ensure output is current
2017-09-06 15:14:47 -07:00
Lantao Liu
34319e025f Merge pull request #221 from ijc/writeable-rootfs-snapshot
Always use a writeable snapshot as the rootfs.
2017-09-06 15:10:28 -07:00
Kenfe-Mickaël Laventure
e66d1a7961 Merge pull request #1468 from crosbymichael/stats
Add Metrics endpoint to tasks
2017-09-06 14:59:55 -07:00
Stephen J Day
157cfb1ad2
api, linux/runcopts: ensure output is current
Ensure that the descriptors are re-generated on the CI and block merges
that don't include updates. We also enable the `check-protos` check as
part of this process. The installation process for protobufs has been
fixed to support protobuild.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-06 14:51:53 -07:00
Ian Campbell
0161764ef5 Always use a writeable snapshot as the rootfs.
This will be made readonly by runc based on spec.Root.Readonly (which we
already set correctly) but defering until then gives runc the chance to make
any missing mount points as it processes the spec.Mount array.

This is necessary because many container images lack mount points for things
like the /etc/hosts which we want to overbind. This is not noticed with e.g.
Docker because it automatically creates an additional layer containing those.
This is something we may want to do here as well eventually but for now using a
writeable snapshot is both necessary and sufficient.

The same does not apply to the sandbox since we never modify its rootfs or want
to mount anything in it etc, add a comment to clarify.

Fixes #220.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-06 22:20:14 +01:00
Lantao Liu
e06c2c59e0 Merge pull request #179 from Random-Liu/checkpoint-container-status
Checkpoint container status onto disk.
2017-09-06 13:51:38 -07:00
Michael Crosby
2ed3c62e27 Update cgroups to 5933ab4dc4f7caa3a73a1dc141bd11f4
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-06 16:20:19 -04:00
Michael Crosby
843b35c9f2 Merge pull request #1478 from estesp/freebsd-compile
Fix FreeBSD compilation
2017-09-06 15:03:49 -04:00
Phil Estes
8b938b00bc
Fix FreeBSD compilation
Corrects compile on FreeBSD by handling the lack of ENODATA on FreeBSD.
Since continuity project has already handled this, using their const is
simpler than separating a few extra files in containerd/containerd.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-09-06 14:38:07 -04:00
Derek McGowan
e0f7b5f1bb Merge pull request #1477 from stevvooe/revert-rootfs-init
Revert "rootfs: remove unused functions"
2017-09-06 11:32:32 -07:00
Kenfe-Mickaël Laventure
e1eeb0e0a2 Merge pull request #1475 from dmcgowan/content-commit-context
Add context to content commit
2017-09-06 11:04:31 -07:00
Stephen J Day
4d8f7895e4
Revert "rootfs: remove unused functions"
This reverts commit 4e2337794c.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-06 11:00:21 -07:00
Derek McGowan
9613acb2ed
Add context to content commit
Content commit is updated to take in a context, allowing
content to be committed within the same context the writer
was in. This is useful when commit may be able to use more
context to complete the action rather than creating its own.
An example of this being useful is for the metadata implementation
of content, having a context allows tests to fully create
content in one database transaction by making use of the context.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-09-06 10:19:12 -07:00
Michael Crosby
bf08f7cd08 Merge pull request #1474 from mlaventure/update-gorunc
Update go-runc to b3c048c028ddd789c6f9510c597f8b9c62f25359
2017-09-06 11:16:23 -04:00
Kenfe-Mickael Laventure
f766801a99
Update go-runc to b3c048c028ddd789c6f9510c597f8b9c62f25359
This fixes an issue with Exec not returning a proper error

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-09-06 08:09:09 -07:00
Lantao Liu
8569fa366e Merge pull request #215 from Random-Liu/add-capability-all
Add "ALL" capabilities support.
2017-09-05 18:14:36 -07:00