Skip to content

K
k3s
Commit fa40ced8 authored by Mike Danese's avatar Mike Danese
Browse files
Options

move contrib/for-tests to test/images

parent a9580a0a
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 13 deletions
hack/lib/golang.sh
View file @ fa40ced8
...@@ -83,8 +83,8 @@ readonly KUBE_TEST_TARGETS=($(kube::golang::test_targets)) ...@@ -83,8 +83,8 @@ readonly KUBE_TEST_TARGETS=($(kube::golang::test_targets))
readonly KUBE_TEST_BINARIES=("${KUBE_TEST_TARGETS[@]##*/}") readonly KUBE_TEST_BINARIES=("${KUBE_TEST_TARGETS[@]##*/}")
readonly KUBE_TEST_BINARIES_WIN=("${KUBE_TEST_BINARIES[@]/%/.exe}") readonly KUBE_TEST_BINARIES_WIN=("${KUBE_TEST_BINARIES[@]/%/.exe}")
readonly KUBE_TEST_PORTABLE=( readonly KUBE_TEST_PORTABLE=(
contrib/for-tests/network-tester/rc.json test/images/network-tester/rc.json
contrib/for-tests/network-tester/service.json test/images/network-tester/service.json
hack/e2e.go hack/e2e.go
hack/e2e-internal hack/e2e-internal
hack/ginkgo-e2e.sh hack/ginkgo-e2e.sh
......
hack/verify-flags/exceptions.txt
View file @ fa40ced8
...@@ -11,6 +11,14 @@ pkg/util/oom/oom_linux.go: err = fmt.Errorf("failed to read oom_score_adj: %v" ...@@ -11,6 +11,14 @@ pkg/util/oom/oom_linux.go: err = fmt.Errorf("failed to read oom_score_adj: %v"
pkg/util/oom/oom_linux.go: err = fmt.Errorf("failed to set oom_score_adj to %d: %v", oomScoreAdj, writeErr) pkg/util/oom/oom_linux.go: err = fmt.Errorf("failed to set oom_score_adj to %d: %v", oomScoreAdj, writeErr)
pkg/util/oom/oom_linux.go:// Writes 'value' to /proc/<pid>/oom_score_adj for all processes in cgroup cgroupName. pkg/util/oom/oom_linux.go:// Writes 'value' to /proc/<pid>/oom_score_adj for all processes in cgroup cgroupName.
pkg/cloudprovider/providers/vagrant/vagrant_test.go: testSaltMinionsResponse = []byte(`{ "return": [{"kubernetes-minion-1": {"kernel": "Linux", "domain": "", "zmqversion": "3.2.4", "kernelrelease": "3.11.10-301.fc20.x86_64", "pythonpath": ["/usr/bin", "/usr/lib64/python27.zip", "/usr/lib64/python2.7", "/usr/lib64/python2.7/plat-linux2", "/usr/lib64/python2.7/lib-tk", "/usr/lib64/python2.7/lib-old", "/usr/lib64/python2.7/lib-dynload", "/usr/lib64/python2.7/site-packages", "/usr/lib/python2.7/site-packages"], "etcd_servers": "10.245.1.2", "ip_interfaces": {"lo": ["127.0.0.1"], "docker0": ["172.17.42.1"], "enp0s8": ["10.245.2.2"], "p2p1": ["10.0.2.15"]}, "shell": "/bin/sh", "mem_total": 491, "saltversioninfo": [2014, 1, 7], "osmajorrelease": ["20"], "node_ip": "10.245.2.2", "id": "kubernetes-minion-1", "osrelease": "20", "ps": "ps -efH", "server_id": 1005530826, "num_cpus": 1, "hwaddr_interfaces": {"lo": "00:00:00:00:00:00", "docker0": "56:84:7a:fe:97:99", "enp0s8": "08:00:27:17:c5:0f", "p2p1": "08:00:27:96:96:e1"}, "virtual": "VirtualBox", "osfullname": "Fedora", "master": "kubernetes-master", "ipv4": ["10.0.2.15", "10.245.2.2", "127.0.0.1", "172.17.42.1"], "ipv6": ["::1", "fe80::a00:27ff:fe17:c50f", "fe80::a00:27ff:fe96:96e1"], "cpu_flags": ["fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic", "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "clflush", "mmx", "fxsr", "sse", "sse2", "syscall", "nx", "rdtscp", "lm", "constant_tsc", "rep_good", "nopl", "pni", "monitor", "ssse3", "lahf_lm"], "localhost": "kubernetes-minion-1", "lsb_distrib_id": "Fedora", "fqdn_ip4": ["127.0.0.1"], "fqdn_ip6": [], "nodename": "kubernetes-minion-1", "saltversion": "2014.1.7", "saltpath": "/usr/lib/python2.7/site-packages/salt", "pythonversion": [2, 7, 5, "final", 0], "host": "kubernetes-minion-1", "os_family": "RedHat", "oscodename": "Heisenbug", "defaultencoding": "UTF-8", "osfinger": "Fedora-20", "roles": ["kubernetes-pool"], "num_gpus": 1, "cpu_model": "Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz", "fqdn": "kubernetes-minion-1", "osarch": "x86_64", "cpuarch": "x86_64", "gpus": [{"model": "VirtualBox Graphics Adapter", "vendor": "unknown"}], "path": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", "os": "Fedora", "defaultlanguage": "en_US"}}]}`) pkg/cloudprovider/providers/vagrant/vagrant_test.go: testSaltMinionsResponse = []byte(`{ "return": [{"kubernetes-minion-1": {"kernel": "Linux", "domain": "", "zmqversion": "3.2.4", "kernelrelease": "3.11.10-301.fc20.x86_64", "pythonpath": ["/usr/bin", "/usr/lib64/python27.zip", "/usr/lib64/python2.7", "/usr/lib64/python2.7/plat-linux2", "/usr/lib64/python2.7/lib-tk", "/usr/lib64/python2.7/lib-old", "/usr/lib64/python2.7/lib-dynload", "/usr/lib64/python2.7/site-packages", "/usr/lib/python2.7/site-packages"], "etcd_servers": "10.245.1.2", "ip_interfaces": {"lo": ["127.0.0.1"], "docker0": ["172.17.42.1"], "enp0s8": ["10.245.2.2"], "p2p1": ["10.0.2.15"]}, "shell": "/bin/sh", "mem_total": 491, "saltversioninfo": [2014, 1, 7], "osmajorrelease": ["20"], "node_ip": "10.245.2.2", "id": "kubernetes-minion-1", "osrelease": "20", "ps": "ps -efH", "server_id": 1005530826, "num_cpus": 1, "hwaddr_interfaces": {"lo": "00:00:00:00:00:00", "docker0": "56:84:7a:fe:97:99", "enp0s8": "08:00:27:17:c5:0f", "p2p1": "08:00:27:96:96:e1"}, "virtual": "VirtualBox", "osfullname": "Fedora", "master": "kubernetes-master", "ipv4": ["10.0.2.15", "10.245.2.2", "127.0.0.1", "172.17.42.1"], "ipv6": ["::1", "fe80::a00:27ff:fe17:c50f", "fe80::a00:27ff:fe96:96e1"], "cpu_flags": ["fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic", "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "clflush", "mmx", "fxsr", "sse", "sse2", "syscall", "nx", "rdtscp", "lm", "constant_tsc", "rep_good", "nopl", "pni", "monitor", "ssse3", "lahf_lm"], "localhost": "kubernetes-minion-1", "lsb_distrib_id": "Fedora", "fqdn_ip4": ["127.0.0.1"], "fqdn_ip6": [], "nodename": "kubernetes-minion-1", "saltversion": "2014.1.7", "saltpath": "/usr/lib/python2.7/site-packages/salt", "pythonversion": [2, 7, 5, "final", 0], "host": "kubernetes-minion-1", "os_family": "RedHat", "oscodename": "Heisenbug", "defaultencoding": "UTF-8", "osfinger": "Fedora-20", "roles": ["kubernetes-pool"], "num_gpus": 1, "cpu_model": "Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz", "fqdn": "kubernetes-minion-1", "osarch": "x86_64", "cpuarch": "x86_64", "gpus": [{"model": "VirtualBox Graphics Adapter", "vendor": "unknown"}], "path": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", "os": "Fedora", "defaultlanguage": "en_US"}}]}`)
test/images/mount-tester/mt.go: flag.StringVar(&fsTypePath, "fs_type", "", "Path to print the fs type for")
test/images/mount-tester/mt.go: flag.StringVar(&fileModePath, "file_mode", "", "Path to print the mode bits of")
test/images/mount-tester/mt.go: flag.StringVar(&filePermPath, "file_perm", "", "Path to print the perms of")
test/images/mount-tester/mt.go: flag.StringVar(&readFileContentPath, "file_content", "", "Path to read the file content from")
test/images/mount-tester/mt.go: flag.StringVar(&newFilePath0644, "new_file_0644", "", "Path to write to and read from with perm 0644")
test/images/mount-tester/mt.go: flag.StringVar(&newFilePath0666, "new_file_0666", "", "Path to write to and read from with perm 0666")
test/images/mount-tester/mt.go: flag.StringVar(&newFilePath0777, "new_file_0777", "", "Path to write to and read from with perm 0777")
contrib/mesos/pkg/controllermanager/controllermanager.go: fs.BoolVar(&s.UseHostPortEndpoints, "host_port_endpoints", s.UseHostPortEndpoints, "Map service endpoints to hostIP:hostPort instead of podIP:containerPort. Default true.")
contrib/mesos/docs/ha.md:- `--km_path` or else (`--executor_path` and `--proxy_path`) should reference non-local-file URI's and must be identical across schedulers. contrib/mesos/docs/ha.md:- `--km_path` or else (`--executor_path` and `--proxy_path`) should reference non-local-file URI's and must be identical across schedulers.
contrib/mesos/docs/ha.md:$ ./bin/km scheduler ... --mesos_master=zk://zk1:2181,zk2:2181/mesos --ha --km_path=hdfs:///km contrib/mesos/docs/ha.md:$ ./bin/km scheduler ... --mesos_master=zk://zk1:2181,zk2:2181/mesos --ha --km_path=hdfs:///km
contrib/mesos/docs/ha.md:- `--auth_path` contrib/mesos/docs/ha.md:- `--auth_path`
......
test/e2e/volumes.go
View file @ fa40ced8
...@@ -272,7 +272,7 @@ var _ = Describe("Volumes", func() { ...@@ -272,7 +272,7 @@ var _ = Describe("Volumes", func() {
ReadOnly: true, ReadOnly: true,
}, },
} }
// Must match content of contrib/for-tests/volumes-tester/nfs/index.html // Must match content of test/images/volumes-tester/nfs/index.html
testVolumeClient(c, config, volume, "Hello from NFS!") testVolumeClient(c, config, volume, "Hello from NFS!")
}) })
}) })
...@@ -344,12 +344,12 @@ var _ = Describe("Volumes", func() { ...@@ -344,12 +344,12 @@ var _ = Describe("Volumes", func() {
volume := api.VolumeSource{ volume := api.VolumeSource{
Glusterfs: &api.GlusterfsVolumeSource{ Glusterfs: &api.GlusterfsVolumeSource{
EndpointsName: config.prefix + "-server", EndpointsName: config.prefix + "-server",
// 'test_vol' comes from contrib/for-tests/volumes-tester/gluster/run_gluster.sh // 'test_vol' comes from test/images/volumes-tester/gluster/run_gluster.sh
Path: "test_vol", Path: "test_vol",
ReadOnly: true, ReadOnly: true,
}, },
} }
// Must match content of contrib/for-tests/volumes-tester/gluster/index.html // Must match content of test/images/volumes-tester/gluster/index.html
testVolumeClient(c, config, volume, "Hello from GlusterFS!") testVolumeClient(c, config, volume, "Hello from GlusterFS!")
}) })
}) })
...@@ -389,14 +389,14 @@ var _ = Describe("Volumes", func() { ...@@ -389,14 +389,14 @@ var _ = Describe("Volumes", func() {
volume := api.VolumeSource{ volume := api.VolumeSource{
ISCSI: &api.ISCSIVolumeSource{ ISCSI: &api.ISCSIVolumeSource{
TargetPortal: serverIP + ":3260", TargetPortal: serverIP + ":3260",
// from contrib/for-tests/volumes-tester/iscsi/initiatorname.iscsi // from test/images/volumes-tester/iscsi/initiatorname.iscsi
IQN: "iqn.2003-01.org.linux-iscsi.f21.x8664:sn.4b0aae584f7c", IQN: "iqn.2003-01.org.linux-iscsi.f21.x8664:sn.4b0aae584f7c",
Lun: 0, Lun: 0,
FSType: "ext2", FSType: "ext2",
ReadOnly: true, ReadOnly: true,
}, },
} }
// Must match content of contrib/for-tests/volumes-tester/iscsi/block.tar.gz // Must match content of test/images/volumes-tester/iscsi/block.tar.gz
testVolumeClient(c, config, volume, "Hello from iSCSI") testVolumeClient(c, config, volume, "Hello from iSCSI")
}) })
}) })
...@@ -443,7 +443,7 @@ var _ = Describe("Volumes", func() { ...@@ -443,7 +443,7 @@ var _ = Describe("Volumes", func() {
Name: config.prefix + "-secret", Name: config.prefix + "-secret",
}, },
Data: map[string][]byte{ Data: map[string][]byte{
// from contrib/for-tests/volumes-tester/rbd/keyring // from test/images/volumes-tester/rbd/keyring
"key": []byte("AQDRrKNVbEevChAAEmRC+pW/KBVHxa0w/POILA=="), "key": []byte("AQDRrKNVbEevChAAEmRC+pW/KBVHxa0w/POILA=="),
}, },
} }
...@@ -473,7 +473,7 @@ var _ = Describe("Volumes", func() { ...@@ -473,7 +473,7 @@ var _ = Describe("Volumes", func() {
ReadOnly: true, ReadOnly: true,
}, },
} }
// Must match content of contrib/for-tests/volumes-tester/gluster/index.html // Must match content of test/images/volumes-tester/gluster/index.html
testVolumeClient(c, config, volume, "Hello from RBD") testVolumeClient(c, config, volume, "Hello from RBD")
}) })
......
contrib/for-tests/porter/README.md → test/images/porter/README.md
View file @ fa40ced8
...@@ -2,4 +2,4 @@ This directory contains go source, Dockerfile and Makefile for making a test ...@@ -2,4 +2,4 @@ This directory contains go source, Dockerfile and Makefile for making a test
container which serves requested data on ports specified in ENV variables. container which serves requested data on ports specified in ENV variables.
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/contrib/for-tests/porter/README.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/porter/README.md?pixel)]()
contrib/for-tests/volumes-tester/gluster/README.md → test/images/volumes-tester/gluster/README.md
View file @ fa40ced8
...@@ -5,4 +5,4 @@ This container exports test_vol volume with an index.html inside. ...@@ -5,4 +5,4 @@ This container exports test_vol volume with an index.html inside.
Used by test/e2e/* to test GlusterfsVolumeSource. Not for production use! Used by test/e2e/* to test GlusterfsVolumeSource. Not for production use!
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/contrib/for-tests/volumes-tester/gluster/README.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/volumes-tester/gluster/README.md?pixel)]()
contrib/for-tests/volumes-tester/iscsi/README.md → test/images/volumes-tester/iscsi/README.md
View file @ fa40ced8
...@@ -11,4 +11,4 @@ Inspired by https://github.com/rvykydal/dockerfile-iscsid ...@@ -11,4 +11,4 @@ Inspired by https://github.com/rvykydal/dockerfile-iscsid
block.tar.gz is a small ext2 filesystem created by `make block` (run as root!) block.tar.gz is a small ext2 filesystem created by `make block` (run as root!)
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/contrib/for-tests/volumes-tester/iscsi/README.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/volumes-tester/iscsi/README.md?pixel)]()
contrib/for-tests/volumes-tester/nfs/README.md → test/images/volumes-tester/nfs/README.md
View file @ fa40ced8
...@@ -7,4 +7,4 @@ Inspired by https://github.com/cpuguy83/docker-nfs-server. ...@@ -7,4 +7,4 @@ Inspired by https://github.com/cpuguy83/docker-nfs-server.
Used by test/e2e/* to test NFSVolumeSource. Not for production use! Used by test/e2e/* to test NFSVolumeSource. Not for production use!
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/contrib/for-tests/volumes-tester/nfs/README.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/volumes-tester/nfs/README.md?pixel)]()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment