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

1821 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mrunal Patel
e4adfcc11a Merge pull request #376 from mairin/master 
#370 - adding a logo for cri-o
 2017-03-01 11:55:33 -08:00
Máirín Duffy
8c85795740 Adding new logo to README.md 
Issue: 370
Signed-off-by: Máirín Duffy <duffy@redhat.com>
 2017-03-01 13:54:32 -05:00
Máirín Duffy
127f123734 Adding cri-o logo artwork 
Note that crio-logo-source is the full Inkscape SVG source and crio-logo.svg
is an SVGO-optimized version of just the white bg version of the logo.

Issue: #370
Signed-off-by: Máirín Duffy <duffy@redhat.com>
 2017-03-01 13:34:30 -05:00
Antonio Murdaca
3a9e7036a1 Merge pull request #374 from vbmade2000/pkg-config-correction 
Correct package name for pkg-config
 2017-02-27 12:24:49 +01:00
Malhar Vora
54c4bc2bd2 Correct package name for pkg-config 
Signed-off-by: Malhar Vora  <mlvora.2010@gmail.com>
 2017-02-27 16:03:20 +05:30
Mrunal Patel
ecb7718ae9 Merge pull request #373 from rhatdan/storage-opt 
Depracate --storage-option for --storage-opt
 2017-02-25 20:56:29 -08:00
Daniel J Walsh
cf5b0ae57f Deprecate --storage-option for --storage-opt 
container-storage-setup (Formerly docker-storage-setup) is being converted to
run with container runtimes outside of docker.  Specifically we want to use it
with CRI-O/ocid.  It does not know anything about the container runtimes it
is generating options for, so it generates them based on the storage CLI of
docker.  I see no reason to have the storage option for ocid to be different
and we can just depracate the option for now.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-02-25 09:09:50 -05:00
Pengfei Ni
3690f4c971 Merge pull request #371 from apilloud/canonical_import 
Use canonical import path for apimachinery
 2017-02-23 15:54:56 +08:00
Andrew Pilloud
5f63cdcf89 Use canonical import path for apimachinery 
Signed-off-by: Andrew Pilloud <andrewpilloud@igneoussystems.com>
 2017-02-22 18:32:42 -08:00
Mrunal Patel
860c5419fd Merge pull request #368 from apilloud/no_seccomp 
Run without seccomp
 2017-02-22 12:01:17 -08:00
Andrew Pilloud
4ce17f893a Change bool style 
Signed-off-by: Andrew Pilloud <andrewpilloud@igneoussystems.com>
 2017-02-22 10:27:35 -08:00
Andrew Pilloud
2bb4191047 Move seccomp enabled check into seccomp package 
Signed-off-by: Andrew Pilloud <andrewpilloud@igneoussystems.com>
 2017-02-22 09:32:12 -08:00
Andrew Pilloud
44e7e88ff3 Run without seccomp support 
Signed-off-by: Andrew Pilloud <andrewpilloud@igneoussystems.com>
 2017-02-21 16:47:03 -08:00
Mrunal Patel
424fc8d0d6 Merge pull request #366 from apilloud/fix_ignore 
Make ignore patterns absolute
 2017-02-21 13:22:15 -08:00
Andrew Pilloud
0fb74ae661 sort .gitignore 
Signed-off-by: Andrew Pilloud <andrewpilloud@igneoussystems.com>
 2017-02-21 11:49:28 -08:00
Andrew Pilloud
f74145cc4c Make ignore paths absolute 
Signed-off-by: Andrew Pilloud <andrewpilloud@igneoussystems.com>
 2017-02-21 11:49:21 -08:00
Aleksa Sarai
7d56dae492
merge branch 'pr-364' 
Closes #364
LGTMs: @cyphar @mikebrow
 2017-02-21 08:28:21 +11:00
Antonio Murdaca
b041c716e7
.travis.yml: add go1.8 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-02-20 18:32:21 +01:00
Mrunal Patel
48426e3ebc Merge pull request #336 from cyphar/revert-goinstall-build 
make: revert switch to 'go install'
 2017-02-16 09:35:39 -08:00
Aleksa Sarai
0d7147ff5c
make: revert switch to 'go install' 
go install acts incredibly weirdly and rarely does what you want, not to
mention that it's just bad for distribution build setups. Switch back to
go build, which works properly and doesn't have half as many issues.

Fixes: 6c9628cdb1 ("Build and install from GOPATH")
Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2017-02-17 03:22:12 +11:00
Mrunal Patel
6d76ea2fa1 Merge pull request #363 from jawnsy/travis-notifications 
Travis CI notifications to Freenode #ocid
 2017-02-14 09:13:40 -08:00
Jonathan Yu
3560be5d4d Travis CI notifications to Freenode #ocid 
Signed-off-by: Jonathan Yu <jawnsy@redhat.com>
 2017-02-13 21:14:09 -08:00
Antonio Murdaca
0639f06d03 Merge pull request #362 from nalind/nameasdigest 
Don't try to parse an image ID a second time
 2017-02-08 17:36:29 +01:00
Nalin Dahyabhai
3eca785331 Don't try to parse an image ID a second time 
When looking for the image to use for creating a container, there's no
need to attempt parsing the ID a second time, and doing so can create
confusing error messages.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-02-08 10:58:00 -05:00
Mrunal Patel
6bd7c53568 Merge pull request #360 from runcom/bump-runc 
bump runc@b263a43430ac6996a4302b891688544225197294
 2017-02-07 15:06:39 -08:00
