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

946 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mrunal Patel
d3bc6ab693 Add function to convert kube pod cgroup format to runc format 
This is a slightly modified version of the function in k8s.

Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2017-05-17 17:45:57 -07:00
Mrunal Patel
0e2af44d72 Merge pull request #523 from runcom/up-c-storage 
vendor: upgrade containers/storage
 2017-05-17 13:44:16 -07:00
Antonio Murdaca
ecd0006e80
vendor: upgrade containers/storage 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-17 22:18:07 +02:00
Mrunal Patel
5addc8caf0 Merge pull request #522 from runcom/enable-centos-ci 
contrib: test: fix CentOS CI
 2017-05-17 09:48:28 -07:00
Antonio Murdaca
87ca182f5c
contrib: test: run CentOS tests with overlay2 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-17 18:05:07 +02:00
Antonio Murdaca
26a080ad88
contrib: test: tune stuff for CentOS CI 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-17 18:03:31 +02:00
Antonio Murdaca
725c159bea
test: testdata: get rid of memory limits 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-17 17:30:11 +02:00
Antonio Murdaca
80ad55405f
contrib: test: use upstream Golang to build on CentOS 
Cause the one shipped in CentOS is way too old at this point

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-17 13:29:59 +02:00
Antonio Murdaca
c5098bb4a1 Merge pull request #521 from johnbieren/master 
Update integration playbook to fix xunit compatibility
 2017-05-16 21:52:59 +02:00
Johnny Bieren
ca963c9959 Update playbook so simply changingg xunit to true will function properly 
Signed-off-by: Johnny Bieren <jbieren@redhat.com>
 2017-05-16 15:11:54 -04:00
Mrunal Patel
7732f30505 Merge pull request #520 from runcom/integrate-jenkins-playbook 
contrib: test: add jenkins playbook
 2017-05-16 10:06:27 -07:00
Antonio Murdaca
bceba08666
README.md: fix deps 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-16 18:29:07 +02:00
Antonio Murdaca
8c45e7b120
contrib: test: add jenkins playbook 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-16 18:29:01 +02:00
Antonio Murdaca
aa3ef626f2 Merge pull request #518 from runcom/whitespaces 
Makefile: enable git-validation dangling whitespace
 2017-05-16 15:43:41 +02:00
Antonio Murdaca
7c75cb080f
Makefile: enable git-validation dangling whitespace 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-16 15:23:35 +02:00
Antonio Murdaca
1ca660e3b7 Merge pull request #512 from runcom/stop-timeout 
server: honor container stop timeout from CRI
 2017-05-16 10:06:47 +02:00
Antonio Murdaca
1cc5a27f38 Merge pull request #517 from mrunalp/rename_fixes 
Fix remnants of ocid -> crio rename
 2017-05-16 10:06:15 +02:00
Mrunal Patel
5e4809bdfe Fix remnants of ocid -> crio rename 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-05-15 15:05:58 -07:00
Antonio Murdaca
98ac911527 Merge pull request #508 from mrunalp/create_error 
Capture errors from runtime create failures
 2017-05-15 23:34:45 +02:00
Antonio Murdaca
b3683ab184
server: honor container stop timeout from CRI 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-15 22:56:31 +02:00
Mrunal Patel
0a0533cdfc Capture errors from runtime create failures 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-05-15 13:35:18 -07:00
Mrunal Patel
20e9aeb16f Merge pull request #516 from mheon/gitignore_update 
Update gitignore to replace ocic with crioctl
 2017-05-15 13:30:03 -07:00
Matthew Heon
d60d3b78ad 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-15 16:03:05 -04:00
Matthew Heon
5b184aad27 Update gitignore to replace ocic with crioctl 
Matches the rename that just got merged

Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-05-15 14:46:42 -04:00
Mrunal Patel
7ea255fcea Merge pull request #495 from rhatdan/rename 
Rename ocid to crio
 2017-05-15 11:27:28 -07:00
Mrunal Patel
7465244d7d Merge pull request #507 from runcom/fix-caps-drop 
vendor: bump oci/runtime-tools to fix caps drop
 2017-05-12 10:41:20 -07:00
Antonio Murdaca
712df31f9c
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 18:55:18 +02:00
Antonio Murdaca
9b48e83027
test: add caps drop test 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-12 18:20:34 +02:00
Antonio Murdaca
2d997859de
vendor: bump oci/runtime-tools to fix caps drop 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-12 18:20:23 +02:00
Mrunal Patel
c533e5e34b Merge pull request #506 from runcom/add-ro-and-masked-paths 
server: add RO and masked paths on container creation
 2017-05-12 07:10:02 -07:00
Dan Walsh
4493b6f176 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-12 09:56:06 -04:00
Antonio Murdaca
1d455a31a9
server: add RO and masked paths on container creation 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-12 12:47:40 +02:00
Antonio Murdaca
81cfba283a Merge pull request #502 from mrunalp/device_support 
Device support
 2017-05-11 10:22:53 +02:00
Mrunal Patel
d3c7a24896 bats: Add a test for adding device to a container 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2017-05-10 13:36:51 -07:00
Mrunal Patel
4a02418c82 Add a test config for device 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2017-05-10 13:36:33 -07:00
Mrunal Patel
23cf1a6fdb Add devices to OCI config 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-05-09 14:37:01 -07:00
Mrunal Patel
f7e5e24a05 Add helper for adding devices to OCI spec 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-05-09 14:36:55 -07:00
Mrunal Patel
5d1a9cb1c9 Merge pull request #501 from runcom/kubeName-annotation 
server: store kubeName in annotations
 2017-05-08 10:06:47 -07:00
Antonio Murdaca
b7ba9d058b
server: store kubeName in annotations 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-08 09:15:00 +02:00
Mrunal Patel
88b8a9efe1 Merge pull request #489 from dcbw/fix-pod-namespace-name-id 
sandbox: pass correct pod Namespace/Name to network plugins and fix id/name ordering
 2017-05-06 09:17:19 -07:00
Dan Williams
13f6e95685 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>
 2017-05-05 23:55:37 -05:00
Antonio Murdaca
cf0afef675 Merge pull request #496 from mrunalp/fix_make_docs_offline 
makefile: Look for go-md2man in system path first
 2017-05-06 00:28:00 +02:00
Mrunal Patel
b71bcd65af makefile: Look for go-md2man in system path first 
In build environments such as koji, there is no access to download
and install go packages so we should look for go-md2man in system
path first.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-05-05 15:01:37 -07:00
Mrunal Patel
2da250d652 Merge pull request #491 from runcom/fix-caps-set 
server: fix set caps on container create
 2017-05-05 11:32:35 -07:00
Antonio Murdaca
139b16bac2
server: fix set caps on container create 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-05 16:31:52 +02:00
Antonio Murdaca
715785950c
test: use redis:alpine 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-05 16:31:48 +02:00
Mrunal Patel
d3fe735fc0 Merge pull request #486 from runcom/systemd-fix 
contrib: systemd: fix ocid path
 2017-05-04 07:38:20 -07:00
Antonio Murdaca
a73f39acf2
contrib: systemd: fix ocid path 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-03 23:25:12 +02:00
Mrunal Patel
7cbfccfac8 Merge pull request #485 from giannisalinetti/master 
Updated paths on tutorial.md to reflect the Makefile install configuration.
 2017-05-02 16:35:03 -07:00
Gianni Salinetti
7a7403ae0e Updated paths on tutorial.md to reflect the Makefile install configuration 
Signed-off-by: Gianni Salinetti <gbsalinetti@extraordy.com>
 2017-05-02 23:03:31 +02:00