Commit graph

1188 commits

Author SHA1 Message Date
Mrunal Patel
19b11293f6 Merge pull request #206 from Crazykev/add-sysctls
Add support for sysctls
2016-11-24 08:07:35 -08:00
Mrunal Patel
46c1e95929 Merge pull request #214 from runcom/bump-golang-dockerfile
Dockerfile: bump to golang 1.7.3
2016-11-24 08:04:56 -08:00
Antonio Murdaca
cd85d49ff3
Dockerfile: bump to golang 1.7.3
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-24 13:47:49 +01:00
HaoZhang
bdd817d002 add test for sysctls
Signed-off-by: HaoZhang <crazykev@zju.edu.cn>
2016-11-24 20:32:33 +08:00
Antonio Murdaca
70481bc5af
*: bump opencontainers/runtime-tools
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-24 12:26:18 +01:00
Antonio Murdaca
cbe2a68ce5
execsync: return proper error description
The gprc execsync client call doesn't populate `ExecSyncResponse` on
error at all. You just get an error.
This patch modifies the code to include command's streams, exit code
and error direcly into the error. `ocic` will then print useful
infomation in the cli, otherwise it won't.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-24 12:11:04 +01:00
HaoZhang
d1e1b7c183 pass sysctls down to oci runtime
Signed-off-by: HaoZhang <crazykev@zju.edu.cn>
2016-11-24 16:29:37 +08:00
Mrunal Patel
2e3ad167bb Merge pull request #207 from runcom/refactor-actions
split files under server/
2016-11-22 14:53:06 -08:00
Antonio Murdaca
ebe2ea0dba
server: split sandboxes actions
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-22 23:23:01 +01:00
Antonio Murdaca
4447207cf1
server: split images actions
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-22 23:05:37 +01:00
Antonio Murdaca
61bb04c87c
server: split containers actions
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-22 18:38:05 +01:00
Antonio Murdaca
5c94544fb8 Merge pull request #203 from mrunalp/exec_sync
Exec sync
2016-11-21 23:22:20 +01:00
Mrunal Patel
3e415d0c2f Add test for exec sync
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-11-21 13:16:36 -08:00
Mrunal Patel
78ecdcd298 Add support for timeout
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-11-21 13:16:32 -08:00
Antonio Murdaca
c06e627a55 Merge pull request #204 from intelsdi-x/runtimeStatus
Add runtime status compliant with CRI
2016-11-21 12:02:41 +01:00
Jacek J. Łakis
0289858d21 Add runtime status commpliant with CRI
Signed-off-by: Jacek J. Łakis <jacek.lakis@intel.com>
2016-11-21 10:19:03 +01:00
Mrunal Patel
83779764f4 Merge pull request #205 from mrunalp/add_owner
Add feiskyer as an OWNER
2016-11-18 14:12:57 -08:00
Mrunal Patel
56b2f799ec Add feiskyer as an OWNER
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-11-18 09:05:14 -08:00
Mrunal Patel
5c1adcbf6a Add client implementation for exec sync
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-11-17 16:42:08 -08:00
Mrunal Patel
52e789c44b Add server implementation for exec sync
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-11-17 16:41:44 -08:00
Mrunal Patel
b12a508e4e Add method to exec a command sync in a container
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-11-17 16:40:52 -08:00
Antonio Murdaca
920acd2f37 Merge pull request #199 from mrunalp/update_api
Update to the latest upstream API
2016-11-17 17:09:50 +01:00
Mrunal Patel
b62a150151 Update to the latest upstream API
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-11-16 17:20:37 -08:00
Mrunal Patel
9540eb9d2b Merge pull request #196 from Crazykev/fix-time-display
fix ocic time display
2016-11-16 12:17:47 -08:00
Crazykev
82a01cbdda fix ocic time display
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
2016-11-16 15:36:32 +08:00
Mrunal Patel
e790094f23 Merge pull request #194 from sameo/master
Conmon fixes
2016-11-15 09:47:13 -08:00
Antonio Murdaca
8aba231708 Merge pull request #195 from mrunalp/syslog
Add syslog support
2016-11-15 14:39:04 +01:00
Samuel Ortiz
5bbef5fc88 oci: Pass the bundle and pid file paths to conmon
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2016-11-15 14:11:47 +01:00
Samuel Ortiz
b14bae4869 conmon: Add --bundle and --pidfile command line options
We need to be able pass both the bundle path and the pid file
paths to conmon from ocid.
The former is mandatory when creating an OCI container:

