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

1584 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mrunal Patel
0f8cce1a4f Merge pull request #876 from runcom/redir-stderr-to-stdout 
contrib: test: redirect stderr to stdout
 2017-09-10 10:17:21 -07:00
Antonio Murdaca
c9672671db
contrib: test: redirect stderr to stdout 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-09 18:13:56 +02:00
Daniel J Walsh
36584e6f34 Merge pull request #830 from umohnani8/update_load-save 
Update kpod load and save for oci-archive
 2017-09-09 05:58:54 -04:00
Daniel J Walsh
b5ed8b34c0 Merge pull request #843 from baude/kpod_tag 
cmd/kpod/tag.go: Do not assume docker.io for tagging
 2017-09-09 05:43:15 -04:00
Antonio Murdaca
f35108d114 Merge pull request #631 from runcom/e2e-conformance 
contrib: test: switch node-e2e to e2e
 2017-09-09 10:26:20 +02:00
Antonio Murdaca
500eb04b25 Merge pull request #874 from mrunalp/version_dirty_commit 
version: Add -dirty if compiled binary includes uncommited changes
 2017-09-09 10:05:18 +02:00
Mrunal Patel
e13803043a version: Add -dirty if compiled binary includes uncommited changes 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2017-09-08 16:17:57 -07:00
Antonio Murdaca
dd1c617467
contrib: test: switch node-e2e to e2e 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-09 00:44:21 +02:00
Antonio Murdaca
5f7c5ee119 Merge pull request #872 from mrunalp/dev_version 
version: Add -dev to VERSION
 2017-09-09 00:03:54 +02:00
Mrunal Patel
1fe4afd29a version: Bump up to rc2-dev 
Signed-off-by: Mrunal Patel <mrunal@localhost.localdomain>
 2017-09-08 15:02:55 -07:00
Antonio Murdaca
bb1da978e3 Merge pull request #870 from mrunalp/bump_rc_1 
Bump up version to rc 1
 2017-09-08 23:34:31 +02:00
Mrunal Patel
086aa910d4 Bump up version to 1.0.0-rc.1 
We add a VERSION file and pass the gitCommit and version
to the binary builds in the Makefile.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-09-08 13:23:59 -07:00
Mrunal Patel
77db25f5bb Merge pull request #856 from umohnani8/kpod_ps 
Slight modification to kpod ps based on QE feedback
 2017-09-08 11:47:27 -07:00
Mrunal Patel
3211d506a0 Merge pull request #819 from umohnani8/kpod_history 
Modify the JSON output of kpod history
 2017-09-08 11:45:58 -07:00
Mrunal Patel
0ae21a5f08 Add support for displaying git commit in version 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-09-08 10:16:01 -07:00
Antonio Murdaca
6d2b19acbb Merge pull request #860 from mrunalp/img_size_id 
pkg: storage: image: get size from image ID
 2017-09-08 19:12:46 +02:00
umohnani8
79c09d4343 Update kpod load and save for oci-archive 
Signed-off-by: umohnani8 <umohnani@redhat.com>
 2017-09-08 10:33:58 -04:00
umohnani8
216e35db18 Modify the JSON output of kpod history 
The JSON output was being modified to type string, fixed that
to be of the same type as the source
This is better for further processing of the JSON output if needed
Restructured kpod history a bit as well

Signed-off-by: umohnani8 <umohnani@redhat.com>
 2017-09-08 10:33:09 -04:00
umohnani8
45c7100253 Slight modification to kpod ps based on QE feedback 
QE noticed that kpod ps --last 0 was returning the running containers
Fixed that problem so that it returns nothing

Signed-off-by: umohnani8 <umohnani@redhat.com>
 2017-09-08 10:32:11 -04:00
Antonio Murdaca
836919876a pkg: storage: image: get size from image ID 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-08 07:27:48 -07:00
Mrunal Patel
f9387aca28 Merge pull request #865 from runcom/fix-ci 
contrib: test: run kube tests in CI with same cgroup driver
 2017-09-08 07:24:09 -07:00
Antonio Murdaca
2fa8b3a948 Merge pull request #867 from vbatts/readme_formatting 
README: more copy-pastable code sample
 2017-09-08 16:03:54 +02:00
Vincent Batts
87aa0f58e4
README: more copy-pastable code sample 
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2017-09-08 09:27:50 -04:00
Antonio Murdaca
09a8d1a751
contrib: test: run kube tests in CI with same cgroup driver 
Our CI tests on RHEL and Fedora and we want to test the systemd cgroup
driver. However, kubelet needs to run in tests with systemd cgroup
driver as well, or tests fail. This patch fixes broken CI because of
not matching cgroup driver between CRI-O and the kubelet.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-08 14:26:39 +02:00
Daniel J Walsh
3c468b6f51 Merge pull request #803 from rhatdan/libpod 
Move libkpod/image libkpod/layer to libpod/images and libpod/layers
 2017-09-07 15:20:31 -04:00
