Mrunal Patel
04ddb57ed7
conmon: Add helper function to get pid cgroup subsystem path
...
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-05-25 11:30:58 -07:00
Mrunal Patel
8e60251b29
conmon: Add helper for closing C stdlib FILEs
...
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-05-25 11:30:58 -07:00
Mrunal Patel
6a24e49b57
Merge pull request #536 from runcom/fix-cni-ci
...
Fix CI because of CNI repo move
2017-05-25 11:08:59 -07:00
Antonio Murdaca
f51b0a10c6
Dockerfile: move to containernetworking/plugins
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-25 18:13:53 +02:00
Antonio Murdaca
0472c33344
contrib: test: CNI plugins moved repo
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-25 18:13:15 +02:00
Mrunal Patel
bd6e8a5a20
Merge pull request #534 from runcom/volumes-workaround
...
server: workaround images with Config.Volumes
2017-05-22 10:59:44 -07:00
Mrunal Patel
774e98514f
Merge pull request #532 from runcom/e2e-fixes-0
...
e2e fixes - part 0
2017-05-22 10:59:23 -07:00
Antonio Murdaca
02f3828283
server: workaround images with Config.Volumes
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-22 18:01:06 +02:00
Antonio Murdaca
5f53416611
server: sandbox_remove: add comment on sandbox not found empty response
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-22 16:38:10 +02:00
Antonio Murdaca
d099e3a988
server: container_status: we should return digested references in imageRef
...
currently blocked on
https://github.com/kubernetes-incubator/cri-o/issues/531
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-22 16:37:46 +02:00
Antonio Murdaca
22d055869d
server: container_status: return image name if available
...
If we create a container using the image ID like
771cd5947d5ea4bf8e8f4900dd357dbb67e7b16486c270f8274087d182d457c6, then
a call to container_status will return that same ID for the "Image"
field in ContainerStatusResponse.
This patch matches dockershim behavior and return the first tagged name
if available from the image store.
This is also needed to fix a failure in k8s e2d tests.
Reference:
https://github.com/kubernetes/kubernetes/pull/39298/files#diff-c7dd39479fd733354254e70845075db5R369
Reference:
67a5bf8454/test/e2e/framework/util.go (L1941)
2017-05-22 16:37:46 +02:00
Antonio Murdaca
a0916b1044
server: sandbox_stop: ignore not found sandboxes
...
This patch matches dockershim behavior
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-22 16:37:39 +02:00
Mrunal Patel
fb83c7e619
Merge pull request #505 from runcom/restore-2
...
Fix restore
2017-05-19 08:39:28 -07:00
Antonio Murdaca
a19d60654e
Merge pull request #526 from runcom/test-cgroup-manager
...
Test systemd cgroup manager
2017-05-19 11:49:59 +02:00
Antonio Murdaca
3318dac64b
test: exercise systemd cgroup_parent
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-19 00:18:40 +02:00
Mrunal Patel
29007b0a47
Merge pull request #525 from runcom/kubetests
...
contrib: test: enable k8s Conformance tests for Fedora
2017-05-18 14:34:13 -07:00
Antonio Murdaca
9b74e546ca
test: fix restore test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 21:19:53 +02:00
Antonio Murdaca
22b922727b
test: add bad state restore test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 21:19:53 +02:00
Antonio Murdaca
de96e54230
server: move StopAllSandboxes in sandbox_stop.go
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 21:19:52 +02:00
Antonio Murdaca
3b2e5aa5c2
add a note on server shutdown...
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 21:19:52 +02:00
Antonio Murdaca
f00edc2b2d
server: do not remove but stop sandboxes on shutdown
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 21:19:52 +02:00
Antonio Murdaca
4a8debe6c5
oci: do not serialize empty fields on disk
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 21:19:51 +02:00
Antonio Murdaca
6622feb480
server: still update status on container not found in runc
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 21:19:51 +02:00
Antonio Murdaca
358dac96d4
server: ignore runc not exist errors
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 21:19:50 +02:00
Antonio Murdaca
a41ca975c1
server: restore containers state from disk on startup
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 21:19:50 +02:00
Antonio Murdaca
da0b8a6157
server: store containers state on disk
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 21:19:50 +02:00
Antonio Murdaca
2ddc062bbe
oci: ignore non existing containers on delete
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 21:19:45 +02:00
Antonio Murdaca
3946692107
contrib: test: enable k8s Conformance tests
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 19:58:35 +02:00
Antonio Murdaca
fbc5e49a60
oci: save container's finished time
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 18:49:55 +02:00
Antonio Murdaca
790c6d891a
server: store creation in containers
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 18:49:54 +02:00
Antonio Murdaca
1f4a4742cb
oci: add container directory to Container struct
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 18:49:54 +02:00
Antonio Murdaca
3bd4811b3b
server: restore sandbox created time from disk
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 18:49:54 +02:00
Antonio Murdaca
59e3f98b6d
server: return sandbox's own created time
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 18:49:54 +02:00
Antonio Murdaca
80a789bce3
server: store sandbox creation time
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 18:49:54 +02:00
Antonio Murdaca
aeaca81280
contrib: test: run tests with systemd cgroup manager
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 17:49:49 +02:00
Antonio Murdaca
dac6b7ceb5
test: fix typo
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 17:47:43 +02:00
Antonio Murdaca
4dcf33581c
test: add CGROUP_MANAGER env to switch to systemd
...
default is still cgroupfs
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 17:39:49 +02:00
Antonio Murdaca
645622300a
Merge pull request #524 from mrunalp/convert_cgroup_format
...
Convert cgroup format to what runc expects
2017-05-18 11:40:22 +02:00
Mrunal Patel
3fefcaa1dd
Convert pod cgroupPath to runc format for systemd cgroup
...
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-05-17 17:46:53 -07:00
Mrunal Patel
d3bc6ab693
Add function to convert kube pod cgroup format to runc format
...
This is a slightly modified version of the function in k8s.
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-05-17 17:45:57 -07:00
Mrunal Patel
0e2af44d72
Merge pull request #523 from runcom/up-c-storage
...
vendor: upgrade containers/storage
2017-05-17 13:44:16 -07:00
Antonio Murdaca
ecd0006e80
vendor: upgrade containers/storage
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-17 22:18:07 +02:00
Mrunal Patel
5addc8caf0
Merge pull request #522 from runcom/enable-centos-ci
...
contrib: test: fix CentOS CI
2017-05-17 09:48:28 -07:00
Antonio Murdaca
87ca182f5c
contrib: test: run CentOS tests with overlay2
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-17 18:05:07 +02:00
Antonio Murdaca
26a080ad88
contrib: test: tune stuff for CentOS CI
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-17 18:03:31 +02:00
Antonio Murdaca
725c159bea
test: testdata: get rid of memory limits
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-17 17:30:11 +02:00
Antonio Murdaca
80ad55405f
contrib: test: use upstream Golang to build on CentOS
...
Cause the one shipped in CentOS is way too old at this point
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-17 13:29:59 +02:00
Antonio Murdaca
c5098bb4a1
Merge pull request #521 from johnbieren/master
...
Update integration playbook to fix xunit compatibility
2017-05-16 21:52:59 +02:00
Johnny Bieren
ca963c9959
Update playbook so simply changingg xunit to true will function properly
...
Signed-off-by: Johnny Bieren <jbieren@redhat.com>
2017-05-16 15:11:54 -04:00
Mrunal Patel
7732f30505
Merge pull request #520 from runcom/integrate-jenkins-playbook
...
contrib: test: add jenkins playbook
2017-05-16 10:06:27 -07:00