Antonio Murdaca
c258a2d8f0
bump runc@b263a43430ac6996a4302b891688544225197294 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-02-07 10:57:46 +01:00
Mrunal Patel
65fc398da1 Merge pull request #342 from intelsdi-x/bump_vendors 
Applying k8s kubelet v3 api to cri-o server
 2017-02-06 15:18:00 -08:00
Michał Żyłowski
5c81217e09 Applying k8s.io v3 API for ocic and ocid 
Signed-off-by: Michał Żyłowski <michal.zylowski@intel.com>
 2017-02-06 13:05:10 +01:00
Mrunal Patel
73a0881dbb Merge pull request #353 from intelsdi-x/kubernetes_instruction 
doc: Add instruction to run cri-o with kubernetes
 2017-02-04 08:27:51 -08:00
Antonio Murdaca
9d085aef0a Merge pull request #356 from nalind/helpers 
Minor tweaks to test helpers
 2017-02-04 15:18:27 +01:00
Aleksa Sarai
3b1b862d06
merge branch 'pr-358' 
Closes #358
LGTMs: @cyphar
 2017-02-05 01:07:56 +11:00
Lorenzo Fontana
57971c5409
Specify glibc-static as build requirement, fixes #357 
Signed-off-by: Lorenzo Fontana <fontanalorenz@gmail.com>
 2017-02-04 02:21:10 +01:00
Antonio Murdaca
f5e5a4b848 Merge pull request #355 from mrunalp/update_image_lib 
dep: Update containers/image to 1c202c5d85d2ee531acb1e91740144410066d19e
 2017-02-03 23:34:23 +01:00
Nalin Dahyabhai
ff5c485e7f Make sure we don't read a host ocid.conf in tests 
When generating an ocid.conf for use when running tests, make sure we
don't pick up any defaults from an installed copy of ocid by forcing our
copy to read /dev/null as its configuration file.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-02-03 17:19:29 -05:00
Nalin Dahyabhai
5a89d5381d Wait when restarting ocid during tests 
When we restart ocid as part of a test, wait for the daemon to exit when
we send it a SIGTERM, just as we do when we try to stop it for good.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-02-03 17:18:26 -05:00
Mrunal Patel
67588ca9bf dep: Update containers/image to 1c202c5d85d2ee531acb1e91740144410066d19e 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-02-03 11:15:09 -08:00
Michał Żyłowski
a48336f981 Imports: Fix imports after vendoring (apimachinery) 
Signed-off-by: Michał Żyłowski <michal.zylowski@intel.com>
 2017-02-03 16:05:06 +01:00
Michał Żyłowski
52baf68d50 Vendor: Update k8s version 
Signed-off-by: Michał Żyłowski <michal.zylowski@intel.com>
 2017-02-03 16:04:59 +01:00
Jacek J. Łakis
983aec6380 doc: Add instruction to run cri-o with kubernetes 
Signed-off-by: Jacek J. Łakis <jacek.lakis@intel.com>
 2017-02-03 10:37:50 +01:00
Antonio Murdaca
dfa93414c5 Merge pull request #352 from mrunalp/deps 
Switch to github.com/golang/dep for vendoring
 2017-02-02 18:32:44 +01:00
Mrunal Patel
d0464b11e2 Merge pull request #348 from runcom/fix-imageid-lookup 
storage: fix image retrieval by id
 2017-02-01 09:05:36 -08:00
Mrunal Patel
b1f3dc74e9 Remove hack/vendor.sh 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-01-31 16:46:57 -08:00
Mrunal Patel
42bc14dd8b Add dep vendoring files 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-01-31 16:46:26 -08:00
Mrunal Patel
8e5b17cf13 Switch to github.com/golang/dep for vendoring 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-01-31 16:45:59 -08:00
Mrunal Patel
a6c0fcfa57 Merge pull request #350 from nalind/buildtags 
Use build tags for bin2img and copyimg
 2017-01-31 12:02:24 -08:00
Nalin Dahyabhai
893593272f Use build tags for bin2img and copyimg 
Use the same build tags for bin2img and copyimg that we use for ocid,
and improve detection of the case where we need to use the
"libdm_no_deferred_remove" tag.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-01-31 11:57:19 -05:00
Antonio Murdaca
2202c1a460
storage: fix image retrieval by id 
kubelet sends a request to create a container with an image ID (as
opposed as an image name). That ID comes from the ImageStatus response.
This patch fixes that by setting the image ID as well as the image name
and fix the login to lookup for image ID as well.

Found while running `make test-e2e-node`.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-01-31 16:32:30 +01:00
Mrunal Patel
d6ab91be27 Merge pull request #283 from runcom/add-kelsey-tutorial 
README.md: replace examples with kelsey's tutorial
 2017-01-30 09:57:15 -08:00
Antonio Murdaca
2341ae4184
README.md: replace examples with kelsey's tutorial 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-01-27 08:30:18 +01:00
Mrunal Patel
89e4c54995 Merge pull request #338 from sameo/topic/alternate-runtime 
Select alternate runtimes for host integration tests
 2017-01-26 14:47:19 -08:00