Commit Graph

1685 Commits

Author SHA1 Message Date
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
Lantao Liu
a795927c5a Get CreatedAt from containerd instead of maintaining it ourselves.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 18:38:00 +00:00
Lantao Liu
73bb9696e8 Merge pull request #151 from Random-Liu/add-instrumented-service
Add instrumented service.
2017-08-24 11:26:39 -07:00
Lantao Liu
36da027c20 Merge pull request #138 from abhinandanpb/p_netns
Creating sandbox namespace
2017-08-24 11:26:21 -07:00
Lantao Liu
c6895d0856 Remove unused code.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 18:04:05 +00:00
Lantao Liu
c6191122f2 Merge pull request #163 from abhinandanpb/containerd-alpha6
Updating to container1.0-alpha
2017-08-24 10:43:43 -07:00
Abhinandan Prativadi
5a119200b8 Creating permanent sandbox namespace
This commit contains changes to create/delete permanent namespace
for a sandbox container.

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-08-24 10:43:42 -07:00
Lantao Liu
26e3718d6b Not printing any log for node e2e.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 17:20:59 +00:00
Lantao Liu
b27ee85f74 Merge pull request #146 from zhangzhenhao/master
add the user id support of runAsUser
2017-08-24 10:18:26 -07:00
zhangzhenhao
331e542c09 add the user id support of runAsUser
Signed-off-by: zhangzhenhao <zhangzhenhao@outlook.com>
2017-08-24 23:29:45 +08:00
Abhinandan Prativadi
728dced6a1 Updating to container1.0-alpha
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-08-23 23:17:21 -07:00
Lantao Liu
2faa665eb2 Merge pull request #155 from miaoyq/support-nonewprivileges
Support NoNewPrivileges
2017-08-23 20:58:38 -07:00
Yanqiang Miao
1aec120d5f Support NoNewPrivileges
fixes #117

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-08-24 08:37:40 +08:00
Lantao Liu
60c7f5127e Merge pull request #128 from Random-Liu/add-container-attach
Add container attach
2017-08-23 17:20:04 -07:00
Lantao Liu
45ee2e554a Add container attach support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-23 23:48:31 +00:00
Lantao Liu
77b703f1e7 Move generateID to util.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-23 23:46:55 +00:00
Lantao Liu
07e3a2b5e2 Merge pull request #160 from Random-Liu/update-ocicni
Vendor ocicni from upstream.
2017-08-23 16:04:25 -07:00
Lantao Liu
dd6e9fb88d Merge pull request #156 from yanxuean/metalabel
Checkpoint and restart recovery
2017-08-23 15:36:19 -07:00
Lantao Liu
42500353b7 Vendor ocicni from upstream.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-23 22:23:29 +00:00
yanxuean
d2757cb8f9 Checkpoint and restart recovery
fix part of #120

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-08-23 17:01:13 +08:00
Lantao Liu
195b52500f Add instrumented service.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-23 07:02:12 +00:00
Lantao Liu
7901f56367 Merge pull request #150 from Random-Liu/support-update-container-resources
Support update container resources
2017-08-22 23:28:48 -07:00
Lantao Liu
b291ec0fa2 Merge pull request #154 from Random-Liu/add-host-port
Add host port support.
2017-08-22 23:26:43 -07:00
Lantao Liu
f6d99abcf4 Add hostport support
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-23 01:33:02 +00:00
Lantao Liu
8f898cb3b8 Import ocicni update from https://github.com/Random-Liu/ocicni
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-23 01:25:12 +00:00
Lantao Liu
af83d3e1f7 Update CNI to v0.6.0
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-23 01:23:24 +00:00
Lantao Liu
810ffbb9b6 Merge pull request #152 from Random-Liu/fix-node-e2e
Fix node e2e test.
2017-08-22 11:55:54 -07:00
Lantao Liu
a0589d37dd Implement container resources update
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-22 18:40:30 +00:00
Lantao Liu
01137e4591 Merge pull request #148 from Random-Liu/update-kubernetes
Update kubernetes
2017-08-22 11:38:55 -07:00
Lantao Liu
77095f569a Fix node e2e test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-22 18:12:14 +00:00
Lantao Liu
d41c23e31d Update code to make it build
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-22 05:38:51 +00:00
Lantao Liu
39f4ca648b Update Kubernetes to 493ee8b28560c118cebd2165ba9ef0959cfa2bc3
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-22 05:38:51 +00:00
Lantao Liu
50b01812ce Merge pull request #147 from miaoyq/group-all-privileged-logic
Group all privileged logic together
2017-08-21 18:43:06 -07:00
Yanqiang Miao
8adad23015 Group all privileged logic together
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-08-22 09:16:37 +08:00
Lantao Liu
010a562057 Merge pull request #145 from Random-Liu/add-node-e2e-ci
Add node e2e test CI.
2017-08-21 14:41:08 -07:00
Lantao Liu
c05a7e74ee Add node e2e test CI.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-21 21:21:41 +00:00
Lantao Liu
dcc3cb2a05 Merge pull request #137 from Random-Liu/cleanup-with-new-client
Some cleanup after switching to new client.
2017-08-18 15:04:24 -07:00
Lantao Liu
ed640d3972 Some cleanup after switching to new client.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-18 21:04:38 +00:00
Lantao Liu
418a5cd8bf Merge pull request #143 from miaoyq/update-containerd-ver-to-f79981
Update containerd version to f79981c
2017-08-18 10:28:56 -07:00
Yanqiang Miao
fa5c4ab2a7 Update containerd version to f79981c
fixes #140
ref containerd/containerd#1386

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-08-18 15:04:02 +08:00
Lantao Liu
8e9a251f72 Merge pull request #135 from yanxuean/myfeature
The parameters of InitCNI should be filled in reverse order
2017-08-16 19:50:22 -07:00
yanxuean
8cc0347b0a The parameters of InitCNI should be filled in reverse order.
fix  #131

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-08-17 10:18:40 +08:00