abhi
f3ccd85891
Adding Registry Mirror support
...
This commit aims to add registy mirror support similar to
docker. The UI is similar to docker where user can
provide mirror urls and the image resolves against the provided
mirrors before fetching from default docker regitry mirror url.
Signed-off-by: abhi <abhi@docker.com>
2018-01-31 10:47:34 -08:00
yason
6931a69881
add filter for containerd event
...
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2018-01-30 14:13:22 +08:00
Lantao Liu
4dfd8250fd
Fix a privileged check.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-27 02:25:52 +00:00
Yanqiang Miao
61c1fdb098
Use channel to propagate the stop info of sandbox
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2018-01-26 16:58:13 +08:00
Lantao Liu
f401662123
Merge pull request #571 from Random-Liu/do-not-list-task
...
Avoid containerd access as much as possible.
2018-01-25 16:13:43 -08:00
Lantao Liu
df58d6825d
Avoid containerd access as much as possible.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-25 23:36:00 +00:00
Lantao Liu
e7f2a74a84
Add runtime cgroup and fix a cli panic.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-25 22:32:57 +00:00
Yanqiang Miao
c663d2423e
Use channel to pass the stop info instead of polling for container stop
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2018-01-25 11:07:54 +08:00
Lantao Liu
635e5747c0
Update containerd and leverage plugin graceful stop.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-23 22:46:46 +00:00
Lantao Liu
2b6f084f36
Disable IPv6 dad by default.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-22 23:54:16 +00:00
Lantao Liu
4e9ca399e1
Use containerd plugin config.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-19 02:25:03 +00:00
Lantao Liu
7d18d61674
Move cgroup and oom score setting to cmd.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-19 01:35:36 +00:00
Lantao Liu
74d8880032
Merge pull request #552 from Random-Liu/use-containerd-grpc-server
...
Use containerd grpc server
2018-01-18 12:36:05 -08:00
Lantao Liu
62e6921145
Use containerd grpc server
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-18 18:51:18 +00:00
Lantao Liu
6fadb7f5e9
Minor code cleanup.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-18 07:31:16 +00:00
Lantao Liu
3d68005c04
Replace glog with logrus
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-17 21:57:31 +00:00
Lantao Liu
383a89b948
Add flags and utils for logrus
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-17 21:57:31 +00:00
Jose Carlos Venegas Munoz
b383b0261a
Annotations: Provide container metadata for VM based runtimes
...
For hypervisor-based container runtimes (like Kata Containers, Clear Containers
or runv) a pod will be created in a VM and then create containers within the VM.
When a runtime is requested for container commands like create and start, both
the instal "pause" container and next containers need to be added to the pod
namespace (same VM).
A runtime does not know if it needs to create/start a VM or if it needs to add a
container to an already running VM pod.
This patch adds a way to provide this information through container annotations.
When starting a container or a sandbox, 2 annotations are added:
- type (Container or Sandbox)
- sandbox name
This allow to a VM based runtime to decide if they need to create a pod VM or
container within the VM pod.
Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-01-17 09:57:20 -06:00
Lantao Liu
cdb1bf0946
Use new cio package.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-12 22:35:24 +00:00
Lantao Liu
8782f18d50
Add integration test for volume copy up.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-11 19:10:52 +00:00
Lantao Liu
54b3b4e0b0
Use graphdriver/copy instead of chrootarchive
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-11 19:10:11 +00:00
Lantao Liu
025ffe551f
Rename kubernetes-incubator/cri-containerd to containerd/cri-containerd.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-10 22:35:33 +00:00
Lantao Liu
5bfa5e451a
Merge pull request #528 from cpuguy83/skip_selinux_test
...
Minor cleanup on selinux test
2018-01-09 16:30:41 -08:00
Brian Goff
2a07847d67
Use t.Run()
instead of t.Log()
for subtest log
...
Signed-off-by: Brian Goff <brian.goff@docker.com>
2018-01-09 15:45:13 -05:00
Brian Goff
96484eb3e7
Use t.Skip() when selinux is not enabled
...
Signed-off-by: Brian Goff <brian.goff@docker.com>
2018-01-09 15:43:56 -05:00
Lantao Liu
dca05358dc
Add flag to skip imagefs uuid related logic.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-08 18:41:13 +00:00
Lantao Liu
aee7a366f3
Merge pull request #525 from abhi/cniip
...
Caching IP allocated by CNI plugin
2018-01-05 00:27:48 -08:00
abhi
f1dbc0b375
Caching IP allocated by CNI plugin
...
Signed-off-by: abhi <abhi@docker.com>
2018-01-04 20:00:55 -08:00
Lantao Liu
31bc964195
Enable HostSpecific option in runtime-tools generator.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-03 19:04:47 +00:00
Lantao Liu
cebe1b39f7
Remove default rlimits.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-02 18:53:01 +00:00
Lantao Liu
b701b0e496
Add our own DeepCopy.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-16 00:23:14 +00:00
Lantao Liu
737efe70a7
Merge pull request #493 from Random-Liu/minor-cleanup
...
Minor cleanup.
2017-12-12 23:30:47 -08:00
Lantao Liu
e4753edf0a
Minor cleanup.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-13 03:15:01 +00:00
yason
6c9a837b7a
cleanup some comment for removeImage
...
Signed-off-by: yason <yan.xuean@zte.com.cn>
2017-12-13 10:07:52 +08:00
Lantao Liu
a9c7237e67
Merge pull request #470 from mikebrow/debug-image
...
adding info map for verbose image status
2017-12-12 15:09:57 -08:00
Mike Brown
31223fd5b1
adds oci image spec to image info placed into imagestore
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-12-12 15:58:07 -06:00
Lantao Liu
cbda4256cd
Merge pull request #487 from yanxuean/image-improve
...
improve image
2017-12-12 11:58:43 -08:00
Mike Brown
03ac989644
adding info map for verbose image status
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-12-12 13:44:08 -06:00
Lantao Liu
c9b279bb79
Merge pull request #479 from Random-Liu/improve-container-sandbox-status
...
Improve container sandbox status
2017-12-12 11:42:51 -08:00
yason
5f6d9a5fcc
reliably remove image when content missing
...
Signed-off-by: yason <yan.xuean@zte.com.cn>
2017-12-12 18:44:59 +08:00
yason
4762b3e273
remove taskService and imageStoreService
...
Signed-off-by: yason <yan.xuean@zte.com.cn>
2017-12-12 16:51:22 +08:00
Lantao Liu
f4c572fba7
Add restart test for sandbox recovery.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-11 21:21:08 +00:00
Lantao Liu
dd017e6e6c
Move less important function to the end.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-11 18:45:57 +00:00
Lantao Liu
b25b06577e
Improve container and sandbox status.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-11 18:45:56 +00:00
yason
41c8763e2b
improve calling for content
...
Signed-off-by: yason <yan.xuean@zte.com.cn>
2017-12-11 15:28:10 +08:00
Mike Brown
220411b73b
adding info map for verbose pod status
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-12-05 19:40:39 -06:00
Lantao Liu
11eb24c26f
Merge pull request #475 from Random-Liu/order-container-status-fields
...
Use one big info struct before we change info to an array.
2017-12-05 14:37:36 -08:00
Lantao Liu
85b943eb47
Use one big info struct before we change info to an array.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-05 21:37:12 +00:00
Lantao Liu
266e49a3bf
Merge pull request #471 from yanxuean/improve-unmount
...
Improve unmount for snapshot
2017-12-05 09:54:05 -08:00
yason
2a25cf7c1f
sync Unmount for snapshot
...
best effort to remove temp dir for snapshot
Signed-off-by: yason <yan.xuean@zte.com.cn>
2017-12-05 19:05:32 +08:00
Lantao Liu
572e354a2d
Revert debug code.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-05 07:40:11 +00:00
Lantao Liu
562eb725c7
Merge pull request #458 from mikebrow/boilerplate-update
...
fixes for boilerplate
2017-12-04 10:03:41 -08:00
Mike Brown
bd6d530290
Merge pull request #463 from Random-Liu/dump-rootfs
...
Check and dump rootfs.
2017-12-03 09:23:04 -06:00
Lantao Liu
a23bdf25d8
Check and dump rootfs.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-03 11:39:54 +00:00
abhi
43c05efb22
Revert: Setting containerd shim cgroup same as pod cgroup
...
Signed-off-by: abhi <abhi@docker.com>
2017-12-01 16:03:38 -08:00
Mike Brown
009e40f280
correct some boilerplates
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-12-01 16:56:25 -06:00
Lantao Liu
181d7d5076
Move shim cgroup opts to pkg/containerd/opts.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-01 19:18:26 +00:00
abhi
0d6774f4af
Setting containerd shim cgroup same as pod cgroup
...
Signed-off-by: abhi <abhi@docker.com>
2017-12-01 08:33:50 -08:00
Lantao Liu
0db6e04ba1
Merge pull request #447 from Random-Liu/update-containerd
...
Update containerd to fix long exec issue.
2017-11-30 12:58:24 -08:00
Lantao Liu
5ed43ea1a3
Update containerd to fix long exec issue.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-30 19:24:14 +00:00
Lantao Liu
dc7066d23f
Merge pull request #445 from mikebrow/debug-container
...
adding some verbose debug
2017-11-30 11:15:34 -08:00
Mike Brown
33b93fb1d0
adding some verbose debug
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-11-30 09:51:03 -06:00
Lantao Liu
200ba370a3
Merge pull request #438 from yanxuean/import-lease
...
add lease for importer
2017-11-29 10:18:37 -08:00
yanxuean
089df25492
add lease for importer
...
fix #389
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-29 14:02:54 +08:00
Lantao Liu
5f0fba4204
Update containerd and add synchronous image deletion.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-28 22:44:25 +00:00
Mike Brown
4934098e27
Merge pull request #440 from dnephin/use-oci-package
...
Use containerd.oci package
2017-11-28 16:41:26 -06:00
Daniel Nephin
85d3bf0660
Use SpecOpts from new oci package
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-11-28 15:30:11 -05:00
Brian Goff
f6fe36d17a
Remove explicit unpack on all container creates
...
This only performs an unpack if there is an error when creating the
container snapshot (and only if it's a "not found' error) since it should
already be unpacked.
Signed-off-by: Brian Goff <brian.goff@docker.com>
2017-11-28 14:28:20 -05:00
Lantao Liu
4b4714eaca
Merge pull request #432 from mikebrow/vet-fixes
...
fixing vet errors
2017-11-27 12:03:30 -08:00
Lantao Liu
80c7d18703
Merge pull request #431 from Random-Liu/update-containerd
...
Update containerd
2017-11-27 12:03:18 -08:00
Lantao Liu
1b05f088b5
Merge pull request #375 from yanxuean/image-trunc
...
support get image by truncindex
2017-11-27 11:36:58 -08:00
yanxuean
50cb8a0571
update containerd for refactor
...
fix #423
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-27 19:24:14 +00:00
Mike Brown
983994dc87
fixing vet errors
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-11-27 13:13:21 -06:00
yanxuean
b4ebf2d7a7
improve localResolve
...
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-23 10:56:12 +08:00
yanxuean
cbe7f0dd5a
use docker.digestSet store image truncid
...
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-23 10:55:59 +08:00
Lantao Liu
6104fcba3c
Merge pull request #421 from Random-Liu/add-new-cri-log-support
...
Add new cri log support
2017-11-21 13:09:57 -08:00
Lantao Liu
48726ecd27
Add support for CRI partial log.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-21 19:24:12 +00:00
Lantao Liu
76268ea242
Do not remove sandbox when netns is not closed.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-21 01:22:19 +00:00
Lantao Liu
3f80fe06ef
Add simple unit test.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-16 23:04:33 +00:00
Lantao Liu
03aca5e82b
Fix data race.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-14 05:35:44 +00:00
Lantao Liu
57f37ca66e
Print full container spec for debugging.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-13 23:36:12 +00:00
Lantao Liu
01493463db
Fix streaming deadlock.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-13 05:51:14 +00:00
Lantao Liu
3557cffbbb
Fix container exec
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-10 21:03:29 +00:00
Lantao Liu
e41b6d3c24
Refactor container io code
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-10 21:03:29 +00:00
Lantao Liu
c4931c8409
Keep stdin open instead of opening when use it.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-09 09:28:30 +00:00
Lantao Liu
2433ae7539
Merge pull request #393 from abhi/labels
...
Adding kube pod and container labels to containerd
2017-11-07 23:39:20 -08:00
abhi
cd5886d647
Adding kube pod and container labels to containerd
...
Currently we have the pod and container labels part of
containerd metadata extensions. However for third party users
like cadvisor that depend on standard kube labels will need
to be aware of the way metadata is stored in containerd to
fetch the labels.
Signed-off-by: abhi <abhi@docker.com>
2017-11-07 22:19:19 -08:00
Lantao Liu
affc6e93a8
Merge pull request #397 from yanxuean/trunc-for-list
...
Add truncindex for filter in List and Stat
2017-11-07 00:41:03 -08:00
yanxuean
12bbbc0edc
add unit test for listcontainer and listpodsandbox
...
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-07 15:57:29 +08:00
Lantao Liu
75e97dd168
Reverse the wrong logic for tty.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-07 02:03:44 +00:00
Lantao Liu
b9d4eda403
Merge pull request #401 from Random-Liu/add-comment
...
Add comment for #398 .
2017-11-06 14:09:50 -08:00
Lantao Liu
68e74dc16a
Merge pull request #394 from Random-Liu/fix-container-streaming
...
Various fixes for container streaming.
2017-11-06 14:09:30 -08:00
Lantao Liu
6f97764171
Add comment for #398 .
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-06 20:54:50 +00:00
Lantao Liu
eec818e6ab
Various fixes for container streaming.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-06 20:50:50 +00:00
Lantao Liu
e363c218d6
Merge pull request #395 from Random-Liu/fix-image-in-container-status
...
Return image tag as image spec.
2017-11-06 10:55:37 -08:00
Justin Cormack
913836474b
Remove comment about whether other paths should be read only with ro root
...
Since https://github.com/moby/moby/pull/35344 we clarified that this behaviour
was a mistake, and the read only flag should just apply to the actual rootfs,
so it corresponds to the OCI read-only option. Other mounts may be able to be
adjusted by re-specifying them or other means but this is unrelated.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-11-06 14:21:16 +00:00
yanxuean
6234337459
Add truncindex for filter in List and Stat
...
fix #344
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-06 16:47:43 +08:00
Lantao Liu
050ee1de95
Return image tag as image spec.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-06 06:05:49 +00:00
Lantao Liu
74abfe349d
Add crictl config.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-06 05:28:58 +00:00
Lantao Liu
9f2de2cd02
Merge pull request #382 from miaoyq/return-config
...
"Status" function return cri-containerd config in json format
2017-11-02 20:41:31 -07:00
Lantao Liu
e19e043a4c
Merge pull request #386 from Random-Liu/fix-spammy-cni-log
...
Get rid of spammy CNI log.
2017-11-02 20:40:50 -07:00
Yanqiang Miao
9b71208be9
"Status" function return cri-containerd config in json format
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-11-03 09:23:05 +08:00
Lantao Liu
73c2cb5632
Fix spammy CNI log.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-03 01:08:07 +00:00
Mike Brown
df6f4a3655
adds help for load command ( #383 )
...
* adds help for load command
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
* vendor restrom/dedent
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-11-02 15:38:24 -07:00
Lantao Liu
8679d10733
Merge pull request #380 from Random-Liu/fix-deadlock
...
Do not call `Usage` inside `Walk`.
2017-11-01 22:04:10 +01:00
Lantao Liu
2453c03daa
Do not call Usage
inside Walk
.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-01 18:11:11 +00:00
Lantao Liu
2cb1572667
Merge pull request #379 from yanxuean/unpack
...
Use image.IsUnpacked
2017-11-01 07:50:12 +01:00
yanxuean
9027a02e8e
Use image.IsUnpacked
...
fix #361
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-11-01 13:51:25 +08:00
Lantao Liu
4eaaee380f
Fix removing state recover.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-31 20:03:58 +00:00
Lantao Liu
4e6e1cab0d
Add the missing container log path in container status.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-30 06:03:52 +00:00
Lantao Liu
1d14c11dcb
Merge pull request #368 from Random-Liu/not-log-output
...
Do not log container output in error log.
2017-10-28 05:50:14 +02:00
Lantao Liu
f2fa351a1f
Do not log container output in error log.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-28 02:16:43 +00:00
Lantao Liu
6cded68bac
Merge pull request #360 from Random-Liu/add-image-load
...
Add image load
2017-10-28 00:43:20 +02:00
Lantao Liu
25fdf72692
Add image load.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 21:51:04 +00:00
Lantao Liu
32806fa375
Fix a log line and also set containerd log level to debug in node e2e.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 07:21:37 +00:00
Lantao Liu
f10cc58362
Revert "Put containerd-shim into pod cgroup"
...
This reverts commit e9cf1d5909
.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 05:33:55 +00:00
Lantao Liu
5e74cba0f0
Add log of generated id for debugging.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 00:11:16 +00:00
Lantao Liu
6c6b337e87
Merge pull request #358 from Random-Liu/unpack-when-creation
...
Also unpack image during creation.
2017-10-26 22:44:07 +02:00
Lantao Liu
acc3f74d5c
Also unpack image during creation.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-26 17:57:53 +00:00
Yanqiang Miao
e9cf1d5909
Put containerd-shim into pod cgroup
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-10-26 10:17:12 +08:00
Lantao Liu
698f0ea2ae
Merge pull request #345 from yanxuean/imagereadiness
...
check image readiness when recover
2017-10-23 16:09:14 +02:00
yanxuean
9d06ac0e2b
check image readiness when recover
...
fix #303
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-10-23 19:21:39 +08:00
Ian Campbell
d75e0882c4
typo: subtract not substract.
...
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-13 09:50:17 +01:00
yanxuean
3887b0a1a0
Add a flag to set OOMScore
...
fix #337
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-10-12 16:43:35 +08:00
Lantao Liu
885024f987
Merge pull request #295 from miaoyq/use-mount-lookup
...
Get the mountInfo by 'LookupMount' in containerd
2017-10-11 21:05:39 -07:00
Lantao Liu
61d598d00f
Merge pull request #235 from yanxuean/truncindex
...
Add Truncindex for container, sandbox and image
2017-10-11 21:03:16 -07:00
Yanqiang Miao
c65921b16a
Get the mountInfo by 'LookupMount' in containerd
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-10-12 11:09:24 +08:00
yanxuean
5ee3423820
add truncindex
...
fix #222
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-10-12 10:32:20 +08:00
Lantao Liu
e4b818ff41
Merge pull request #342 from Random-Liu/update-kubernetes-containerd
...
Update kubernetes and containerd.
2017-10-11 00:23:24 -07:00
Lantao Liu
bde8b0517e
Update kubernetes and containerd.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-11 06:16:19 +00:00
Lantao Liu
6cb3d27ed3
Use device number to find uuid
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-09 06:10:43 +00:00
Lantao Liu
09d7d652e6
Change Version
to return cri-containerd version instead.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-07 00:47:51 +00:00
Lantao Liu
e78c85f76b
Use new container update function
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-06 17:57:26 +00:00
Lantao Liu
3a5ec1cf6e
Merge pull request #328 from Random-Liu/fix-container-stats-panic
...
Fix container stats panic.
2017-10-04 21:45:19 -07:00
Lantao Liu
94b68ae662
Fix container stats panic.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-05 02:18:19 +00:00
Lantao Liu
0bcc95e4a1
Skip not exist image volume directory.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-04 22:43:24 +00:00
Lantao Liu
23b8330b44
Merge pull request #322 from miaoyq/fix-314
...
Update kubernetes version to the PR#52395 and support `unconfined` apparmor
2017-10-04 10:49:56 -07:00
Yanqiang Miao
9f656cdda4
Support unconfined
apparmor
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-10-04 09:50:27 +08:00
Lantao Liu
a81a47bf9b
Fix update container resources
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-03 06:03:39 +00:00
Lantao Liu
a7b78d7622
Merge pull request #297 from ijc/use-stat-for-device-uuid-comparison
...
Use stat_t.st_rdev to compare block devices
2017-09-28 11:30:34 -07:00
Abhinandan Prativadi
1784b073bc
Merge pull request #301 from Random-Liu/fix-container-stats
...
Fix container stats.
2017-09-28 06:02:42 -07:00
Lantao Liu
de6287d626
Fix container stats.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-28 05:49:44 +00:00
Lantao Liu
d6e04d871e
Merge pull request #300 from Random-Liu/improve-some-error-message
...
Better format several errors
2017-09-27 22:47:15 -07:00
Lantao Liu
517f697f62
Better format several errors
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-28 01:15:06 +00:00
Lantao Liu
e723a5018b
Merge pull request #293 from Random-Liu/cleanup-container-metrics
...
Fix and cleanup container metrics
2017-09-27 17:17:46 -07:00
Lantao Liu
97b6e82d98
Fix and cleanup container metrics
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-27 23:43:00 +00:00
Ian Campbell
11714fb6a3
Use stat_t.st_rdev to compare block devices
...
I implemented /dev/disk/by-uuid on my platform but using absolute links (where
udev typically uses relative) which broke the code in `os.DeviceUUID`.
Rather than just patch that up directly instead stat both the target and
candidate devices and pick one with matching major:minor in st_rdev. This saves
manually building paths to resolve symlinks and I think should be more robust
overall.
I also removed the initial stat of /dev/disk/by-uuid, I believe
`ioutil.Readdir` will correctly return an error if the path does not exist.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-27 16:17:57 +01:00
Abhinandan Prativadi
66693196ac
Setting timestamp for cpu and memory stats in nano seconds
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-27 07:06:25 -07:00
Lantao Liu
0e6e593481
Merge pull request #275 from mikebrow/config-for-containerd
...
Adds support for configuring the containerd runtime engine
2017-09-26 20:04:13 -07:00
Mike Brown
d8a3c6b018
adds support for configuring the containerd runtime engine
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-26 20:22:51 -05:00