Antonio Murdaca
ddc6cdf69d
test: use nginx:alpine when testing pull-by-digest
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-30 13:29:22 +02:00
Antonio Murdaca
d568eb1dd5
test: pull just once in integration tests
...
w/o this patch we were always pulling redis:alpine by digest in each
test.
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 18:41:04 +02:00
Antonio Murdaca
da421f8ad7
.gitignore: do not ignore *.rej files
...
also do some cleanup
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 18:40:59 +02:00
Antonio Murdaca
6af1c86573
Makefile: exclude ./vendor from git-validation
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:18:26 +02:00
Antonio Murdaca
0da992bbf9
execsync: rewrite to fix a bug in conmon
...
conmon has many flags that are parsed when it's executed, one of them
is "-c". During PR #510 where we vendor latest kube master code,
upstream has changed a test to call a "ctr execsync" with a command of
"sh -c commmand ...".
Turns out:
a) conmon has a "-c" flag which refers to the container name/id
b) the exec command has a "-c" flags but it's for "sh"
That leads to conmon parsing the second "-c" flags from the exec
command causing an error. The executed command looks like:
conmon -c [..other flags..] CONTAINERID -e sh -c echo hello world
This patch rewrites the exec sync code to not pass down to conmon the
exec command via command line. Rather, we're now creating an OCI runtime
process spec in a temp file, pass _the path_ down to conmon, and have
runc exec the command using "runc exec --process
/path/to/process-spec.json CONTAINERID". This is far better in which we
don't need to bother anymore about conflicts with flags in conmon.
Added and fixed some tests also.
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:17:33 +02:00
Antonio Murdaca
85cce7da84
Dockerfile: move to containernetworking/plugins
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:17:05 +02:00
Mrunal Patel
10adfe2fc7
test: Add a test for container OOM
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-05-26 15:16:19 +02:00
Mrunal Patel
f694184b31
test: Ensure image for testing oom is present
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-05-26 15:16:10 +02:00
Mrunal Patel
c1167dc58f
Set Container Status Reason when OOM Killed
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-05-26 15:16:05 +02:00
Mrunal Patel
9cab24d2d2
conmon: Disable OOM handling if cgroups not setup
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-05-26 15:15:59 +02:00
Mrunal Patel
04f525eed2
conmon: Create oom file for container on OOM notification
...
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-05-26 15:15:51 +02:00
Mrunal Patel
5c1665d33c
conmon: Add OOM eventfd to epoll monitoring list
...
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-05-26 15:15:46 +02:00
Mrunal Patel
78cb7709c7
conmon: Setup cgroups for container pid OOM notification
...
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-05-26 15:15:40 +02:00
Mrunal Patel
02efe00c12
conmon: Add helper function to get pid cgroup subsystem path
...
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-05-26 15:15:34 +02:00
Mrunal Patel
a200fcc844
conmon: Add helper for closing C stdlib FILEs
...
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-05-26 15:15:27 +02:00
Antonio Murdaca
790020e484
server: workaround images with Config.Volumes
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:14:40 +02:00
Antonio Murdaca
5ac5c94822
server: sandbox_remove: add comment on sandbox not found empty response
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:14:21 +02:00
Antonio Murdaca
7f58ef8591
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-26 15:14:12 +02:00
Antonio Murdaca
2e7a04fd4a
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-26 15:14:01 +02:00
Antonio Murdaca
3fb566ca70
server: sandbox_stop: ignore not found sandboxes
...
This patch matches dockershim behavior
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:13:50 +02:00
Antonio Murdaca
42cb5c1eea
test: fix typo
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:13:13 +02:00
Antonio Murdaca
71d6cf9bd0
test: add CGROUP_MANAGER env to switch to systemd
...
default is still cgroupfs
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:13:05 +02:00
Mrunal Patel
6b45279b51
makefile: Look for go-md2man in system path first
...
In build environments such as koji, there is no access to download
and install go packages so we should look for go-md2man in system
path first.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-05-26 15:12:40 +02:00
Antonio Murdaca
bfbf9d348e
Makefile: enable git-validation dangling whitespace
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:11:21 +02:00
Antonio Murdaca
05194ac258
test: fix restore test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:09:06 +02:00
Antonio Murdaca
681a178500
test: add bad state restore test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:09:00 +02:00
Antonio Murdaca
0edf5efa7a
server: move StopAllSandboxes in sandbox_stop.go
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:08:54 +02:00
Antonio Murdaca
e1f7f0c156
add a note on server shutdown...
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:08:46 +02:00
Antonio Murdaca
49f0857928
server: do not remove but stop sandboxes on shutdown
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:08:36 +02:00
Antonio Murdaca
f40bbce464
oci: do not serialize empty fields on disk
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:08:29 +02:00
Antonio Murdaca
c9f60011c3
server: still update status on container not found in runc
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:08:20 +02:00
Antonio Murdaca
cdb59528fc
server: ignore runc not exist errors
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:08:14 +02:00
Antonio Murdaca
ddb9e73d55
server: restore containers state from disk on startup
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:08:05 +02:00
Antonio Murdaca
d8d4861647
server: store containers state on disk
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:07:56 +02:00
Antonio Murdaca
06ec274d27
oci: ignore non existing containers on delete
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:07:50 +02:00
Antonio Murdaca
20d5a600a5
oci: save container's finished time
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:07:43 +02:00
Antonio Murdaca
c11254c0fd
server: store creation in containers
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:07:31 +02:00
Antonio Murdaca
00909c985f
oci: add container directory to Container struct
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:07:20 +02:00
Antonio Murdaca
9c9ef3bc7c
server: restore sandbox created time from disk
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:07:12 +02:00
Antonio Murdaca
4bdb2aa437
server: return sandbox's own created time
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:07:03 +02:00
Antonio Murdaca
f380f0b7eb
server: store sandbox creation time
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-26 15:06:55 +02:00
Antonio Murdaca
6395319aef
Upgrade k8s to v1.6.4
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-22 16:19:39 +02:00
Antonio Murdaca
d09f928fac
test: run gofmt
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 16:19:40 +02:00
Mrunal Patel
0594d6f940
Convert pod cgroupPath to runc format for systemd cgroup
...
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2017-05-18 15:49:37 +02:00
Mrunal Patel
35d9a0bf86
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-18 15:49:29 +02:00
Antonio Murdaca
d64b86bc10
vendor: upgrade containers/storage
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-18 15:48:49 +02:00
Antonio Murdaca
3fac039b4b
test: testdata: use redis:alpine
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-16 10:51:39 +02:00
Antonio Murdaca
f6489f4bc6
server: honor container stop timeout from CRI
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-16 10:44:18 +02:00
Mrunal Patel
3fa4d5eb75
Capture errors from runtime create failures
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-05-16 10:43:50 +02:00
Mrunal Patel
76d7b492b9
Fix remnants of ocid -> crio rename
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-05-16 10:43:24 +02:00
