Merge branch '1.5.0-rc5' into master

provider/docker/docker.go

@@ -2,6 +2,7 @@ package docker
 
 import (
 	"context"
+	"io"
 	"net"
 	"net/http"
 	"strconv"
@@ -218,16 +219,22 @@ func (p *Provider) Provide(configurationChan chan<- types.ConfigMessage, pool *s
 					}
 
 					eventsc, errc := dockerClient.Events(ctx, options)
-					for event := range eventsc {
-						if event.Action == "start" ||
-							event.Action == "die" ||
-							strings.HasPrefix(event.Action, "health_status") {
-							startStopHandle(event)
+					for {
+						select {
+						case event := <-eventsc:
+							if event.Action == "start" ||
+								event.Action == "die" ||
+								strings.HasPrefix(event.Action, "health_status") {
+								startStopHandle(event)
+							}
+						case err := <-errc:
+							if err == io.EOF {
+								log.Debug("Provider event stream closed")
+							}
+
+							return err
 						}
 					}
-					if err := <-errc; err != nil {
-						return err
-					}
 				}
 			}
 			return nil

provider/kubernetes/kubernetes.go

@@ -82,11 +82,11 @@ func (p *Provider) newK8sClient() (Client, error) {
 	}
 
 	if os.Getenv("KUBERNETES_SERVICE_HOST") != "" && os.Getenv("KUBERNETES_SERVICE_PORT") != "" {
-		log.Infof("Creating in-cluster Provider client%s\n", withEndpoint)
+		log.Infof("Creating in-cluster Provider client%s", withEndpoint)
 		return NewInClusterClient(p.Endpoint)
 	}
 
-	log.Infof("Creating cluster-external Provider client%s\n", withEndpoint)
+	log.Infof("Creating cluster-external Provider client%s", withEndpoint)
 	return NewExternalClusterClient(p.Endpoint, p.Token, p.CertAuthFilePath)
 }