Merge pull request #3319 from weaveworks/weave-reset-err

Make error "Weave is not running" less confusing when running on Kubernetes

Author: bboreham

weave

@@ -1258,7 +1258,7 @@ launch() {
 stop() {
     util_op remove-plugin-network weave || true
     warn_if_stopping_proxy_in_env
-    util_op stop-container $CONTAINER_NAME >/dev/null 2>&1 || echo "Weave is not running." >&2
+    util_op stop-container $CONTAINER_NAME >/dev/null 2>&1 || echo "Weave is not running (ignore on Kubernetes)." >&2
     # In case user has upgraded from <v2.0 and left old containers running
     util_op stop-container $OLD_PLUGIN_CONTAINER_NAME >/dev/null 2>&1 || true
     util_op stop-container $OLD_PROXY_CONTAINER_NAME >/dev/null 2>&1 || true