add proxy-env and proxy-config which query weaveproxy for port #848

paulbellamy · 2015-06-04T12:01:20Z

If the overall approach looks fine, I want to modify the tests to use this.

Closes #753

weave

+    proxy-config)
+        proxy_addr "-H="
+        exit $?
+        ;;


rade · 2015-06-04T12:59:11Z

I said that ideally these commands would run w/o weavexec.

And why do we need to inspect the proxy container? We know what the port is; it's hard-coded in the script.

One reason I can see for both is the looming #805. So perhaps we should tackle that one first.

paulbellamy · 2015-06-04T13:11:12Z

You later said that running it locally won't work due to #805.

I agree, that doing #805 first is a good plan.

paulbellamy · 2015-06-09T15:42:43Z

The situation this doesn't handle, is if you have:

$ weave_on <remote_host> launch-proxy -L 127.0.0.1:12375
083896110ec5162b18dec9b833433812314a82a8be719642ff9effdb5d481425
$ weave proxy-env
export DOCKER_HOST=tcp://127.0.0.1:12375

Which won't work if you are not on the remote host. But aside from throwing an error, there isn't much we can do in that situation.

test/650_proxy_env_test.sh

+
+CMD="run -e WEAVE_CIDR=10.2.1.4/24 $BASE_IMAGE $CHECK_ETHWE_UP"
+assert_raises "eval '$(weave_on $HOST1 proxy-env)' ; docker $CMD"
+assert_raises "docker $(weave_on $HOST1 proxy-config) $CMD"


rade · 2015-06-10T12:35:42Z

weave_on <remote_host> launch-proxy -L 127.0.0.1:12375

I don't understand this comment. What does -L have to do with anything? Did you mean -H?

Also, it seems to me that -H isn't handled at all, and that we are simply stashing and retrieving 12375 - in a very, very, complicated way!

paulbellamy · 2015-06-10T12:45:24Z

Yeah. Needs a bit of a rework now that #805 is done.

rade · 2015-06-10T12:47:40Z

We could hold our noses and extract the listen address from the proxy's docker logs. Seems preferable to me to doing a lot of arg parsing and introducing bogus -p.

weave

@@ -805,6 +811,18 @@ proxy_args() {
    done
 }

+proxy_addr() {
+    if addr=$(docker logs weaveproxy | grep -oE "proxy listening on .*"); then


weave

@@ -805,6 +811,18 @@ proxy_args() {
    done
 }

+proxy_addr() {
+    if addr=$(docker logs weaveproxy | head -n3 | grep -oE "proxy listening on .*"); then


rade · 2015-06-10T13:43:08Z

docs need updating

site/proxy.md

-globally adjust your `DOCKER_HOST` to point at the proxy, e.g.
+All docker commands can be run via the proxy, so it is safe to use
+`weave proxy-env` to globally adjust your `DOCKER_HOST` to point at
+the proxy, e.g.


It's ugly, but beats arg-parsing, inspecting the container and piecing the address together from exposed ports. We could just use the host from DOCKER_HOST, but that will fail in the case of a host with multiple IPs, where the proxy only listens on one.

rade · 2015-06-10T14:32:13Z

done?

paulbellamy · 2015-06-10T14:33:48Z

Yes.

add proxy-env and proxy-config Closes #753.

rade reviewed Jun 4, 2015
View reviewed changes

weave

proxy-config)

proxy_addr "-H="

exit $?

;;

This comment was marked as abuse.

Sign in to view

paulbellamy force-pushed the proxy-env branch from 5e3d014 to 1f4b528 Compare June 4, 2015 13:09

rade assigned paulbellamy Jun 5, 2015

paulbellamy force-pushed the proxy-env branch 3 times, most recently from 4a6c3b6 to 0890542 Compare June 9, 2015 15:39

paulbellamy force-pushed the proxy-env branch 2 times, most recently from ec69408 to 7a50aaf Compare June 10, 2015 12:09

paulbellamy assigned rade and unassigned paulbellamy Jun 10, 2015

rade reviewed Jun 10, 2015
View reviewed changes

test/650_proxy_env_test.sh

CMD="run -e WEAVE_CIDR=10.2.1.4/24 $BASE_IMAGE $CHECK_ETHWE_UP"

assert_raises "eval '$(weave_on $HOST1 proxy-env)' ; docker $CMD"

assert_raises "docker $(weave_on $HOST1 proxy-config) $CMD"

This comment was marked as abuse.

Sign in to view

rade assigned paulbellamy and unassigned rade Jun 10, 2015

paulbellamy force-pushed the proxy-env branch from 7a50aaf to f0921ef Compare June 10, 2015 13:09

rade reviewed Jun 10, 2015
View reviewed changes

weave

@@ -805,6 +811,18 @@ proxy_args() {

done

}

proxy_addr() {

if addr=$(docker logs weaveproxy | grep -oE "proxy listening on .*"); then

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

paulbellamy force-pushed the proxy-env branch from f0921ef to 9fc7b67 Compare June 10, 2015 13:25

rade reviewed Jun 10, 2015
View reviewed changes

paulbellamy force-pushed the proxy-env branch from 9fc7b67 to d57c4a4 Compare June 10, 2015 14:00

rade reviewed Jun 10, 2015
View reviewed changes

site/proxy.md

globally adjust your `DOCKER_HOST` to point at the proxy, e.g.

All docker commands can be run via the proxy, so it is safe to use

`weave proxy-env` to globally adjust your `DOCKER_HOST` to point at

the proxy, e.g.

This comment was marked as abuse.

Sign in to view

paulbellamy force-pushed the proxy-env branch from d57c4a4 to 2d5e362 Compare June 10, 2015 14:24

paulbellamy removed their assignment Jun 10, 2015

paulbellamy assigned rade Jun 10, 2015

rade added a commit that referenced this pull request Jun 10, 2015

Merge pull request #848 from paulbellamy/proxy-env

afd0275

add proxy-env and proxy-config Closes #753.

rade merged commit afd0275 into weaveworks:master Jun 10, 2015

rade modified the milestone: 1.0 Jun 10, 2015

paulbellamy deleted the proxy-env branch June 10, 2015 14:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add proxy-env and proxy-config which query weaveproxy for port #848

add proxy-env and proxy-config which query weaveproxy for port #848

paulbellamy commented Jun 4, 2015

This comment was marked as abuse.

rade commented Jun 4, 2015

paulbellamy commented Jun 4, 2015

paulbellamy commented Jun 9, 2015

This comment was marked as abuse.

rade commented Jun 10, 2015

paulbellamy commented Jun 10, 2015

rade commented Jun 10, 2015

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

rade commented Jun 10, 2015

This comment was marked as abuse.

rade commented Jun 10, 2015

paulbellamy commented Jun 10, 2015

add proxy-env and proxy-config which query weaveproxy for port #848

add proxy-env and proxy-config which query weaveproxy for port #848

Conversation

paulbellamy commented Jun 4, 2015

This comment was marked as abuse.

rade commented Jun 4, 2015

paulbellamy commented Jun 4, 2015

paulbellamy commented Jun 9, 2015

This comment was marked as abuse.

rade commented Jun 10, 2015

paulbellamy commented Jun 10, 2015

rade commented Jun 10, 2015

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

This comment was marked as abuse.

rade commented Jun 10, 2015

This comment was marked as abuse.

rade commented Jun 10, 2015

paulbellamy commented Jun 10, 2015