Commit graph

967 commits

Author SHA1 Message Date
Antonio Murdaca
3fac039b4b
test: testdata: use redis:alpine
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-16 10:51:39 +02:00
Antonio Murdaca
f6489f4bc6
server: honor container stop timeout from CRI
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-16 10:44:18 +02:00
Mrunal Patel
3fa4d5eb75
Capture errors from runtime create failures
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-05-16 10:43:50 +02:00
Mrunal Patel
76d7b492b9
Fix remnants of ocid -> crio rename
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-05-16 10:43:24 +02:00
Matthew Heon
ec520ce5dd
Fix unit test to use crio/crioctl
The rename to crio missed this test, update it so tests pass

Signed-off-by: Matthew Heon <mheon@redhat.com>
2017-05-16 10:42:57 +02:00
Matthew Heon
c3d65147d1
Update gitignore to replace ocic with crioctl
Matches the rename that just got merged

Signed-off-by: Matthew Heon <mheon@redhat.com>
2017-05-16 10:42:48 +02:00
Antonio Murdaca
912c7a9b07
test: use redis:alpine
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-16 10:41:15 +02:00
Dan Walsh
60e25392c8
Rename ocid to crio.
The ocid project was renamed to CRI-O, months ago, it is time that we moved
all of the code to the new name.  We want to elminate the name ocid from use.
Move fully to crio.

Also cric is being renamed to crioctl for the time being.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2017-05-16 10:39:56 +02:00
Antonio Murdaca
0183dcb392
Makefile: clean and rebuild binaries before testing
if you run `make localintegration` from a branch, switch to another and
re-run the command again, `ocid` won't get built again causing tests to
run with binaries from the old branch you switched from.
This patch makes sure we cleanup binaries and rebuild before running
tests.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-12 19:53:26 +02:00
Antonio Murdaca
ea739ca9dd
test: add caps drop test
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-12 19:53:15 +02:00
Antonio Murdaca
51a618f9c1
vendor: bump oci/runtime-tools to fix caps drop
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-12 19:52:47 +02:00
Antonio Murdaca
602c162037
server: add RO and masked paths on container creation
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-12 17:27:01 +02:00
Mrunal Patel
c3efdae412
bats: Add a test for adding device to a container
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-05-12 17:27:01 +02:00
Mrunal Patel
0c05353806
Add a test config for device
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-12 17:26:57 +02:00
Mrunal Patel
91dc079aa3
Add devices to OCI config
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-05-11 13:28:26 +02:00
Mrunal Patel
4ec841c441
Add helper for adding devices to OCI spec
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-05-11 13:28:26 +02:00
Antonio Murdaca
37b5d432bd
server: store kubeName in annotations
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-09 23:23:32 +02:00
Dan Williams
82597be648
sandbox: pass correct pod Namespace/Name to network plugins and fix id/name ordering
Two issues:
1) pod Namespace was always set to "", which prevents plugins from figuring out
what the actual pod is, and from getting more info about that pod from the
runtime via out-of-band mechanisms

2) the pod Name and ID arguments were switched, further preventing #1

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-06 18:24:05 +02:00
Antonio Murdaca
47a8e6611f
contrib: systemd: fix ocid path
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-06 13:28:50 +02:00
Antonio Murdaca
655b1b46a8
server: fix set caps on container create
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-06 13:28:38 +02:00
Antonio Murdaca
860a38335d
manifest.json: stick to k8s v1.6.1
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-02 11:11:51 +02:00
Mrunal Patel
f648cd6e60 Merge pull request #480 from mrunalp/bump_0.3
Bump up to version 0.3
2017-04-28 09:36:01 -07:00
Mrunal Patel
22babd5bcd Bump up to version 0.3
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-04-28 08:13:00 -07:00
Antonio Murdaca
27510ac346 Merge pull request #473 from mrunalp/port_forward
Add support for port forwarding
2017-04-28 01:16:45 +02:00
Antonio Murdaca
d45ecac0f8 Merge pull request #450 from nalind/canonical
Fix pull-by-digest
2017-04-27 23:18:16 +02:00
Nalin Dahyabhai
b75a1ba44d Remove some redundant target image namesetting
Remove some logic that messed with the names we assigned to just-pulled
images in the storage layer, since the image and storage libraries now
take care of that for us.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-04-27 14:13:02 -04:00
Nalin Dahyabhai
a0b1da15a3 Expand image refs and handle refs with digests
If an image that we're pulling from a registry has a digest in its
reference, use that to construct the destination image's reference.
This should help us detect cases where the image has previously been
pulled.

