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

2091 commits

This branch
This branch
All branches
Author SHA1 Message Date
Antonio Murdaca
0914a7a667 Merge pull request #1053 from mrunalp/update_godbus_dep 
vendor: Update godbus dependency to a389bd
 2017-10-24 21:59:33 +02:00
Matthew Heon
042f31fe68 Add default CRI-O socket path back to conmon 
Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-10-24 15:42:23 -04:00
Matthew Heon
ae5fc471ea Make attach sockets directory an argument in Conmon 
This is required to enable ongoing work in libpod

Signed-off-by: Matthew Heon <mheon@redhat.com>
 2017-10-24 15:42:23 -04:00
Antonio Murdaca
e95f75e8f2 Merge pull request #1058 from mrunalp/revert_swap 
Revert "integration-playbook: Idempotent Swapping"
 2017-10-24 21:10:33 +02:00
Antonio Murdaca
26ca82b23d Merge pull request #1054 from mrunalp/oom_test_loop 
test: Test for OOM condition in a loop
 2017-10-24 20:25:41 +02:00
Chris Evich
61c643330e Revert "integration-playbook: Idempotent Swapping" 
This reverts commit b198c57cfb.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-10-24 09:36:56 -07:00
Mrunal Patel
56cda43444 test: Test for OOM condition in a loop 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-10-23 21:07:22 -07:00
Mrunal Patel
9ec09fa3ae vendor: Update godbus dependency to a389bdde4dd695d414e47b755e95e72b7826432c 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-10-23 12:34:05 -07:00
Antonio Murdaca
7ab9c55a12 Merge pull request #1042 from rhatdan/Makefile 
Makefile
 2017-10-21 12:21:53 +02:00
Mrunal Patel
d7d2ce7ce2 Merge pull request #1044 from runcom/fix-host-pid 
fix host pid handling for containers and share uts ns
 2017-10-19 14:11:41 -07:00
Daniel J Walsh
fd43871187 Merge pull request #1037 from mrunalp/revert_move_sock 
Revert "Move crio default sock to /var/run/crio/crio.sock"
 2017-10-19 15:41:16 -04:00
Daniel J Walsh
c46b875fe7 Merge pull request #1001 from cevich/fix_reswap 
integration-playbook: Don't re-swap
 2017-10-19 15:17:23 -04:00
Antonio Murdaca
da725f3e5f
fix host pid handling for containers and share uts ns 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-10-19 21:13:28 +02:00
Daniel J Walsh
655b47fdc4 Strip out debuginfo and other content to make images smaller 
This can be overriden by passing in the

make SHRINKFLAGS=

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-10-19 17:34:24 +00:00
Daniel J Walsh
6835afaa54 Change buildtags based on installed environment. 
Determine if selinux is available before building cri-o with support.
Don't add ostree support to crio or any tools other then kpod.
cri-o does not use ostree.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-10-19 17:34:24 +00:00
Mrunal Patel
b0e9f0eba8 Revert "Move crio default sock to /var/run/crio/crio.sock" 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-10-19 10:13:49 -07:00
Mrunal Patel
3be3936d7d Merge pull request #1041 from runcom/fix-e2e 
contrib: test: fix e2e cmdline
 2017-10-19 10:05:20 -07:00
Antonio Murdaca
d91877dbb2
contrib: test: fix e2e cmdline 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-10-19 16:37:26 +02:00
Antonio Murdaca
12ce3ba3ed Merge pull request #1030 from mrunalp/move_crio_sock 
Move crio default sock to /var/run/crio/crio.sock
 2017-10-19 00:53:10 +02:00
Daniel J Walsh
c2b7f37bd3 Merge pull request #1017 from baude/cri_tests_sandbox 
server/sandbox_list.go: No error on filtered list find by ID
 2017-10-18 16:10:11 -04:00
Chris Evich
b198c57cfb integration-playbook: Idempotent Swapping 
If the playbook is run multiple times or a host already has
swap configured, re-adding swap over the existing file
will cause untold problems.  Also, it will not persist across
reboots unless added to fstab.

Avoid this by checking if any swap is active. If not
create a unique swapfile and format it.  Then enable
it to persist across reboots.

Signed-off-by: Chris Evich <cevich@redhat.com>
 2017-10-18 13:42:07 -04:00
Daniel J Walsh
b3ceb2a450 Merge pull request #1031 from rhatdan/seccomp 
Update to latest seccomp filters in moby
 2017-10-18 11:46:30 -04:00
Daniel J Walsh
704ebacab8 Update to latest seccomp filters in moby 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-10-18 05:14:30 -04:00
Mrunal Patel
c04f585a53 Merge pull request #1021 from runcom/fix-crio-versioning 
version: fix version handling and kube info
 2017-10-17 22:04:55 -07:00
Mrunal Patel
542994ff2a Merge pull request #1025 from edsantiago/safer_conmon_chmod 
Issue #1024: don't chmod a nonexistent file
 2017-10-17 22:04:04 -07:00
