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

1520 commits

This branch
This branch
All branches
Author SHA1 Message Date
Antonio Murdaca
5947698818
test: replace bash CNI plugin with a custom bridge 
Because we need a working CNI plugin to setup a correct netns so
sandbox_run can grab a working IP address.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-06 17:14:53 +02:00
Antonio Murdaca
2ac2832686
server: container_create: store sandbox's ip in annotations 
So it can be later retrieved when needed (cadvisor)

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-02 02:05:58 +02:00
Antonio Murdaca
5d637f015d
*: store sandbox IP 
Don't call into net namespace on every status call

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-02 02:05:12 +02:00
Antonio Murdaca
8538c4067a Merge pull request #834 from mrunalp/inspect_add_sandbox 
server: Add sandbox to container info
 2017-09-01 22:41:07 +02:00
Antonio Murdaca
11fbcd235c Merge pull request #822 from mrunalp/label_infra_ctr 
sandbox: Add special label to infra container
 2017-09-01 22:10:54 +02:00
Daniel J Walsh
553521f03f Merge pull request #805 from baude/config 
Make kpod parse configuration file
 2017-09-01 14:57:14 -04:00
Mrunal Patel
ec27f5b615 server: Add sandbox to container info 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-09-01 11:50:18 -07:00
Mrunal Patel
e9378f23ca server: Lookup infra containers as well in endpoint 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-09-01 10:25:10 -07:00
Mrunal Patel
138a40540f server: Add special k8s label to infra containers 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-09-01 10:25:04 -07:00
Antonio Murdaca
35ada86b04 Merge pull request #833 from runcom/bump-runc-2 
Dockerfile: bump runc commit
 2017-09-01 19:06:05 +02:00
baude
266fc193e7 Make kpod parse configuration file 
kpod must parse the crio configuration file or the storage
is not set up correctly.  By default it is not.  We now read
/etc/crio/crio.conf in as the configuration file unless it is
overriden by the user and the global -c|--config switch.

Signed-off-by: baude <bbaude@redhat.com>
 2017-09-01 11:14:40 -05:00
Mrunal Patel
49c1fd27ac server: Add infra container store to track them separately 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-09-01 08:49:08 -07:00
Mrunal Patel
b4f9fc8c2c server: Rename infra container to POD 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-09-01 08:47:55 -07:00
Mrunal Patel
5650a793bd Merge pull request #831 from runcom/fix-socket 
serve grpc and http on the same socket
 2017-09-01 07:28:06 -07:00
Antonio Murdaca
76d41478bf
Dockerfile: bump runc commit 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-01 16:25:52 +02:00
Antonio Murdaca
39006d4cdd
serve grpc and http on the same socket 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-09-01 12:37:10 +02:00
Antonio Murdaca
f3bbd44734 Merge pull request #826 from mrunalp/info_sock 
server: Use crio socket for info/inspect endpoints
 2017-09-01 11:09:54 +02:00
Mrunal Patel
a913cb0b5d server: Use crio socket for info/inspect endpoints 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2017-08-31 21:30:54 -07:00
Mrunal Patel
c7b625d4fd Merge pull request #828 from runcom/bump-k8s-1.7.5 
vendor: bump to kube v1.7.5
 2017-08-31 18:43:22 -07:00
Daniel J Walsh
8728194571 Merge pull request #829 from umohnani8/vendor_containers/image 
Vendor in changes made to containers/image for OCI
 2017-08-31 19:08:18 -04:00
Daniel J Walsh
ab4e7a9a35 Merge pull request #804 from 14rcole/kpod-cmd-list 
Remove duplicate kpod command names
 2017-08-31 17:02:58 -04:00
umohnani8
3d23f22292 Vendor in changes made to containers/image for OCI 
Signed-off-by: umohnani8 <umohnani@redhat.com>
 2017-08-31 16:40:13 -04:00
Mrunal Patel
22ee46d468 Merge pull request #827 from cevich/add_test_requirements2 
Minor: Make wrapper script non-zero exits fatal.
 2017-08-31 13:19:30 -07:00
Chris Evich
4f1d303824 Minor: Update venv req. hashes for internal CI 
Signed-off-by: Chris Evich <cevich@redhat.com>
 2017-08-31 15:25:19 -04:00
Mrunal Patel
f08a5f7162 Merge pull request #824 from runcom/enhance-inspect 
server: inspect: add log path and mount point for cadvisor
 2017-08-31 11:33:50 -07:00
Antonio Murdaca
eca8457468
vendor: bump to kube v1.7.5 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-08-31 19:36:07 +02:00
Chris Evich
8689fe8aed Minor: Make wrapper script non-zero exits fatal. 
Signed-off-by: Chris Evich <cevich@redhat.com>
 2017-08-31 13:06:58 -04:00
