diff options
39 files changed, 16 insertions, 1206 deletions
diff --git a/.gitignore b/.gitignore index 82ba15869..cc7e7bd3e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ /conmon/conmon.o /docs/*.[158] /docs/*.[158].gz -/crio.conf *.o *.orig /pause/pause.o diff --git a/docs/podman-export.1.md b/docs/podman-export.1.md index ae6e6024c..142c45390 100644 --- a/docs/podman-export.1.md +++ b/docs/podman-export.1.md @@ -38,7 +38,7 @@ Write to a file, default is STDOUT ``` ## SEE ALSO -podman(1), podman-import(1), crio(8), crio.conf(5) +podman(1), podman-import(1), crio(8) ## HISTORY August 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com> diff --git a/docs/podman-history.1.md b/docs/podman-history.1.md index 0a07be699..cf234ffc4 100644 --- a/docs/podman-history.1.md +++ b/docs/podman-history.1.md @@ -100,7 +100,7 @@ b676ca55e4f2c 9 weeks ago Show the history of an image ## SEE ALSO -podman(1), crio(8), crio.conf(5) +podman(1), crio(8) ## HISTORY July 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com> diff --git a/docs/podman-import.1.md b/docs/podman-import.1.md index 8ace15f83..f311dc222 100644 --- a/docs/podman-import.1.md +++ b/docs/podman-import.1.md @@ -83,7 +83,7 @@ db65d991f3bbf7f31ed1064db9a6ced7652e3f8166c4736aa9133dadd3c7acb3 ``` ## SEE ALSO -podman(1), podman-export(1), crio(8), crio.conf(5) +podman(1), podman-export(1), crio(8) ## HISTORY November 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com> diff --git a/docs/podman-info.1.md b/docs/podman-info.1.md index 2f5a36c83..2806ee7af 100644 --- a/docs/podman-info.1.md +++ b/docs/podman-info.1.md @@ -95,4 +95,4 @@ map[registries:[docker.io registry.fedoraproject.org registry.access.redhat.com] ``` ## SEE ALSO -crio(8), crio.conf(5) +podman(1), crio(8) diff --git a/docs/podman-load.1.md b/docs/podman-load.1.md index 4b0cf4017..2ae82482e 100644 --- a/docs/podman-load.1.md +++ b/docs/podman-load.1.md @@ -72,7 +72,7 @@ Loaded image: registry.fedoraproject.org/fedora:latest ``` ## SEE ALSO -podman(1), podman-save(1), crio(8), crio.conf(5) +podman(1), podman-save(1), crio(8) ## HISTORY July 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com> diff --git a/docs/podman-login.1.md b/docs/podman-login.1.md index b22a02553..3942d3211 100644 --- a/docs/podman-login.1.md +++ b/docs/podman-login.1.md @@ -76,7 +76,7 @@ Login Succeeded! ``` ## SEE ALSO -podman(1), podman-logout(1), crio(8), crio.conf(5) +podman(1), podman-logout(1), crio(8) ## HISTORY August 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com> diff --git a/docs/podman-logout.1.md b/docs/podman-logout.1.md index 92abaa22e..353e19678 100644 --- a/docs/podman-logout.1.md +++ b/docs/podman-logout.1.md @@ -50,7 +50,7 @@ Remove login credentials for all registries ``` ## SEE ALSO -podman(1), podman-login(1), crio(8), crio.conf(5) +podman(1), podman-login(1), crio(8) ## HISTORY August 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com> diff --git a/docs/podman-ps.1.md b/docs/podman-ps.1.md index 90f16d9a9..dced70f38 100644 --- a/docs/podman-ps.1.md +++ b/docs/podman-ps.1.md @@ -125,7 +125,7 @@ a31ebbee9cee7 k8s_podsandbox1-redis_podsandbox1_redhat.test.crio_redhat-test-c Print a list of containers ## SEE ALSO -podman(1), crio(8), crio.conf(5) +podman(1), crio(8) ## HISTORY August 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com> diff --git a/docs/podman-pull.1.md b/docs/podman-pull.1.md index f7b24995a..6f46fdf86 100644 --- a/docs/podman-pull.1.md +++ b/docs/podman-pull.1.md @@ -138,7 +138,7 @@ Storing signatures ``` ## SEE ALSO -podman(1), podman-push(1), crio(8), crio.conf(5), docker-login(1) +podman(1), podman-push(1), podman-login(1), crio(8) ## HISTORY July 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com> diff --git a/docs/podman-push.1.md b/docs/podman-push.1.md index 964758da6..524b33d10 100644 --- a/docs/podman-push.1.md +++ b/docs/podman-push.1.md @@ -141,4 +141,4 @@ Storing signatures ``` ## SEE ALSO -podman(1), podman-pull(1), crio(8), crio.conf(5), docker-login(1) +podman(1), podman-pull(1), podman-login(1), crio(8) diff --git a/docs/podman-save.1.md b/docs/podman-save.1.md index 280073e74..6791d8ba3 100644 --- a/docs/podman-save.1.md +++ b/docs/podman-save.1.md @@ -91,7 +91,7 @@ Storing signatures ``` ## SEE ALSO -podman(1), podman-load(1), crio(8), crio.conf(5) +podman(1), podman-load(1), crio(8) ## HISTORY July 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com> diff --git a/docs/podman-search.1.md b/docs/podman-search.1.md index 668748d3f..1705ca6c2 100644 --- a/docs/podman-search.1.md +++ b/docs/podman-search.1.md @@ -109,7 +109,7 @@ fedoraproject.org fedoraproject.org/fedora-minimal ``` ## SEE ALSO -podman(1), crio(8), crio.conf(5) +podman(1), crio(8) ## HISTORY January 2018, Originally compiled by Urvashi Mohnani <umohnani@redhat.com> diff --git a/docs/podman-tag.1.md b/docs/podman-tag.1.md index 12afb4b91..2ac5e01af 100644 --- a/docs/podman-tag.1.md +++ b/docs/podman-tag.1.md @@ -22,7 +22,7 @@ the IMAGE and the TARGET_NAME. podman tag httpd myregistryhost:5000/fedora/httpd:v2 ## SEE ALSO -podman(1), crio(8), crio.conf(5) +podman(1), crio(8) ## HISTORY July 2017, Originally compiled by Ryan Cole <rycole@redhat.com> diff --git a/docs/podman-version.1.md b/docs/podman-version.1.md index 8978da630..2c9f2719a 100644 --- a/docs/podman-version.1.md +++ b/docs/podman-version.1.md @@ -18,7 +18,7 @@ OS, and Architecture. **podman version** ## SEE ALSO -podman(1), crio(8), crio.conf(5) +podman(1), crio(8) ## HISTORY July 2017, Originally compiled by Urvashi Mohnani <umohnani@redhat.com> diff --git a/docs/podman-wait.1.md b/docs/podman-wait.1.md index 31735b7b5..d69f2e774 100644 --- a/docs/podman-wait.1.md +++ b/docs/podman-wait.1.md @@ -36,7 +36,7 @@ to run containers such as CRI-O, the last started container could be from either podman wait mywebserver myftpserver ## SEE ALSO -podman(1), crio(8), crio.conf(5) +podman(1), crio(8) ## HISTORY September 2017, Originally compiled by Brent Baude<bbaude@redhat.com> diff --git a/docs/podman.1.md b/docs/podman.1.md index 84f9a855a..60ad16f37 100644 --- a/docs/podman.1.md +++ b/docs/podman.1.md @@ -94,7 +94,7 @@ has the capability to debug pods/images created by crio. | [podman-wait(1)](podman-wait.1.md) | Wait on one or more containers to stop and print their exit codes. | ## SEE ALSO -crio(8), crio.conf(5) +crio(8) ## HISTORY Dec 2016, Originally compiled by Dan Walsh <dwalsh@redhat.com> diff --git a/test/testdata/README.md b/test/testdata/README.md deleted file mode 100644 index afc6b32f0..000000000 --- a/test/testdata/README.md +++ /dev/null @@ -1,15 +0,0 @@ -In terminal 1: -``` -sudo ./crio -``` - -In terminal 2: -``` -sudo ./crioctl runtimeversion - -sudo rm -rf /var/lib/containers/storage/sandboxes/podsandbox1 -sudo ./crioctl pod run --config testdata/sandbox_config.json - -sudo rm -rf /var/lib/containers/storage/containers/container1 -sudo ./crioctl container create --pod podsandbox1 --config testdata/container_config.json -``` diff --git a/test/testdata/apparmor_test_deny_write b/test/testdata/apparmor_test_deny_write deleted file mode 100644 index 55311aaf5..000000000 --- a/test/testdata/apparmor_test_deny_write +++ /dev/null @@ -1,10 +0,0 @@ -#include <tunables/global> - -profile apparmor-test-deny-write flags=(attach_disconnected) { - #include <abstractions/base> - - file, - - # Deny all file writes. - deny /** w, -} diff --git a/test/testdata/container_config.json b/test/testdata/container_config.json deleted file mode 100644 index d8ef76a56..000000000 --- a/test/testdata/container_config.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "metadata": { - "name": "container1", - "attempt": 1 - }, - "image": { - "image": "redis:alpine" - }, - "command": [ - "/bin/ls" - ], - "args": [], - "working_dir": "/", - "envs": [ - { - "key": "PATH", - "value": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - }, - { - "key": "TERM", - "value": "xterm" - }, - { - "key": "TESTDIR", - "value": "test/dir1" - }, - { - "key": "TESTFILE", - "value": "test/file1" - } - ], - "labels": { - "type": "small", - "batch": "no" - }, - "annotations": { - "owner": "dragon", - "daemon": "crio" - }, - "privileged": true, - "log_path": "", - "stdin": false, - "stdin_once": false, - "tty": false, - "linux": { - "resources": { - "cpu_period": 10000, - "cpu_quota": 20000, - "cpu_shares": 512, - "oom_score_adj": 30 - }, - "security_context": { - "readonly_rootfs": false, - "selinux_options": { - "user": "system_u", - "role": "system_r", - "type": "svirt_lxc_net_t", - "level": "s0:c4,c5" - }, - "capabilities": { - "add_capabilities": [ - "setuid", - "setgid" - ], - "drop_capabilities": [ - ] - } - } - } -} diff --git a/test/testdata/container_config_by_imageid.json b/test/testdata/container_config_by_imageid.json deleted file mode 100644 index d953efb3c..000000000 --- a/test/testdata/container_config_by_imageid.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "metadata": { - "name": "container1", - "attempt": 1 - }, - "image": { - "image": "%VALUE%" - }, - "command": [ - "/bin/ls" - ], - "args": [], - "working_dir": "/", - "envs": [ - { - "key": "PATH", - "value": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - }, - { - "key": "TERM", - "value": "xterm" - }, - { - "key": "TESTDIR", - "value": "test/dir1" - }, - { - "key": "TESTFILE", - "value": "test/file1" - } - ], - "labels": { - "type": "small", - "batch": "no" - }, - "annotations": { - "owner": "dragon", - "daemon": "crio" - }, - "privileged": true, - "readonly_rootfs": true, - "log_path": "", - "stdin": false, - "stdin_once": false, - "tty": false, - "linux": { - "resources": { - "cpu_period": 10000, - "cpu_quota": 20000, - "cpu_shares": 512, - "oom_score_adj": 30 - }, - "security_context": { - "capabilities": { - "add_capabilities": [ - "setuid", - "setgid" - ], - "drop_capabilities": [ - ] - }, - "selinux_options": { - "user": "system_u", - "role": "system_r", - "type": "svirt_lxc_net_t", - "level": "s0:c4,c5" - } - } - } -} diff --git a/test/testdata/container_config_hostport.json b/test/testdata/container_config_hostport.json deleted file mode 100644 index e5a0ca67a..000000000 --- a/test/testdata/container_config_hostport.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "metadata": { - "name": "container1", - "attempt": 1 - }, - "image": { - "image": "busybox:latest" - }, - "command": [ - "/bin/nc", "-ll", "-p", "80", "-e" - ], - "args": [ - "/bin/hostname" - ], - "working_dir": "/", - "envs": [ - { - "key": "PATH", - "value": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - }, - { - "key": "TERM", - "value": "xterm" - }, - { - "key": "TESTDIR", - "value": "test/dir1" - }, - { - "key": "TESTFILE", - "value": "test/file1" - } - ], - "labels": { - "type": "small", - "batch": "no" - }, - "annotations": { - "owner": "dragon", - "daemon": "crio" - }, - "privileged": true, - "readonly_rootfs": true, - "log_path": "", - "stdin": false, - "stdin_once": false, - "tty": false, - "linux": { - "resources": { - "cpu_period": 10000, - "cpu_quota": 20000, - "cpu_shares": 512, - "oom_score_adj": 30 - }, - "security_context": { - "capabilities": { - "add_capabilities": [ - "setuid", - "setgid" - ], - "drop_capabilities": [ - ] - }, - "selinux_options": { - "user": "system_u", - "role": "system_r", - "type": "svirt_lxc_net_t", - "level": "s0:c4,c5" - } - } - } -} diff --git a/test/testdata/container_config_logging.json b/test/testdata/container_config_logging.json deleted file mode 100644 index 8e8d0da44..000000000 --- a/test/testdata/container_config_logging.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "metadata": { - "name": "container1", - "attempt": 1 - }, - "image": { - "image": "busybox:latest" - }, - "command": [ - "/bin/sh", "-c" - ], - "args": [ - "%shellcommand%" - ], - "working_dir": "/", - "envs": [ - { - "key": "PATH", - "value": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - }, - { - "key": "TERM", - "value": "xterm" - }, - { - "key": "TESTDIR", - "value": "test/dir1" - }, - { - "key": "TESTFILE", - "value": "test/file1" - } - ], - "labels": { - "type": "small", - "batch": "no" - }, - "annotations": { - "owner": "dragon", - "daemon": "crio" - }, - "privileged": true, - "readonly_rootfs": true, - "log_path": "", - "stdin": false, - "stdin_once": false, - "tty": false, - "linux": { - "resources": { - "cpu_period": 10000, - "cpu_quota": 20000, - "cpu_shares": 512, - "oom_score_adj": 30 - }, - "security_context": { - "capabilities": { - "add_capabilities": [ - "setuid", - "setgid" - ], - "drop_capabilities": [ - ] - }, - "selinux_options": { - "user": "system_u", - "role": "system_r", - "type": "svirt_lxc_net_t", - "level": "s0:c4,c5" - } - } - } -} diff --git a/test/testdata/container_config_resolvconf.json b/test/testdata/container_config_resolvconf.json deleted file mode 100644 index 52b77e082..000000000 --- a/test/testdata/container_config_resolvconf.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "metadata": { - "name": "container1", - "attempt": 1 - }, - "image": { - "image": "redis:alpine" - }, - "command": [ - "sh", - "-c", - "echo test >> /etc/resolv.conf" - ], - "args": [], - "working_dir": "/", - "envs": [ - { - "key": "PATH", - "value": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - }, - { - "key": "TERM", - "value": "xterm" - }, - { - "key": "TESTDIR", - "value": "test/dir1" - }, - { - "key": "TESTFILE", - "value": "test/file1" - } - ], - "labels": { - "type": "small", - "batch": "no" - }, - "annotations": { - "owner": "dragon", - "daemon": "crio" - }, - "privileged": true, - "log_path": "", - "stdin": false, - "stdin_once": false, - "tty": false, - "linux": { - "resources": { - "cpu_period": 10000, - "cpu_quota": 20000, - "cpu_shares": 512, - "oom_score_adj": 30 - }, - "security_context": { - "readonly_rootfs": false, - "capabilities": { - "add_capabilities": [ - "setuid", - "setgid" - ], - "drop_capabilities": [ - ] - }, - "selinux_options": { - "user": "system_u", - "role": "system_r", - "type": "svirt_lxc_net_t", - "level": "s0:c4,c5" - } - } - } -} diff --git a/test/testdata/container_config_resolvconf_ro.json b/test/testdata/container_config_resolvconf_ro.json deleted file mode 100644 index 7e121c079..000000000 --- a/test/testdata/container_config_resolvconf_ro.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "metadata": { - "name": "container1", - "attempt": 1 - }, - "image": { - "image": "redis:alpine" - }, - "command": [ - "sh", - "-c", - "echo test >> /etc/resolv.conf" - ], - "args": [], - "working_dir": "/", - "envs": [ - { - "key": "PATH", - "value": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - }, - { - "key": "TERM", - "value": "xterm" - }, - { - "key": "TESTDIR", - "value": "test/dir1" - }, - { - "key": "TESTFILE", - "value": "test/file1" - } - ], - "labels": { - "type": "small", - "batch": "no" - }, - "annotations": { - "owner": "dragon", - "daemon": "crio" - }, - "privileged": true, - "log_path": "", - "stdin": false, - "stdin_once": false, - "tty": false, - "linux": { - "resources": { - "cpu_period": 10000, - "cpu_quota": 20000, - "cpu_shares": 512, - "oom_score_adj": 30 - }, - "security_context": { - "readonly_rootfs": true, - "capabilities": { - "add_capabilities": [ - "setuid", - "setgid" - ], - "drop_capabilities": [ - ] - }, - "selinux_options": { - "user": "system_u", - "role": "system_r", - "type": "svirt_lxc_net_t", - "level": "s0:c4,c5" - } - } - } -} diff --git a/test/testdata/container_config_seccomp.json b/test/testdata/container_config_seccomp.json deleted file mode 100644 index 582132b0e..000000000 --- a/test/testdata/container_config_seccomp.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "metadata": { - "name": "container1", - "attempt": 1 - }, - "image": { - "image": "redis:alpine" - }, - "command": [ - "/bin/bash" - ], - "args": [ - "/bin/chmod", "777", "." - ], - "working_dir": "/", - "envs": [ - { - "key": "PATH", - "value": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - }, - { - "key": "TERM", - "value": "xterm" - }, - { - "key": "TESTDIR", - "value": "test/dir1" - }, - { - "key": "TESTFILE", - "value": "test/file1" - } - ], - "labels": { - "type": "small", - "batch": "no" - }, - "annotations": { - "owner": "dragon", - "daemon": "crio" - }, - "privileged": true, - "readonly_rootfs": true, - "log_path": "", - "stdin": false, - "stdin_once": false, - "tty": false, - "linux": { - "resources": { - "cpu_period": 10000, - "cpu_quota": 20000, - "cpu_shares": 512, - "oom_score_adj": 30 - }, - "security_context": { - "capabilities": { - "add_capabilities": [ - "setuid", - "setgid" - ], - "drop_capabilities": [ - ] - }, - "selinux_options": { - "user": "system_u", - "role": "system_r", - "type": "svirt_lxc_net_t", - "level": "s0:c4,c5" - } - } - } -} diff --git a/test/testdata/container_config_sleep.json b/test/testdata/container_config_sleep.json deleted file mode 100644 index c86ff7011..000000000 --- a/test/testdata/container_config_sleep.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "metadata": { - "name": "container999", - "attempt": 1 - }, - "image": { - "image": "docker.io/library/busybox:latest" - }, - "command": [ - "sleep", - "9999" - ], - "args": [], - "working_dir": "/", - "envs": [ - { - "key": "PATH", - "value": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - }, - { - "key": "TERM", - "value": "xterm" - }, - { - "key": "TESTDIR", - "value": "test/dir1" - }, - { - "key": "TESTFILE", - "value": "test/file1" - } - ], - "labels": { - "type": "small", - "batch": "no" - }, - "annotations": { - "owner": "dragon", - "daemon": "crio" - }, - "privileged": true, - "log_path": "", - "stdin": false, - "stdin_once": false, - "tty": false, - "linux": { - "resources": { - "cpu_period": 10000, - "cpu_quota": 20000, - "cpu_shares": 512, - "oom_score_adj": 30 - }, - "security_context": { - "readonly_rootfs": false, - "selinux_options": { - "user": "system_u", - "role": "system_r", - "type": "svirt_lxc_net_t", - "level": "s0:c4,c5" - }, - "capabilities": { - "add_capabilities": [ - "setuid", - "setgid" - ], - "drop_capabilities": [ - ] - } - } - } -} diff --git a/test/testdata/container_exit_test.json b/test/testdata/container_exit_test.json deleted file mode 100644 index 6ead905a6..000000000 --- a/test/testdata/container_exit_test.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "metadata": { - "name": "podsandbox1-exit-test" - }, - "image": { - "image": "docker://mrunalp/exit_test:latest" - }, - "args": [ - "/exit_test" - ], - "envs": [ - { - "key": "PATH", - "value": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - } - ], - "readonly_rootfs": true, - "log_path": "", - "stdin": false, - "stdin_once": false, - "tty": false -} diff --git a/test/testdata/container_redis.json b/test/testdata/container_redis.json deleted file mode 100644 index 638aba4fc..000000000 --- a/test/testdata/container_redis.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "metadata": { - "name": "podsandbox1-redis" - }, - "image": { - "image": "redis:alpine" - }, - "args": [ - "docker-entrypoint.sh", - "redis-server" - ], - "working_dir": "/data", - "envs": [ - { - "key": "PATH", - "value": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - }, - { - "key": "TERM", - "value": "xterm" - }, - { - "key": "REDIS_VERSION", - "value": "3.2.3" - }, - { - "key": "REDIS_DOWNLOAD_URL", - "value": "http://download.redis.io/releases/redis-3.2.3.tar.gz" - }, - { - "key": "REDIS_DOWNLOAD_SHA1", - "value": "92d6d93ef2efc91e595c8bf578bf72baff397507" - } - ], - "labels": { - "tier": "backend" - }, - "annotations": { - "pod": "podsandbox1" - }, - "readonly_rootfs": false, - "log_path": "", - "stdin": false, - "stdin_once": false, - "tty": false, - "linux": { - "resources": { - "cpu_period": 10000, - "cpu_quota": 20000, - "cpu_shares": 512, - "oom_score_adj": 30 - }, - "security_context": { - "capabilities": { - "add_capabilities": [ - "sys_admin" - ] - } - } - } -} diff --git a/test/testdata/container_redis_default_mounts.json b/test/testdata/container_redis_default_mounts.json deleted file mode 100644 index dff3db5a7..000000000 --- a/test/testdata/container_redis_default_mounts.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "metadata": { - "name": "podsandbox1-redis" - }, - "image": { - "image": "redis:alpine" - }, - "args": [ - "docker-entrypoint.sh", - "redis-server" - ], - "mounts": [ - { - "container_path": "%CPATH%", - "host_path": "%HPATH%" - } - ], - "working_dir": "/data", - "envs": [ - { - "key": "PATH", - "value": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - }, - { - "key": "TERM", - "value": "xterm" - }, - { - "key": "REDIS_VERSION", - "value": "3.2.3" - }, - { - "key": "REDIS_DOWNLOAD_URL", - "value": "http://download.redis.io/releases/redis-3.2.3.tar.gz" - }, - { - "key": "REDIS_DOWNLOAD_SHA1", - "value": "92d6d93ef2efc91e595c8bf578bf72baff397507" - } - ], - "labels": { - "tier": "backend" - }, - "annotations": { - "pod": "podsandbox1" - }, - "readonly_rootfs": false, - "log_path": "", - "stdin": false, - "stdin_once": false, - "tty": false, - "linux": { - "resources": { - "cpu_period": 10000, - "cpu_quota": 20000, - "cpu_shares": 512, - "oom_score_adj": 30 - }, - "security_context": { - "capabilities": { - "add_capabilities": [ - "sys_admin" - ] - } - } - } -} diff --git a/test/testdata/container_redis_device.json b/test/testdata/container_redis_device.json deleted file mode 100644 index 2a2495515..000000000 --- a/test/testdata/container_redis_device.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "metadata": { - "name": "podsandbox1-redis" - }, - "image": { - "image": "redis:alpine" - }, - "args": [ - "docker-entrypoint.sh", - "redis-server" - ], - "working_dir": "/data", - "envs": [ - { - "key": "PATH", - "value": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - }, - { - "key": "TERM", - "value": "xterm" - }, - { - "key": "REDIS_VERSION", - "value": "3.2.3" - }, - { - "key": "REDIS_DOWNLOAD_URL", - "value": "http://download.redis.io/releases/redis-3.2.3.tar.gz" - }, - { - "key": "REDIS_DOWNLOAD_SHA1", - "value": "92d6d93ef2efc91e595c8bf578bf72baff397507" - } - ], - "devices": [ - { - "host_path": "/dev/null", - "container_path": "/dev/mynull", - "permissions": "rwm" - } - ], - "labels": { - "tier": "backend" - }, - "annotations": { - "pod": "podsandbox1" - }, - "readonly_rootfs": false, - "log_path": "", - "stdin": false, - "stdin_once": false, - "tty": false, - "linux": { - "resources": { - "cpu_period": 10000, - "cpu_quota": 20000, - "cpu_shares": 512, - "oom_score_adj": 30 - }, - "security_context": { - "capabilities": { - "add_capabilities": [ - "sys_admin" - ] - } - } - } -} diff --git a/test/testdata/fake_ocid_default b/test/testdata/fake_ocid_default deleted file mode 100644 index 915fb17dd..000000000 --- a/test/testdata/fake_ocid_default +++ /dev/null @@ -1 +0,0 @@ -profile crio-default flags=(attach_disconnected) {} diff --git a/test/testdata/sandbox_config.json b/test/testdata/sandbox_config.json deleted file mode 100644 index 57e211bd6..000000000 --- a/test/testdata/sandbox_config.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "metadata": { - "name": "podsandbox1", - "uid": "redhat-test-crio", - "namespace": "redhat.test.crio", - "attempt": 1 - }, - "hostname": "crioctl_host", - "log_directory": "", - "dns_config": { - "searches": [ - "8.8.8.8" - ] - }, - "port_mappings": [], - "resources": { - "cpu": { - "limits": 3, - "requests": 2 - }, - "memory": { - "limits": 50000000, - "requests": 2000000 - } - }, - "labels": { - "group": "test" - }, - "annotations": { - "owner": "hmeng", - "security.alpha.kubernetes.io/sysctls": "kernel.shm_rmid_forced=1,net.ipv4.ip_local_port_range=1024 65000", - "security.alpha.kubernetes.io/unsafe-sysctls": "kernel.msgmax=8192" , - "security.alpha.kubernetes.io/seccomp/pod": "unconfined" - }, - "linux": { - "cgroup_parent": "/Burstable/pod_123-456", - "security_context": { - "namespace_options": { - "host_network": false, - "host_pid": false, - "host_ipc": false - }, - "selinux_options": { - "user": "system_u", - "role": "system_r", - "type": "svirt_lxc_net_t", - "level": "s0:c4,c5" - } - } - } -} diff --git a/test/testdata/sandbox_config_hostnet.json b/test/testdata/sandbox_config_hostnet.json deleted file mode 100644 index 99a7560dc..000000000 --- a/test/testdata/sandbox_config_hostnet.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "metadata": { - "name": "podsandbox1", - "uid": "redhat-test-crio", - "namespace": "redhat.test.crio", - "attempt": 1 - }, - "hostname": "crioctl_host", - "log_directory": "", - "dns_options": { - "servers": [ - "server1.redhat.com", - "server2.redhat.com" - ], - "searches": [ - "8.8.8.8" - ] - }, - "port_mappings": [], - "resources": { - "cpu": { - "limits": 3, - "requests": 2 - }, - "memory": { - "limits": 50000000, - "requests": 2000000 - } - }, - "labels": { - "group": "test" - }, - "annotations": { - "owner": "hmeng", - "security.alpha.kubernetes.io/unsafe-sysctls": "kernel.msgmax=8192" , - "security.alpha.kubernetes.io/seccomp/pod": "unconfined" - }, - "linux": { - "cgroup_parent": "/Burstable/pod_123-456", - "security_context": { - "namespace_options": { - "host_network": true, - "host_pid": false, - "host_ipc": false - } - } - } -} diff --git a/test/testdata/sandbox_config_hostport.json b/test/testdata/sandbox_config_hostport.json deleted file mode 100644 index 5feda8668..000000000 --- a/test/testdata/sandbox_config_hostport.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "metadata": { - "name": "podsandbox1", - "uid": "redhat-test-crio", - "namespace": "redhat.test.crio", - "attempt": 1 - }, - "hostname": "crioctl_host", - "log_directory": "", - "dns_options": { - "servers": [ - "server1.redhat.com", - "server2.redhat.com" - ], - "searches": [ - "8.8.8.8" - ] - }, - "port_mappings": [ - { - "protocol": 0, - "container_port": 80, - "host_port": 4888 - } - ], - "resources": { - "cpu": { - "limits": 3, - "requests": 2 - }, - "memory": { - "limits": 50000000, - "requests": 2000000 - } - }, - "labels": { - "group": "test" - }, - "annotations": { - "owner": "hmeng", - "security.alpha.kubernetes.io/sysctls": "kernel.shm_rmid_forced=1,net.ipv4.ip_local_port_range=1024 65000", - "security.alpha.kubernetes.io/unsafe-sysctls": "kernel.msgmax=8192" , - "security.alpha.kubernetes.io/seccomp/pod": "unconfined" - }, - "linux": { - "cgroup_parent": "/Burstable/pod_123-456", - "security_context": { - "namespace_options": { - "host_network": false, - "host_pid": false, - "host_ipc": false - } - } - } -} diff --git a/test/testdata/sandbox_config_seccomp.json b/test/testdata/sandbox_config_seccomp.json deleted file mode 100644 index 8e440b164..000000000 --- a/test/testdata/sandbox_config_seccomp.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "metadata": { - "name": "podsandbox1", - "uid": "redhat-test-crio", - "namespace": "redhat.test.crio", - "attempt": 1 - }, - "hostname": "crioctl_host", - "log_directory": "", - "dns_options": { - "servers": [ - "server1.redhat.com", - "server2.redhat.com" - ], - "searches": [ - "8.8.8.8" - ] - }, - "port_mappings": [], - "resources": { - "cpu": { - "limits": 3, - "requests": 2 - }, - "memory": { - "limits": 50000000, - "requests": 2000000 - } - }, - "labels": { - "group": "test" - }, - "annotations": { - "owner": "hmeng" - %VALUE% - }, - "linux": { - "cgroup_parent": "/Burstable/pod_123-456", - "security_context": { - "namespace_options": { - "host_network": false, - "host_pid": false, - "host_ipc": false - }, - "selinux_options": { - "user": "system_u", - "role": "system_r", - "type": "svirt_lxc_net_t", - "level": "s0:c4,c5" - } - } - } -} diff --git a/test/testdata/sandbox_config_selinux.json b/test/testdata/sandbox_config_selinux.json deleted file mode 100644 index 916a10ecd..000000000 --- a/test/testdata/sandbox_config_selinux.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "metadata": { - "name": "podsandbox1", - "uid": "redhat-test-crio", - "namespace": "redhat.test.crio", - "attempt": 1 - }, - "hostname": "crioctl_host", - "log_directory": "", - "dns_config": { - "searches": [ - "8.8.8.8" - ] - }, - "port_mappings": [], - "resources": { - "cpu": { - "limits": 3, - "requests": 2 - }, - "memory": { - "limits": 50000000, - "requests": 2000000 - } - }, - "labels": { - "group": "test" - }, - "annotations": { - "owner": "hmeng", - "security.alpha.kubernetes.io/sysctls": "kernel.shm_rmid_forced=1,net.ipv4.ip_local_port_range=1024 65000", - "security.alpha.kubernetes.io/unsafe-sysctls": "kernel.msgmax=8192" , - "security.alpha.kubernetes.io/seccomp/pod": "unconfined" - }, - "linux": { - "cgroup_parent": "/Burstable/pod_123-456", - "security_context": { - "namespace_options": { - "host_network": false, - "host_pid": false, - "host_ipc": false - }, - "selinux_options": { - "level": "s0" - } - } - } -} diff --git a/test/testdata/template_container_config.json b/test/testdata/template_container_config.json deleted file mode 100644 index a770a7c9d..000000000 --- a/test/testdata/template_container_config.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "metadata": { - "name": "${NAME}", - "attempt": 1 - }, - "image": { - "image": "${IMAGE}" - }, - "command": ${COMMAND}, - "args": [], - "working_dir": "/", - "envs": [ - { - "key": "PATH", - "value": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" - }, - { - "key": "TERM", - "value": "xterm" - }, - { - "key": "TESTDIR", - "value": "test/dir1" - }, - { - "key": "TESTFILE", - "value": "test/file1" - } - ], - "labels": { - "type": "small", - "batch": "no" - }, - "annotations": { - "owner": "dragon", - "daemon": "crio" - }, - "privileged": true, - "log_path": "", - "stdin": false, - "stdin_once": false, - "tty": false, - "linux": { - "resources": { - "cpu_period": 10000, - "cpu_quota": 20000, - "cpu_shares": 512, - "oom_score_adj": 30 - }, - "security_context": { - "readonly_rootfs": false, - "selinux_options": { - "user": "system_u", - "role": "system_r", - "type": "svirt_lxc_net_t", - "level": "s0:c4,c5" - }, - "capabilities": { - "add_capabilities": [ - "setuid", - "setgid" - ], - "drop_capabilities": [ - ] - } - } - } -} diff --git a/test/testdata/template_sandbox_config.json b/test/testdata/template_sandbox_config.json deleted file mode 100644 index f43ffb0d6..000000000 --- a/test/testdata/template_sandbox_config.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "metadata": { - "name": "${NAME}", - "uid": "${CUID}", - "namespace": "${NAMESPACE}", - "attempt": 1 - }, - "hostname": "crioctl_host", - "log_directory": "", - "dns_config": { - "searches": [ - "8.8.8.8" - ] - }, - "port_mappings": [], - "resources": { - "cpu": { - "limits": 3, - "requests": 2 - }, - "memory": { - "limits": 50000000, - "requests": 2000000 - } - }, - "labels": { - "group": "test" - }, - "annotations": { - "owner": "hmeng", - "security.alpha.kubernetes.io/sysctls": "kernel.shm_rmid_forced=1,net.ipv4.ip_local_port_range=1024 65000", - "security.alpha.kubernetes.io/unsafe-sysctls": "kernel.msgmax=8192" , - "security.alpha.kubernetes.io/seccomp/pod": "unconfined" - }, - "linux": { - "cgroup_parent": "/Burstable/pod_123-456", - "security_context": { - "namespace_options": { - "host_network": false, - "host_pid": false, - "host_ipc": false - }, - "selinux_options": { - "user": "system_u", - "role": "system_r", - "type": "svirt_lxc_net_t", - "level": "s0:c4,c5" - } - } - } -} |