Mrunal Patel
761e73c82e Move crio default sock to /var/run/crio/crio.sock 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2017-10-17 22:02:53 -07:00
Mrunal Patel
eafb7f7105 Merge pull request #1014 from runcom/oci-kill-all-fix 
oci: fixes to properly handle container stop action
 2017-10-17 21:59:32 -07:00
Mrunal Patel
f237cdb2a5 Merge pull request #1023 from edsantiago/restore_cni_plugin 
restore lost cni-plugin option
 2017-10-17 15:21:39 -07:00
Mrunal Patel
f2c4ed765b Merge pull request #1018 from nalind/majorminor 
Update golang.org/x/sys
 2017-10-17 14:38:01 -07:00
Mrunal Patel
43ae97e43c Merge pull request #1026 from umohnani8/secrets_patch 
Fixed logic flaw in the secrets mounts
 2017-10-17 14:35:38 -07:00
Daniel J Walsh
fa23808bd6 Merge pull request #1019 from williamsandrew/add-missing-sudo 
docs: Add missing `sudo` command in tutorial
 2017-10-17 15:08:48 -04:00
Andrew Williams
67db54ea54 docs: Add missing sudo command in tutorial 
Signed-off-by: Andrew Williams <williams.andrew@gmail.com>
 2017-10-17 12:49:31 -05:00
umohnani8
a11b1f953d Fixed logic flaw in the secrets mounts 
Tested on a REHL box and found out that the mounts were not showing up
Had a logic flaw, where if the mount was "host:container"
Was setting the mount source to "host" and destination to "ctrRunDir/container"
When instead, the mount source should be "ctrRunDir/container" and destination "container"
with the data copied from "host" to "ctrRunDir/container"

Signed-off-by: umohnani8 <umohnani@redhat.com>
 2017-10-17 13:08:42 -04:00
Ed Santiago
e24cfb90c0 fixup! Restore conmon permissions in teardown() 
Signed-off-by: Ed Santiago <santiago@redhat.com>
 2017-10-17 11:00:26 -06:00
Ed Santiago
0852f5c188 Issue #1024: don't chmod a nonexistent file 
New network test makes improper assumptions about conmon path.
Use predefined CONMON_BINARY variable instead.

Signed-off-by: Ed Santiago <santiago@redhat.com>
 2017-10-17 10:07:35 -06:00
Ed Santiago
c476706271 restore lost cni-plugin option 
Commit d5b5028c undid part of my pr#953 (cni plugin path). Restore it.

Signed-off-by: Ed Santiago <santiago@redhat.com>
 2017-10-17 09:02:20 -06:00
Antonio Murdaca
e07ba4b2d1
version: fix version handling and kube info 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-10-17 10:44:50 +02:00
Antonio Murdaca
c6f5a290d8
oci: fixes to properly handle container stop action 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-10-17 00:21:17 +02:00
Nalin Dahyabhai
e19811238f Update golang.org/x/sys 
Update our vendored copy of golang.org/x/sys to version
9aade4d3a3b7e6d876cd3823ad20ec45fc035402 to get the new Major() and
Minor() helpers.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
 2017-10-16 17:50:30 -04:00
baude
179a3f9c0e server/sandbox_list.go: No error on filtered list find by ID 
We should not error when we try to find a pod ID in a filtered
list of sandboxes; instead we should return an empty struct
and log it.

This fixes another cri-test failure.

Signed-off-by: baude <bbaude@redhat.com>
 2017-10-16 16:36:15 -05:00
Daniel J Walsh
04951dcc6e Merge pull request #1016 from runcom/runc-version 
CI: use a fixed runc version, not master
 2017-10-16 13:18:11 -04:00
Antonio Murdaca
ab68c553d8
CI: use a fixed runc version, not master 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-10-16 14:50:13 +02:00
Daniel J Walsh
24f131584b Merge pull request #1013 from rhatdan/vendor 
Vendor in latest containers/storage
 2017-10-16 06:12:34 -04:00
Daniel J Walsh
70b1661e10 Vendor in latest containers/storage 
Container/storage has been enhanced to speed up the compiling and loading
of json files.  This should make make cri-o a little bit faster.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2017-10-14 09:41:25 +00:00
Daniel J Walsh
774d44589c Merge pull request #1008 from TomSweeneyRedHat/dev/tsweeney/kpod_load 
Update kpod load to add signature-policy (2)
 2017-10-14 05:34:13 -04:00
Daniel J Walsh
4de3964686 Merge pull request #999 from mheon/libpod_in_memory_state 
Working state implementation for libpod
 2017-10-13 19:15:41 -04:00
Daniel J Walsh
7b9a5c259e Merge pull request #992 from baude/cri_tests_sec 
Initial fixes for cri-tests
 2017-10-13 19:15:08 -04:00
TomSweeneyRedHat
54a043bfcd Update kpod load to add signature-policy (2) 
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
 2017-10-13 16:28:15 -04:00
Mrunal Patel
cd1bac5ee0 Merge pull request #1012 from mrunalp/release_1.0.0 
Release 1.0.0
 2017-10-13 13:06:17 -07:00
Daniel J Walsh
9888bc3ed6 Merge pull request #1011 from rhatdan/cleanup 
Fix references to CRI-O
 2017-10-13 15:52:22 -04:00