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

678 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Aleksa Sarai
96c0966ce9
server: make logDir configurable 
While logDir isn't currently used (until the conmon implementation
lands) it's probably not a great idea to hardcode our defaults. The main
issue with this setting is that the kubelet can override it at will.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-31 23:26:42 +11:00
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
7b60703634 Add logging for all container/sandbox responses 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-28 11:35:14 -04:00
Antonio Murdaca
cb7239caa6 Merge pull request #181 from mrunalp/time_stamps 
Add timestamps to logs
 2016-10-26 22:12:25 +02:00
Mrunal Patel
e4b76edd96 Add timestamps to logs 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-26 12:45:29 -07:00
Mrunal Patel
0c8c09220b Merge pull request #180 from nalind/image-utils 
Add "image list/remove/status" to the client
 2016-10-26 18:58:31 +00: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
Mrunal Patel
c89157e45c Merge pull request #176 from gao-feng/hidden-infra-container 
store infra container in sandbox
 2016-10-25 03:25:17 +00:00
Mrunal Patel
d6ebc9d8b4 Merge pull request #177 from Crazykev/docs 
update README.md and ocid.conf.5.md
 2016-10-24 18:05:51 +00:00
HaoZhang
292b7e0034 update README.md and ocid.conf.5.md 
Signed-off-by: HaoZhang <crazykev@zju.edu.cn>
 2016-10-25 01:08:17 +08:00
Mrunal Patel
18f477911c Merge pull request #153 from Crazykev/fix-env 
make conmon process's env configurable
 2016-10-24 08:38:32 -07:00
Gao feng
78528d9bd1 store infra container in sandbox 
infra container is used to implement the pod
sandbox, it should not be exported to user.

this patch stores infra container in sandbox
immediately, only the containers created by user
are stored into container store, this prevents user
from removing/stopping infra container incorrectly.

Signed-off-by: Gao feng <omarapazanadi@gmail.com>
 2016-10-24 20:18:19 +08: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
Antonio Murdaca
af55785b53 Merge pull request #167 from mrunalp/update_api 
Update to latest version of kubernetes CRI API
 2016-10-22 09:17:59 +02:00
Antonio Murdaca
ed3a56fd29 Merge pull request #172 from mrunalp/more_debugs 
Add more debugs
 2016-10-22 09:17:34 +02:00
Mrunal Patel
0300661054 Merge pull request #174 from mrunalp/revert-170 
Revert "oci: cast timestamp to int64"
 2016-10-21 16:53:04 -07:00
Mrunal Patel
97d1916772 Revert "oci: cast timestamp to int64" 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-21 14:31:12 -04:00
Mrunal Patel
7f726b704a Add more debugs 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-21 11:14:22 -04:00
Mrunal Patel
b117dd863c Update to latest version of kubernetes CRI API 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-21 11:06:30 -04:00
Antonio Murdaca
6f9e51fc7d Merge pull request #170 from cyphar/port-to-i586 
oci: cast timestamp to int64
 2016-10-21 14:06:00 +02:00
Aleksa Sarai
8ace3647fa
oci: cast timestamp to int64 
Found while trying to package ocid for openSUSE.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-21 22:18:51 +11:00
Antonio Murdaca
5290ca593a Merge pull request #166 from mrunalp/image_no_nil 
Make image APIs return empty struct instead of nil
 2016-10-21 08:10:09 +02:00
Mrunal Patel
cc9ce68463 Make image APIs return empty struct instead of nil 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-20 16:13:41 -04:00
Antonio Murdaca
e14e6c7cfc Merge pull request #165 from mrunalp/api_version 
Set the version to what kubelet expects
 2016-10-20 21:25:52 +02:00
Mrunal Patel
0b76a65033 Set the version to what kubelet expects 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-20 14:51:38 -04:00
Antonio Murdaca
0ef2fc937b Merge pull request #163 from mrunalp/uts_no_share 
Don't share container UTS namespace with pod
 2016-10-18 23:30:28 +02:00
Mrunal Patel
4a7ea899b0 Don't share container UTS namespace with pod 
kubernetes doesn't share the UTS namespace

Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-18 14:17:57 -07: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
Antonio Murdaca
5f9517a17a Merge pull request #159 from laijs/uncompressed-manpages-makefile 
unistall or cleanup uncompressed manpages when requested
 2016-10-18 11:31:51 +02:00
Lai Jiangshan
09d470bdcd unistall or cleanup uncompressed manpages when requested 
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
 2016-10-18 17:16:07 +08:00
Antonio Murdaca
f54deb5c4a Merge pull request #158 from laijs/gzip-option-keep 
don't gzip the manpages
 2016-10-18 10:51:41 +02:00
Lai Jiangshan
9d65f8a907 don't gzip the manpages 
let the package builders of the distros do it

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
 2016-10-18 16:35:31 +08: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
Antonio Murdaca
b3f0920fe8 Merge pull request #156 from mrunalp/pod_meta_filter 
Pod filtering support
 2016-10-17 23:34:15 +02:00
Mrunal Patel
2be40e0a31 Add tests for pod filtering 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-17 12:51:21 -07: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
5e7d96bd6a Add server side pod filtering support 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-17 12:24:57 -07:00
Mrunal Patel
01c8785ea4 Use Set instead of map for storing pod labels 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2016-10-17 11:28:48 -07:00
Antonio Murdaca
63614ff690 Merge pull request #154 from rhatdan/selinux 
Make sure selinuxenabled exists before executing it
 2016-10-17 17:24:38 +02:00
Antonio Murdaca
2c77091a54 Merge pull request #151 from hqhq/fix_makefile_rm 
Makefile: fix remove docs in make clean
 2016-10-17 14:59:52 +02:00
Dan Walsh
488216f57b Make sure selinuxenabled exists before executing it 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-10-17 08:48:14 -04:00
Qiang Huang
f3bc6d3660 Makefile: fix remove docs in make clean 
On Ubuntu, `/bin/sh` is used in Makefile by default, so
a.{1,2,3} isn't evaluated to a.1 a.2 a.3, another solution
is to use `SHELL=/bin/bash` in Makefile, but I don't think
we should bind to bash this early, at least not for this
case.

This also remove the removal of docs/*.1 which doesn't
exist for now.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-10-17 13:15:41 +08:00
Antonio Murdaca
0c7f83dd1f Merge pull request #148 from rhatdan/selinux 
Setup proper labeling for runnin test with selinux
 2016-10-15 01:32:52 +02:00
Dan Walsh
04807d586a Setup proper labeling for running test with selinux 
The rootfs that gets created needs to have an SELinux label that containers
can write to.  Until they get native storage support, this patch will
force the entire storage pool to be labeled in such a way that confined
containers can read/write/execute the content.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-10-14 17:29:20 -04:00
Mrunal Patel
91efd54e2b Merge pull request #145 from rhatdan/makefile 
Fix up Makefile, to only build when needed
 2016-10-14 14:04:24 -07:00
Dan Walsh
a14ddbde94 Fix up Makefile, to only build when needed 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-10-14 16:48:42 -04:00
Antonio Murdaca
3a69841225 Merge pull request #146 from mrunalp/create_label 
Allow adding labels at container create time
 2016-10-14 21:29:52 +02:00