When we have a filter to use when listing images, expand it into a
reference so that we can properly match against names of images that
we've previously stored using fully expanded references.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-04-27 14:13:02 -04:00
Nalin Dahyabhai
3d15bc571b Bump github.com/containers/image@efae299
Update the vendored copy of github.com/containers/image to revision
efae29995d4846ffa6163eb4d466fd61bda43aae.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-04-27 14:13:00 -04:00
Nalin Dahyabhai
7c551964c0 Bump github.com/containers/storage@d10d868
Update the vendored copy of github.com/containers/storage to revision
d10d8680af74070b362637408a7fe28c4b1f1eff.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-04-27 14:11:05 -04:00
Mrunal Patel
d6bf131c07 Merge pull request #470 from surajssd/enable-cpu-profiling
Add flag --cpu-profile to enable pprof
2017-04-27 10:34:41 -07:00
Antonio Murdaca
3cb3445cb0 Merge pull request #474 from runcom/fixies-1
small fixes
2017-04-27 17:34:26 +02:00
Antonio Murdaca
275a5a1ff2
server: remove Update calls
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-04-27 14:01:37 +02:00
Antonio Murdaca
5595fad535
server: do not compare pointers
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-04-27 14:01:23 +02:00
Antonio Murdaca
f18e032714
server: do not nil sandbox's infraContainer on remove
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-04-27 14:01:18 +02:00
Suraj Deshmukh
2699198610 Add flag --cpu-profile to enable pprof
To collect CPU profile information added a flag `--cpu-profile`
which is a path to file where this collected information will be
dumped.

Fixes #464

Signed-off-by: Suraj Deshmukh <surajssd009005@gmail.com>
2017-04-27 11:17:56 +05:30
Mrunal Patel
416a3ba62e Add support for port forwarding
Reusing k8s existing implementation. This could be re-written
to do port-forwarding natively rather than relying on socat/nsenter.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-04-26 13:58:48 -07:00
Antonio Murdaca
eb257d2526 Merge pull request #466 from sameo/exec
Stream server for exec, attach and port forward
2017-04-26 19:59:02 +02:00
Antonio Murdaca
2d1c5651fe Merge pull request #472 from mrunalp/rfc3339nano
Add nanoseconds to timestamp to make it RFC3339Nano
2017-04-26 16:46:18 +02:00
Mrunal Patel
84424d3829 Add nanoseconds to timestamp to make it RFC3339Nano
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-04-25 16:29:56 -07:00
Samuel Ortiz
62142d439e lint: Extend deadline
And reduce the number of scanned directories.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2017-04-24 18:44:49 +02:00
Mrunal Patel
008dab27b1 Fix terminal resize handling so kubectl exec -i -t sh works
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-04-24 18:44:49 +02:00
Samuel Ortiz
c676b7b6c3 ocic: Initial implementation for ocic ctr exec
We use the k8s remotecommand client API to create a
streaming executor, and then stream the executed process
into stdout/stderr.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2017-04-24 18:44:49 +02:00
Jacek J. Łakis
0ba2be0dc8 lint: fix shadowing
Signed-off-by: Jacek J. Łakis <jacek.lakis@intel.com>
2017-04-24 18:44:49 +02:00
Jacek J. Łakis
b4e9023102 exec: Add endpoint for streaming server
Signed-off-by: Jacek J. Łakis <jacek.lakis@intel.com>
2017-04-24 18:44:49 +02:00
Jacek J. Łakis
203a52487c server: Start streaming server
Signed-off-by: Jacek J. Łakis <jacek.lakis@intel.com>
2017-04-24 18:44:48 +02:00
Jacek J. Łakis
70a51fe7f5 server: Add streamService to server
Signed-off-by: Jacek J. Łakis <jacek.lakis@intel.com>
2017-04-24 18:44:48 +02:00
Jacek J. Łakis
b75b6f6e4b container: add exec command prototype
Signed-off-by: Jacek J. Łakis <jacek.lakis@intel.com>
2017-04-24 18:44:48 +02:00
Jacek J. Łakis
3babbf0de1 ocic: Add container exec command
Signed-off-by: Jacek J. Łakis <jacek.lakis@intel.com>
2017-04-24 18:44:40 +02:00
Jacek J. Łakis
bf51655a7b vendor: Update vendoring for the exec client and server implementations
Signed-off-by: Jacek J. Łakis <jacek.lakis@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2017-04-24 18:38:41 +02:00
Mrunal Patel
d25b88583f Merge pull request #465 from mrunalp/bug/systemd_conmon
conmon: Fix logic for enabling systemd cgroups
2017-04-24 07:31:50 -07:00