Commit graph

1856 commits

Author SHA1 Message Date
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
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