https://github.com/opencontainers/runtime-spec/blob/master/runtime.md#create

And it makes sense to provide a full path for the latter as the
current hardcoded relative path may lead to errors if e.g. the
runtime chdir() before creating the PID file.

In both cases we try to create default reasonable values when
they are left empty by the caller.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2016-11-15 14:11:42 +01:00
Antonio Murdaca
a9412d9156 Merge pull request #193 from intelsdi-x/fix_versioning
version: remove checking gRPC version
2016-11-15 09:47:55 +01:00
Jacek J. Łakis
85f7ebfb48 version: Fix parsing for gRPC version
Signed-off-by: Jacek J. Łakis <jacek.lakis@intel.com>
2016-11-15 09:26:11 +01:00
Mrunal Patel
562f8ca684 Add syslog support
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-11-14 16:02:03 -08:00
Mrunal Patel
8d275cebb9 Merge pull request #192 from feiskyer/timestamps
Set timestamps to nanoseconds
2016-11-14 09:33:01 -08:00
Pengfei Ni
bbfcf62a0f Set timestamps to nanosecond.
CRI requires all timestamps in nanosends instead of seconds.

Signed-off-by: Pengfei Ni <feiskyer@gmail.com>
2016-11-14 14:26:06 +08:00
Antonio Murdaca
02ec8754f5 Merge pull request #169 from cyphar/make-configurable
server: make more things configurable
2016-11-10 14:55:29 +01:00
Mrunal Patel
f23cf4f0d9 Merge pull request #190 from WeiZhang555/fix-README
Add missing steps in README
2016-11-08 18:24:18 -07:00
Zhang Wei
9d55130baa Add missing steps in README
The guideline in README doesn't work, one important step `#make` is
missing, so fix it.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-11-08 22:52:23 +08:00
Mrunal Patel
c57530eb47 Merge pull request #187 from nalind/wait
Log more information about exited children
2016-11-04 11:58:43 -06:00
Mrunal Patel
5d62a9fbb9 Merge pull request #179 from Crazykev/add-metadata
Return pod metadata in container list and status APIs
2016-11-04 10:00:58 -06:00
Mrunal Patel
97655c3e7b Merge pull request #188 from nalind/dns
Handle PodSandboxConfig.DNSConfig.Options
2016-11-03 11:00:49 -06:00
Nalin Dahyabhai
6ec61a43f3 Log more information about exited children
When we receive a SIGCHLD, log more information about how the child
processes that we reap terminated.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-11-03 12:07:52 -04:00
Nalin Dahyabhai
ec1bc4d6a8 Handle PodSandboxConfig.DNSConfig.Options
DNSConfig can pass "options" settings in now, so add them to the
resolv.conf that we're generating, too.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-11-03 11:57:25 -04:00
Crazykev
295c32331a sort all map type result in ocic
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
2016-11-02 14:36:42 +08:00
HaoZhang
018c4db06d add test for container/pod metadata in status/list APIs
Signed-off-by: HaoZhang <crazykev@zju.edu.cn>
2016-11-02 00:37:40 +08:00
Crazykev
ca59eaf1a4 display container metadata on the client for container list and status
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
2016-11-02 00:37:40 +08:00
Crazykev
87a83e14b0 return pod metadata in container list and status APIs
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
2016-11-02 00:37:40 +08:00
Mrunal Patel
23d86cd866 Merge pull request #185 from Crazykev/restore-annotation
restore pod annotations when restart ocid
2016-11-01 08:35:27 -07:00
Crazykev
54a022defb restore pod annotations when restart ocid
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
2016-11-01 13:49:21 +08:00
Dan Walsh
71eaad13b1 foobar
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-10-31 15:17:23 -04:00
Dan Walsh
87a971564b Merge branch 'master' of https://github.com/kubernetes-incubator/cri-o into rpm
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-10-31 15:17:07 -04:00