vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
876 commits 7 branches 27 tags 53 MiB
Commit graph

876 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Mrunal Patel
a742bf6a8e Merge pull request #184 from rhatdan/ocid.service 
Fix install of unit file and configuration file
 2016-10-31 12:05:31 -07:00
Antonio Murdaca
c5cf3bff88 Merge pull request #182 from mrunalp/req_resp_logging 
Add logging for all container/sandbox responses
 2016-10-31 18:58:25 +01:00
Dan Walsh
80ef36ba2e Fix install of unit file and configuration file 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-10-31 13:44:18 -04:00
Dan Walsh
8ba639952a Add ocid.spec to build rpms 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-10-31 13:43:50 -04:00
Mrunal Patel
5504b68c96 Merge pull request #131 from cyphar/add-make-arguments 
makefile: add make arguments
 2016-10-31 10:24:49 -07:00
Mrunal Patel
7896b4f685 Merge pull request #183 from rhatdan/ocid.service 
Fix installation of ocid.systemd
 2016-10-31 09:36:39 -07:00
Dan Walsh
07b869ef0b Fix installation of ocid.systemd 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-10-31 10:43:46 -04:00
Aleksa Sarai
bb15f27eae
makefile: fix several issues and add arguments 
The GO= arguments allow for cross-compilation without needing to symlink
over /usr/bin/go. Currently openSUSE uses go-5 for building on exotic
architectures. In addition, installdir options makes installation on
various distributions much easier, for example openSUSE doesn't have a
separate %{_libexecdir}.

Due to how Makefiles are parsed, we have to delay the expansion of the
$(wildcard ...) until the actual install target is being executed.

In addition, fix the oci{c,d} dependency lists so that we don't rebuild
oci{c,d} every time. Also remove "all" as a dependency of make install
-- this breaks building inside RPMs with custom ocid.conf files.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-11-01 00:27:07 +11:00
Aleksa Sarai
2d80c8822f
merge branch 'pr-149' 
LGTMs: @mrunalp @rhatdan
Closes #149
 2016-11-01 00:14:11 +11:00
Aleksa Sarai
b30ea458f5
gitignore: ignore man page junk 
Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-10-31 23:31:05 +11:00
Aleksa Sarai
f2f369f6f8
systemd: move ocid.service to contrib/ 
In addition, remove the installation steps from the Makefile. In
general, I personally don't like projects that install service files on
`make install` -- that's the job of a package manager.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-10-31 23:31:05 +11:00
Aleksa Sarai
d559b58fd4
makefile: fix binary dependencies 
OCID_LINK is necessary to correctly build all of the binaries. This
syntax is a GNU Make-ism[1] that allows you to specify a path dependency
without rebuilding the target if the dependency is newer than the
target.

[1]: https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-10-31 23:27:59 +11:00