Antonio Murdaca
b8a6d358e7 Merge pull request #562 from rhatdan/hooks 
Add support for running oci-hooks
 2017-09-07 19:06:01 +02:00
Antonio Murdaca
e5b5ffdeac Merge pull request #846 from mrunalp/fix_cgroup_config 
Fix cgroup config
 2017-09-07 19:04:25 +02:00
Mrunal Patel
631359ed69 Merge pull request #849 from runcom/fix-caps 
container_create: handle cap add/drop ALL
 2017-09-07 09:53:11 -07:00
Antonio Murdaca
af0a494251
container_create: handle cap add/drop ALL 
Kubelet can send cap add/drop ALL. Handle that in CRI-O as well.
Also, this PR is re-vendoring runtime-tools to fix capabilities add to
add caps to _all_ caps set **and** fix a shared memory issue (caps set
were initialized with the same slice, if one modifies one slice, it's
reflected on the other slices, the vendoring fixes this as well)

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-07 16:43:33 +02:00
Mrunal Patel
7f4f630b98 Merge pull request #852 from runcom/fixies-42 
*: bunch of fixes...
 2017-09-07 07:37:37 -07:00
Mrunal Patel
b13e881a9b Merge pull request #858 from runcom/fix-add-registry 
pkg: storage: fix additional registries
 2017-09-07 07:34:57 -07:00
Antonio Murdaca
f7cbbf5e69 Merge pull request #813 from cevich/addswap 
Add file-backed swap to prevent OOM
 2017-09-07 14:56:08 +02:00
Antonio Murdaca
70657ea19a Merge pull request #854 from dcbw/cni-updates 
Use CNI driver from cri-o/ocicni instead of internal one
 2017-09-07 12:33:31 +02:00
Antonio Murdaca
1f908f0890
pkg: storage: fix additional registries 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-07 11:57:16 +02:00
Antonio Murdaca
e8553a124d
container_create: better handling of devices 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-07 10:13:22 +02:00
Antonio Murdaca
b7b57e8731
container_create: Add TERM=xterm when tty=true 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-07 10:13:22 +02:00
Antonio Murdaca
cde40ad5ca
container_create: set privileged on ctr only if also on sandbox 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-07 10:13:22 +02:00
Antonio Murdaca
dacc5c3ece
*: correctly wait and close servers 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-07 10:13:21 +02:00
Mrunal Patel
a81e90a9c9 Merge pull request #848 from runcom/panic-img 
pkg: storage: fix panic when no image names
 2017-09-06 17:31:34 -07:00
Dan Williams
0df30c5319 server: port to github.com/cri-o/ocicni; remove pkg/ocicni 
Signed-off-by: Dan Williams <dcbw@redhat.com>
 2017-09-06 16:07:50 -05:00
Dan Williams
3db6ba7667 vendor: add github.com/cri-o/ocicni 
Signed-off-by: Dan Williams <dcbw@redhat.com>
 2017-09-06 16:03:58 -05:00
Dan Williams
aec99d6f80 vendor: update CNI to 0.6.0 
Signed-off-by: Dan Williams <dcbw@redhat.com>
 2017-09-06 16:03:57 -05:00
Daniel J Walsh
9f282717da Begin converting kpod pull to use libpod/runtime 
We want to drop brute force mechainism for handling image
movement, this patch experiments with moving kpod pull
to use new libpod interfaces.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-09-06 19:38:47 +00:00
Daniel J Walsh
e18e962238 Move libkpod/image libkpod/layer to libpod/images and libpod/layers 
Begin moving image and layer handling out of libkpod into libpod.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-09-06 19:25:45 +00:00
Daniel J Walsh
47ef2f66df Merge pull request #850 from ashcrow/lint-install-info 
lint: Exit and give instructions when linter missing
 2017-09-06 13:31:46 -04:00
Mrunal Patel
cb1cad28db sandbox: Check cri-o and kubelet cgroup managers are same 
We ensure that cri-o and kubelet are started with compatible
cgroup managers.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-09-06 09:57:10 -07:00
Mrunal Patel
ac12018973 Merge pull request #814 from runcom/cache-ip-sandbox 
cache sandbox's IP address
 2017-09-06 09:51:03 -07:00
Antonio Murdaca
a51bc9753f
oci: add a note about crio-conmon- sub-cgroup with cgroupfs 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-06 17:14:53 +02:00
Antonio Murdaca
f9bf4b15e8
server: inspect: send full ctr log path 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-06 17:14:53 +02:00
Antonio Murdaca
e1125af435
server: expose container Name and IP 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-06 17:14:53 +02:00