Antonio Murdaca
b16d73ab2f
server: image_list: report image size 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-08-31 17:50:25 +02:00
Antonio Murdaca
69fc590fc3
server: inspect: add log path and mount point for cadvisor 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-08-31 17:49:07 +02:00
Mrunal Patel
378b9c0d2f Merge pull request #823 from cevich/add_test_requirements 
Add Ansible playbook env. setup wrapper script
 2017-08-31 07:09:55 -07:00
Antonio Murdaca
c070da051c Merge pull request #821 from mrunalp/crio_info 
server: Add a /info endpoint
 2017-08-31 16:08:18 +02:00
Chris Evich
054793b80e Add Ansible playbook env. setup wrapper script 
The environment executing the test playbooks matters.  Establish a
script to bootstrap a known-good and fixed-version python virtual
environment.  Spell out precise execution requirements in a standard
pip 'requirements.txt' file, including version numbers and hashes.

Upon executing the ``venv-ansible-playbook.sh`` wrapper, a virtual
environment is setup and contained within a fixed (or temporary)
directory, with full logs from setup.  If this is to be preserved
across executions, the ``$WORKSPACE`` environment variable must be
set and exported beforehand.

Example execution command-line provided in script file

Signed-off-by: Chris Evich <cevich@redhat.com>
 2017-08-31 06:10:48 -04:00
Daniel J Walsh
f889a578d4 Merge pull request #820 from mikebrow/travis-update 
streamlining travis
 2017-08-31 05:35:01 -04:00
Mrunal Patel
004330df8f server: Add a /info endpoint 
This will give a way for client to get information about crio daemon.

Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2017-08-30 20:50:04 -07:00
Mrunal Patel
f557020994 Merge pull request #816 from mrunalp/inspect_container 
server: Add an inspect endpoint for containers
 2017-08-30 19:08:10 -07:00
Mike Brown
4ce18f3b28 streamlining travis 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-08-30 17:21:23 -05:00
Daniel J Walsh
2dccf1b3e5 Merge pull request #808 from mheon/libpod_runtime_skeleton 
Add basic skeleton of libpod runtime
 2017-08-30 14:52:47 -04:00
Mrunal Patel
58bc35ab40 server: Add an inspect endpoint for containers 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
 2017-08-30 11:45:56 -07:00
Mrunal Patel
173d56cc67 Merge pull request #818 from baude/ps_command 
cmd/kpod/ps.go: Use getCommand for JSON
 2017-08-30 09:59:02 -07:00
baude
94602a1e85 cmd/kpod/ps.go: Use getCommand for JSON 
The getCommand func strips out unwanted characters around the
command of the container.  The JSON output should use this func
like the regular ps output for both consistency and because
Python does a literal interpretation of the bracket [] characters
when consuming as JSON.

Signed-off-by: baude <bbaude@redhat.com>
 2017-08-30 09:26:20 -05:00
Antonio Murdaca
35eea14c66 Merge pull request #806 from rajatchopra/master 
monitor CNI networks continuously
 2017-08-30 12:12:33 +02:00
Mrunal Patel
d634468da6 Merge pull request #812 from runcom/fix-cgroupfs-naming 
server: container_create: fix cgroupfs scopes naming
 2017-08-29 17:52:45 -07:00
Antonio Murdaca
f51ca87857
*: constify cgroups stuff 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-08-30 01:10:39 +02:00
Antonio Murdaca
c199f63dba
oci: join crio-conmon for cgroupfs 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-08-29 23:00:02 +02:00
Antonio Murdaca
dd2b4a8907
server: container_create: fix cgroupfs scopes naming 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-08-29 23:00:00 +02:00
Matthew Heon
2a121111b5 Add basic skeleton of libpod runtime 
Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-08-29 13:57:20 -04:00
Daniel J Walsh
85215abf7e Merge pull request #807 from nalind/kpod-storage-status 
kpod: add more storage information to "info"
 2017-08-29 13:53:58 -04:00
Ryan Cole
380ea16232 Remove duplicate kpod command names 
Some kpod commands were listed twice in main.go.  Removed these
duplicates and alphabetized the remaining commands to prevent this
from happening in the future

Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
 2017-08-29 11:25:35 -04:00
Mrunal Patel
662e80492c Merge pull request #801 from runcom/not-exist-exit 
server: container_remove: ignore not existent exit file
 2017-08-29 07:58:33 -07:00
Daniel J Walsh
62f275c784 Merge pull request #802 from baude/add_image_id_to_ps 
Add image_id to json output
 2017-08-29 06:57:45 -04:00