From 33fe3287a3b78d82b53e4d02776ddcb4ce5cfd05 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 12 Mar 2018 10:01:44 -0400 Subject: Remove unused configs for testing CRI-O Signed-off-by: Matthew Heon Closes: #473 Approved by: rhatdan --- test/testdata/README.md | 15 ----- test/testdata/apparmor_test_deny_write | 10 ---- test/testdata/container_config.json | 70 ---------------------- test/testdata/container_config_by_imageid.json | 70 ---------------------- test/testdata/container_config_hostport.json | 72 ----------------------- test/testdata/container_config_logging.json | 72 ----------------------- test/testdata/container_config_resolvconf.json | 72 ----------------------- test/testdata/container_config_resolvconf_ro.json | 72 ----------------------- test/testdata/container_config_seccomp.json | 72 ----------------------- test/testdata/container_config_sleep.json | 71 ---------------------- test/testdata/container_exit_test.json | 22 ------- test/testdata/container_redis.json | 61 ------------------- test/testdata/container_redis_default_mounts.json | 67 --------------------- test/testdata/container_redis_device.json | 68 --------------------- test/testdata/fake_ocid_default | 1 - test/testdata/sandbox_config.json | 51 ---------------- test/testdata/sandbox_config_hostnet.json | 48 --------------- test/testdata/sandbox_config_hostport.json | 55 ----------------- test/testdata/sandbox_config_seccomp.json | 53 ----------------- test/testdata/sandbox_config_selinux.json | 48 --------------- test/testdata/template_container_config.json | 68 --------------------- test/testdata/template_sandbox_config.json | 51 ---------------- 22 files changed, 1189 deletions(-) delete mode 100644 test/testdata/README.md delete mode 100644 test/testdata/apparmor_test_deny_write delete mode 100644 test/testdata/container_config.json delete mode 100644 test/testdata/container_config_by_imageid.json delete mode 100644 test/testdata/container_config_hostport.json delete mode 100644 test/testdata/container_config_logging.json delete mode 100644 test/testdata/container_config_resolvconf.json delete mode 100644 test/testdata/container_config_resolvconf_ro.json delete mode 100644 test/testdata/container_config_seccomp.json delete mode 100644 test/testdata/container_config_sleep.json delete mode 100644 test/testdata/container_exit_test.json delete mode 100644 test/testdata/container_redis.json delete mode 100644 test/testdata/container_redis_default_mounts.json delete mode 100644 test/testdata/container_redis_device.json delete mode 100644 test/testdata/fake_ocid_default delete mode 100644 test/testdata/sandbox_config.json delete mode 100644 test/testdata/sandbox_config_hostnet.json delete mode 100644 test/testdata/sandbox_config_hostport.json delete mode 100644 test/testdata/sandbox_config_seccomp.json delete mode 100644 test/testdata/sandbox_config_selinux.json delete mode 100644 test/testdata/template_container_config.json delete mode 100644 test/testdata/template_sandbox_config.json 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 - -profile apparmor-test-deny-write flags=(attach_disconnected) { - #include - - 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" - } - } - } -} -- cgit v1.2.3-54-g00ecf