Commit Graph

976 Commits

Author SHA1 Message Date
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
Lantao Liu
3b2d29be46 Merge pull request #177 from miaoyq/related-to-173
Exclude the event of sandbox containers from event stream
2017-08-28 10:00:21 -07:00
Yanqiang Miao
b18542c586 Excloude the event of sandbox containers from event stream
We should exclude the event of sandbox containers from event
stream in order to avoid outputting unexpected error print.

related #173

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-08-28 14:21:03 +08:00
Lantao Liu
113964e499 Merge pull request #174 from Random-Liu/fix-network-teardown
Do not teardown when network namespace is removed already.
2017-08-27 22:56:43 -07:00
Lantao Liu
f46cd1a71a Disable pid namespace sharing
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-28 05:44:46 +00:00
Lantao Liu
fda30c3ad2 Do not teardown when network namespace is removed already.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-28 05:10:30 +00:00
Lantao Liu
8fd54d2f2d Merge pull request #172 from Random-Liu/fix-run-as-user
Fix run as user
2017-08-25 14:40:06 -07:00
Lantao Liu
270e09ab26 Use containerd WithUserID.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-25 21:11:56 +00:00
Lantao Liu
55d3abdb89 Update containerd to 360e46ddda
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-25 21:11:56 +00:00
Lantao Liu
980e8e8007 Merge pull request #168 from Random-Liu/add-run-as-user
Add RunAsUser support
2017-08-25 13:45:47 -07:00
Lantao Liu
7313331f2e Merge pull request #171 from Random-Liu/not-checkpoint-sandbox-pid
Do not checkpoint sandbox pid.
2017-08-24 20:23:16 -07:00
Lantao Liu
60d8430ac1 Do not checkpoint sandbox pid.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-25 01:38:05 +00:00
Lantao Liu
a80df151d1 Add RunAsUsername support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-25 00:47:35 +00:00
Lantao Liu
e1f74f00a5 Various security related fixes
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 21:52:30 +00:00
Lantao Liu
8d1b737480 Update containerd to a6ce1ef2a1
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 21:47:52 +00:00
Lantao Liu
e559804b37 Merge pull request #167 from Random-Liu/remove-unused-code
Remove unused code.
2017-08-24 14:43:23 -07:00
Lantao Liu
b671465d7f Merge pull request #165 from Random-Liu/fix-node-e2e
Not printing any log for node e2e.
2017-08-24 14:42:58 -07:00
Lantao Liu
6f679fd175 Merge pull request #161 from Random-Liu/sandbox-createdat-from-containerd
Get CreatedAt from containerd instead of maintaining it ourselves.
2017-08-24 12:01:50 -07:00