Commit Graph

1493 Commits

Author SHA1 Message Date
Lantao Liu
adfabdaa35 Use EnsureRemoveAll
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-05 20:29:18 +00:00
Lantao Liu
2bf31ee08c Update vendor to include /docker/docker/pkg/system
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-05 20:28:53 +00:00
Lantao Liu
ade5f403d0 Merge pull request #210 from Random-Liu/release-tar-ball
Add release tarball.
2017-09-05 12:11:06 -07:00
yanxuean
269aeb6734 add config file -- add despendency
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-09-05 16:20:02 +08:00
yanxuean
ecf270d0d7 add log
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-09-05 15:52:59 +08:00
yanxuean
999156d147 add toml config file for cri-containerd
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-09-05 15:51:07 +08:00
yanxuean
99a87f1a29 Add toml config file for cri-containerd
fix #182

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-09-05 15:49:03 +08:00
Lantao Liu
a6b0e41d6b Add release tar.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-04 04:44:05 +00:00
Lantao Liu
59e75d8c5e Merge pull request #208 from miaoyq/fixes-180
Update cri-o/ocicni
2017-09-03 20:04:12 -07:00
Yanqiang Miao
180e2e67af Update cri-o/ocicni
fixes #180

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-09-03 21:42:49 +08:00
Lantao Liu
b522ac9118 Merge pull request #207 from lanchongyizu/issue/make_sandbox_image_configurable
Make sandbox container image configurable
2017-09-03 00:39:35 -07:00
Jamie Zhuang
915f5b0aea Make sandbox container image configurable
Signed-off-by: Jamie Zhuang <lanchongyizu@gmail.com>
2017-09-03 02:53:17 -04:00
Lantao Liu
86e8a24977 Merge pull request #205 from Random-Liu/revert-193
Revert "Setting containerd shim cgroup same as pod cgroup"
2017-09-01 23:32:48 -07:00
Lantao Liu
c3cb1cfde8 Revert "Setting containerd shim cgroup same as pod cgroup"
This reverts commit 59008c608e.

Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-02 04:20:55 +00:00
Lantao Liu
d0126752d2 Merge pull request #203 from Random-Liu/update-kubernetes
Update kubernetes version to 759ba487b33a7566111622e19de607aba45a7342.
2017-09-01 17:31:47 -07:00
Lantao Liu
911a90ce01 Merge pull request #153 from anfernee/master
Fix build for multiple GOPATHs
2017-09-01 17:05:35 -07:00
Lantao Liu
e12da22015 Update kubernetes version to 759ba487b33a7566111622e19de607aba45a7342.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-01 23:55:10 +00:00
Lantao Liu
aa3635c75a Merge pull request #183 from Random-Liu/cri-containerd-exit-with-containerd
Cri containerd exits with containerd
2017-09-01 16:39:38 -07:00
Yongkun Anfernee Gui
5da08bd892 Fix build for multiple GOPATHs
The build script doesn't work when people have GOPATH like
/path/a:/path/b

Signed-off-by: Yongkun Anfernee Gui <agui@vmware.com>
2017-09-01 16:39:01 -07:00
Lantao Liu
7923171b2e Merge pull request #201 from Random-Liu/set-iptables
Configure iptables to accept all TCP/UDP/ICMP packets.
2017-09-01 16:31:25 -07:00
Lantao Liu
f7fd736a39 Merge pull request #159 from mikebrow/apparmor-feature
Adds support for AppArmor
2017-09-01 16:30:57 -07:00
Lantao Liu
c3e8c69aff Let cri-containerd exit with containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-01 23:14:04 +00:00
Mike Brown
9d479844c6 vendor k8s and containerd for apparmor fix
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-01 18:08:34 -05:00
Mike Brown
4f442de959 adds support for AppArmor
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-01 18:08:34 -05:00
Lantao Liu
4f449cec5f Merge pull request #202 from Random-Liu/fix-image-repo-digest
Fix repo digest for schema 1 image.
2017-09-01 16:01:05 -07:00
Lantao Liu
e6332a7d7f Configure iptables to accept all TCP/UDP/ICMP packets.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-01 22:59:20 +00:00
Lantao Liu
7121d251b0 Return image repo digest in container status.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-01 20:58:15 +00:00
Lantao Liu
5057c2d4fb Merge pull request #197 from Random-Liu/not-remove-out-dated-tag
Do not remove out dated image tag.
2017-09-01 00:48:37 -07:00
Lantao Liu
cfb5513a54 Fix repo digest for schema 1 image.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-01 07:18:02 +00:00
Lantao Liu
73bb6e3283 Do not remove out dated image tag.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-01 07:09:13 +00:00
Lantao Liu
9c49624174 Merge pull request #157 from miaoyq/apply-selinux-opt
Support selinux options/label
2017-08-31 16:30:30 -07:00
Lantao Liu
66baf1312d Merge pull request #193 from abhinandanpb/containerd_shim
Setting containerd shim to Pod cgroup
2017-08-31 16:12:57 -07:00
Abhinandan Prativadi
59008c608e Setting containerd shim cgroup same as pod cgroup
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-08-31 15:16:51 -07:00
Lantao Liu
82ee80d0fa Implement streaming server stop (Kubernetes#51377)
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-31 21:56:47 +00:00
Yanqiang Miao
0c3304e006 Support selinux options/label
Support selinux optios/label

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-08-31 19:20:12 +08:00
Lantao Liu
c311f10a77 Merge pull request #190 from Random-Liu/cleanup-image-operations
Cleanup image operations
2017-08-30 18:19:40 -07:00
Lantao Liu
ac4f238f48 Cleanup image operations.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-31 00:52:09 +00:00
Lantao Liu
130aa5ac0d Checkpoint container status onto disk.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-31 00:41:52 +00:00
Lantao Liu
39854b292a Merge pull request #184 from abhinandanpb/cgroup
Adding option to configure cgroup to start cri-containerd
2017-08-30 16:27:01 -07:00
Abhinandan Prativadi
e1edeae4c9 Adding option to configure cgroup to start cri-containerd
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-08-30 14:37:40 -07:00
Lantao Liu
80b57f54a6 Merge pull request #192 from Random-Liu/fix-sandbox-container-snapshotter
Fix sandbox container snapshotter.
2017-08-30 13:47:15 -07:00
Lantao Liu
c4d95aa2c4 Fix sandbox container snapshotter.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-30 18:33:59 +00:00
Lantao Liu
2aea0388be Merge pull request #187 from Random-Liu/fix-bind-mount
Use rbind and rprivate in bind mount.
2017-08-30 10:16:59 -07:00
Lantao Liu
9478446de1 Merge pull request #189 from Random-Liu/update-cri-test
Update cri validation test to add supplemental groups test.
2017-08-30 10:15:43 -07:00
Lantao Liu
fd2a8c9701 Update cri validation test to add supplemental groups test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-30 06:02:21 +00:00
Lantao Liu
3f4978b77b Use rbind and rprivate in bind mount.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-30 01:40:03 +00:00
Lantao Liu
55ee423224 Merge pull request #175 from Random-Liu/disable-pid-ns-sharing
Disable pid namespace sharing
2017-08-29 13:14:18 -07:00
Lantao Liu
c2fb61b5fe Merge pull request #178 from Random-Liu/fix-leak-files
Fix leak files
2017-08-29 13:13:01 -07:00
Lantao Liu
b73161627d Fix fifo files leakage.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-28 21:14:35 +00:00
Lantao Liu
9d5b5f9c26 Update containerd to cf09e32618.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-28 20:45:09 +00:00