github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-02-14 18:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace weave run with use of weave proxy

Browse Source 
since Weave Net 2.0 removed `weave run`.
This commit is contained in:
Matthias Radestock
2017-06-25 06:46:17 +01:00
parent 40bb28a450
commit 6ef8281ad0
9 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
integration/310_container_to_container_edge_test.sh
View File

@@ -7,8 +7,8 @@ start_suite "Test short lived connections between containers"
weave_on "$HOST1" launch
scope_on "$HOST1" launch
weave_on "$HOST1" run -d --name nginx nginx
weave_on "$HOST1" run -d --name client alpine /bin/sh -c "while true; do \
weave_proxy_on "$HOST1" run -d --name nginx nginx
weave_proxy_on "$HOST1" run -d --name client alpine /bin/sh -c "while true; do \
wget http://nginx.weave.local:80/ -O - >/dev/null || true; \
sleep 1; \
done"

4
integration/311_container_to_container_edge_without_ebpf_test.sh
View File

@@ -7,8 +7,8 @@ start_suite "Test short lived connections between containers, without ebpf conne
weave_on "$HOST1" launch
scope_on "$HOST1" launch --probe.ebpf.connections=false
weave_on "$HOST1" run -d --name nginx nginx
weave_on "$HOST1" run -d --name client alpine /bin/sh -c "while true; do \
weave_proxy_on "$HOST1" run -d --name nginx nginx
weave_proxy_on "$HOST1" run -d --name client alpine /bin/sh -c "while true; do \
wget http://nginx.weave.local:80/ -O - >/dev/null || true; \
sleep 1; \
done"

4
integration/313_container_to_container_edge_with_ebpf_proc_fallback_test.sh
View File

@@ -12,8 +12,8 @@ weave_on "$HOST1" launch
DOCKER_HOST=tcp://${HOST1}:${DOCKER_PORT} CHECKPOINT_DISABLE=true \
WEAVESCOPE_DOCKER_ARGS="-v /tmp:/sys/kernel/debug/tracing:ro" \
"${SCOPE}" launch
weave_on "$HOST1" run -d --name nginx nginx
weave_on "$HOST1" run -d --name client alpine /bin/sh -c "while true; do \
weave_proxy_on "$HOST1" run -d --name nginx nginx
weave_proxy_on "$HOST1" run -d --name client alpine /bin/sh -c "while true; do \
wget http://nginx.weave.local:80/ -O - >/dev/null || true; \
sleep 1; \
done"

4
integration/314_container_accept_before_kretprobe_test.sh
View File

@@ -10,7 +10,7 @@ weave_on "$HOST1" launch
# Launch the server before Scope to make sure it calls accept() before Scope's
# kretprobe on the accept function is installed. We use busybox' nc instead of
# Alpine's nc so that it blocks on the accept() syscall.
weave_on "$HOST1" run -d --name server busybox /bin/sh -c "while true; do \
weave_proxy_on "$HOST1" run -d --name server busybox /bin/sh -c "while true; do \
date ;
sleep 1 ;
done | nc -l -p 8080"
@@ -19,7 +19,7 @@ scope_on "$HOST1" launch
wait_for_containers "$HOST1" 60 server
has_container "$HOST1" server
weave_on "$HOST1" run -d --name client busybox /bin/sh -c "ping -c 5 server.weave.local; \
weave_proxy_on "$HOST1" run -d --name client busybox /bin/sh -c "ping -c 5 server.weave.local; \
while true; do \
date ;
sleep 1 ;

4
integration/320_container_edge_cross_host_2_test.sh
View File

@@ -11,8 +11,8 @@ weave_on "$HOST2" launch "$HOST1" "$HOST2"
scope_on "$HOST1" launch
scope_on "$HOST2" launch
weave_on "$HOST1" run -d --name nginx nginx
weave_on "$HOST2" run -d --name client alpine /bin/sh -c "while true; do \
weave_proxy_on "$HOST1" run -d --name nginx nginx
weave_proxy_on "$HOST2" run -d --name client alpine /bin/sh -c "while true; do \
wget http://nginx.weave.local:80/ -O - >/dev/null || true; \
sleep 1; \
done"

4
integration/330_process_edge_test.sh
View File

@@ -7,8 +7,8 @@ start_suite "Test long connections (procspy) between processes"
weave_on "$HOST1" launch
scope_on "$HOST1" launch --probe.conntrack=false
weave_on "$HOST1" run -d --name nginx nginx
weave_on "$HOST1" run -dti --name client alpine /bin/sh -c "while true; do \
weave_proxy_on "$HOST1" run -d --name nginx nginx
weave_proxy_on "$HOST1" run -dti --name client alpine /bin/sh -c "while true; do \
nc nginx.weave.local 80 || true; \
sleep 1; \
done"

4
integration/340_process_edge_across_host_2_test.sh
View File

@@ -11,8 +11,8 @@ weave_on "$HOST2" launch "$HOST1" "$HOST2"
scope_on "$HOST1" launch --probe.conntrack=false
scope_on "$HOST2" launch --probe.conntrack=false
weave_on "$HOST1" run -d --name nginx nginx
weave_on "$HOST2" run -dti --name client alpine /bin/sh -c "while true; do \
weave_proxy_on "$HOST1" run -d --name nginx nginx
weave_proxy_on "$HOST2" run -dti --name client alpine /bin/sh -c "while true; do \
nc nginx.weave.local 80 || true; \
sleep 1; \
done"

2
integration/410_container_control_test.sh
View File

@@ -8,7 +8,7 @@ start_suite "Test container controls"
weave_on "$HOST1" launch
scope_on "$HOST1" launch
CID=$(weave_on "$HOST1" run -dti --name alpine alpine /bin/sh)
CID=$(weave_proxy_on "$HOST1" run -dti --name alpine alpine /bin/sh)
wait_for_containers "$HOST1" 60 alpine

7
integration/config.sh
View File

@@ -28,6 +28,13 @@ weave_on() {
DOCKER_HOST=tcp://$host:$DOCKER_PORT CHECKPOINT_DISABLE=true "$WEAVE" "$@"
}
weave_proxy_on() {
local host=$1
shift 1
[ -z "$DEBUG" ] || greyly echo "Weave proxy on $host: $*" >&2
DOCKER_PORT=12375 docker_on "$host" "$@"
}
scope_end_suite() {
end_suite
for host in $HOSTS; do