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

75 commits

Author SHA1 Message Date
Aleksa Sarai
33f47d6a6b
server: make ImageStore configurable 
It's a bit odd to have ImageStore be part of the config and yet we don't
allow people to modify it. However, leave it out of the commented
version because it's currently unused.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-31 23:26:42 +11:00
Mrunal Patel
e4b76edd96 Add timestamps to logs 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-26 12:45:29 -07:00
Nalin Dahyabhai
346553312e Add "image list/remove/status" to the client 
Add "image list", "image status", and "image remove" subcommands to the
client.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2016-10-26 13:19:36 -04:00
HaoZhang
9c11cc7dba make conmon inherit env from ocid 
Signed-off-by: HaoZhang <crazykev@zju.edu.cn>
 2016-10-23 19:22:27 +08:00
Mrunal Patel
68a350d9ae Merge pull request #157 from YaoZengzeng/ocic-timeout 
add timeout for ocic connect to server
 2016-10-18 09:32:09 -07:00
YaoZengzeng
8f91c149e2 add timeout for ocic connect to server 
Signed-off-by: Yao Zengzeng <yaozengzeng@zju.edu.cn>
 2016-10-18 13:50:16 +08:00
Mrunal Patel
1694591f6c Add support for adding labels at pod creation time 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-17 12:33:48 -07:00
Mrunal Patel
2cc40ef9ef Add client support for filtering pods 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-17 12:25:30 -07:00
Mrunal Patel
52dc8e4865 Add support for adding labels at ctr create time 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-14 12:05:47 -07:00
Mrunal Patel
f12d94100c Add client changes for filtering containers by labels 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-13 17:02:02 -07:00
Mrunal Patel
8d88bf1ab1 Add client support for filtering containers 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-13 12:40:07 -07:00
Mrunal Patel
da4cc11077 Merge pull request #135 from runcom/sdnotify 
Sdnotify
 2016-10-13 11:00:22 -07:00
Antonio Murdaca
93ba37d00b
vendor go-systemd 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-13 19:40:18 +02:00
Antonio Murdaca
cf677a20f6
cmd/server: sort flags 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-13 16:57:48 +02:00
Dan Walsh
09bed25074 Add support for sd_notify 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-10-13 09:45:31 -04:00
Dan Walsh
f6d9d626a9 Cleanup help and add options to man page 
Missing options from man page, and sort options alphabetically, as best
we can.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-10-13 09:26:28 -04:00
Aleksa Sarai
9fb23bf0dc
ocid: add config subcommand 
This subcommand is so that users can get a nice commented version of the
ocid configuration file. This comes from the "current" version of the
configuration (allowing somone to get their custom configuration as a
file). It also has a --default option.

In addition, update the tests to use `ocid config` so that we test this
setup (the loading and saving of the options).

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-11 21:21:58 +11:00
Aleksa Sarai
cd9e7de108
ocid: add TOML configuration file 
The --config is merged with the default, and then is overridden by any
command-line options. Everything is organised to be in sub-tables so
that the sections are more clear.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-11 03:10:32 +11:00
Aleksa Sarai
7bf5110b76
server: refactor to use Config struct 
This paves the way for having a configuration file that is loaded rather
than everything being set via the command-line.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-11 03:10:32 +11:00
Aleksa Sarai
3f48986ea0
cmd: switch to --connect and --listen flags 
Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-11 03:09:59 +11:00
Antonio Murdaca
a2fe83fe56
cmd/client/container: add --quiet to ctr list 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-08 14:46:39 +02:00
Antonio Murdaca
30757221b4
cmd/client/sandbox: add --quiet to pod list 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-08 14:46:39 +02:00
Antonio Murdaca
0cf8daa786 Merge pull request #118 from mrunalp/ctr_name 
Allow overriding the container name in the config
 2016-10-07 20:49:39 +02:00
Mrunal Patel
d916b586c8 Allow overriding the container name in the config 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-10-07 13:42:08 -05:00
Mrunal Patel
7c0a441c4b Display pod metadata on the client for list and status 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-10-07 13:32:33 -05:00
Mrunal Patel
027aaf15b7 Merge pull request #100 from rhatdan/selinux 
Selinux
 2016-10-06 12:28:12 -07:00
Dan Walsh
be77b841fa Add SELinux support to OCID 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-10-06 14:13:06 -04:00
Mike Brown
609d7630ca small amount of error checking and help for path to the runtime 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2016-10-06 11:14:54 -05:00
Aleksa Sarai
bd9acaf584
conmon: minor fixes 
This fixes a bug where --conmon wouldn't actually set the conmon binary
path, and also where we weren't setting CFLAGS while compiling conmon.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-02 20:11:16 +11:00
Aleksa Sarai
bac579a9e5
server: create pause rootfs manually without Docker 
This lessens the Docker requirement for creating sandboxes (with the
requirement only existing for the actual image pulling that is done when
adding a container to a pod). The interface was chosen to match the
--conmon interface, so that the location of the pause binary can be
chosen by a user.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-02 20:11:07 +11:00
Dan Walsh
f51c98b057 Install conmon in /usr/libexec/ocid/conmon 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-09-29 08:55:12 -04:00
Mrunal Patel
953f2e9f3b Add client impl for listing containers 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-09-27 15:17:56 -07:00
Antonio Murdaca
56f2b34def
cmd/client: lowercase error 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-27 10:43:11 +02:00
Antonio Murdaca
fe774f82b1 Merge pull request #57 from mrunalp/pod_name_param 
Allow overriding name in a pod sandbox config file
 2016-09-27 07:52:19 +02:00
Mrunal Patel
4606f2a61a Fix the build for ocid to cri-o rename 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-09-26 16:55:12 -07:00
Mrunal Patel
6d5fb53675 Allow overriding name in a pod sandbox config file 
This makes it easier to test creation of multiple pods
from the same config.json file.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-09-26 14:50:34 -07:00
Mrunal Patel
fd3691a0e3 Add client impl for listing pod sandboxes 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-09-26 12:46:00 -07:00
Mrunal Patel
bdce43971f Improve pod status output formatting 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-09-26 11:28:03 -07:00
Antonio Murdaca
ab05a4526b
vendor: bump k8s@5fe2495588425a6613e28a048d8cc7bcb7513c7f 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-26 10:07:46 +02:00
Antonio Murdaca
857aaa7816
cmd/server: provide a flag to set ocid root dir 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-24 00:38:06 +02:00
Antonio Murdaca
ec173002fd
cmd/client: split commands in multiple files 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-24 00:31:46 +02:00
Antonio Murdaca
6c5767fb6f
cmd/client: cleanups 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-24 00:31:46 +02:00
Antonio Murdaca
45a7cb3fdf
cmd/server: fix cmd name and usage 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-23 09:33:49 +02:00
Antonio Murdaca
569183030f
fix vendored deps 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-22 18:17:45 +02:00
Antonio Murdaca
910f343f79
cmd/server: add socket flag 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-20 19:17:18 +02:00
Mrunal Patel
1263e54396 Better output formatting for container status 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-09-19 15:16:28 -07:00
Antonio Murdaca
22d434c1e6
restructure and make lint 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-19 19:56:13 +02:00
Antonio Murdaca
59aae8cdb5
*: Failed -> failed in errors 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-18 11:38:14 +02:00
Antonio Murdaca
d626a32c56
server: add debug to ocid 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-17 17:30:00 +02:00
Shaya Potter
3c0485dd71 make socket location configurable on cmd line 2016-09-15 15:57:39 -07:00