Commit graph

1852 commits

Author SHA1 Message Date
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
Chris Evich
f65d548ac2 Add file-backed swap to prevent OOM
Without any swap space enabled, it's possible some intensive operation
can chew up all the memory on the test VM.  Enabling swap space will
prevent this for minor cases, but could lead to disk-thrashing if the
memory demand is excessive.

Since the test system never reboots, using a file-backed swap should
suffice. Though not ideal, it's easy to setup and doesn't require any
interactions with the cloud that owns the VM or the job that created it.

Signed-off-by: Chris Evich <cevich@redhat.com>
2017-08-30 14:01:25 -04: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
Daniel J Walsh
3e7cbc9fe7 Merge pull request #795 from rhatdan/kpod-push-compression
Disable compression by default.
2017-08-29 06:54:07 -04:00
Antonio Murdaca
745a05ee86 Merge pull request #799 from runcom/fix-make-install-systemd
Makefile: force symlink to cri-o.service
2017-08-29 11:59:42 +02:00
Antonio Murdaca
c2a4fc740f
oci: wait a while for exit file to show up
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-08-29 11:25:51 +02:00
Antonio Murdaca
f35147e23c
cmd: {crio,crioctl}: bump to beta
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-08-29 11:25:33 +02:00
baude
6f492593ec Add image_id to json output
Consumers of the json output, like the atomic cli, need the ID of the
image for the container as well as the name.  Specifically, it is used
to tract "used" and "vulnerable" images.

Signed-off-by: baude <bbaude@redhat.com>
2017-08-28 20:44:22 -05:00
Nalin Dahyabhai
eef5e6d5da kpod: add more storage information to "info"
Have the "kpod info" command also package up the driver-level status
information that the github.com/containers/storage.Store's Status()
method returns.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-08-28 17:32:03 -04:00
Rajat Chopra
1084ce691a monitor CNI networks continuously
Signed-off-by: Rajat Chopra <rchopra@redhat.com>
2017-08-28 15:47:15 -04:00
Daniel J Walsh
3473e8afed Merge pull request #798 from TomSweeneyRedHat/dev/tsweeney/docfix2
Touchup apt to apt-get in README.md
2017-08-28 09:38:57 -04:00
Antonio Murdaca
8a0b851b88
server: container_remove: ignore not existent exit file
Found out that during OpenShift testing, node was trying to remove
containers (probably in a bad state) and was failing the removal with
this kind of error:

E0828 13:19:46.082710    1235 kuberuntime_gc.go:127] Failed to remove
container
"e907f0f46b969e0dc83ca82c03ae7dd072cfe4155341e4521223d9fe3dec5afb": rpc
error: code = 2 desc = failed to remove container exit file
e907f0f46b969e0dc83ca82c03ae7dd072cfe4155341e4521223d9fe3dec5afb: remove
/var/run/crio/exits/e907f0f46b969e0dc83ca82c03ae7dd072cfe4155341e4521223d9fe3dec5afb:
no such file or directory

I believe it's ok to ignore this error as it may happen conmon will
fail early before exit file is written.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-08-28 15:37:00 +02:00
Antonio Murdaca
9fac90525e
Makefile: force symlink to cri-o.service
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-08-28 14:59:35 +02:00
Daniel J Walsh
2d358fff37 Merge pull request #788 from umohnani8/kpod_ps
Modify the JSON output of kpod ps
2017-08-28 08:48:08 -04:00
Daniel J Walsh
e48f7a3491 Remove compress variable
No reason to carry this temporary variable for documentation purposes.
If in the future we find that it is necessary to add a CLI option, we
can add the variable then.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2017-08-28 08:29:42 -04:00
Ryan Cole
865612c3db Disable compression by default
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
2017-08-28 08:29:42 -04:00
TomSweeneyRedHat
c678bef2bb Touchup apt to apt-get in README.md
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2017-08-28 07:30:58 -04:00
umohnani8
d76e500b59 Modify the JSON output of kpod ps
Changed the JSON output to hold the actual type of the data.
For example the creation time of a container will be of form time.Time.
The human readable output modifies all the fields to type string, which
is not helpful when the JSON output wants to be used for further processing.

Signed-off-by: umohnani8 <umohnani@redhat.com>
2017-08-27 20:41:50 -04:00
Mrunal Patel
6473eec86a Merge pull request #796 from runcom/fix-makefile-idempotent
Makefile: install alias, not symlink
2017-08-27 12:24:57 -07:00
Antonio Murdaca
609ec81360 Merge pull request #789 from mrunalp/close_dbus_conn
utils: Fix close conn after starting scope
2017-08-27 20:22:54 +02:00
Mrunal Patel
8cad9840fa utils: Fix close conn after starting scope
This fixes the goroutine leak in cri-o.

Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-08-27 07:34:45 -07:00