Merge pull request #3585 from weaveworks/0peers

bboreham · web-flow · commit 9654df4d506c · 2019-02-04T14:57:13.000Z
handle single node case where return peer list from kube-utils is empty
diff --git a/prog/weave-kube/launch.sh b/prog/weave-kube/launch.sh
@@ -85,7 +85,7 @@ router_bridge_opts() {
 }
 
 if [ -z "$KUBE_PEERS" ]; then
-    if ! KUBE_PEERS=$(/home/weave/kube-utils) || [ -z "$KUBE_PEERS" ]; then
+    if ! KUBE_PEERS=$(/home/weave/kube-utils); then
         echo Failed to get peers >&2
         exit 1
     fi

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ router_bridge_opts() {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`if [ -z "$KUBE_PEERS" ]; then`
`88`		`- if ! KUBE_PEERS=$(/home/weave/kube-utils) \|\| [ -z "$KUBE_PEERS" ]; then`
	`88`	`+ if ! KUBE_PEERS=$(/home/weave/kube-utils); then`
`89`	`89`	`echo Failed to get peers >&2`
`90`	`90`	`exit 1`
`91`	`91`	`fi`