Merge branch 'v1.6' into master

provider/rancher/config.go

@@ -124,7 +124,9 @@ func (p *Provider) serviceFilter(service rancherData) bool {
 }
 
 func (p *Provider) getFrontendRule(serviceName string, labels map[string]string) string {
-	defaultRule := "Host:" + strings.ToLower(strings.Replace(serviceName, "/", ".", -1)) + "." + p.Domain
+	domain := label.GetStringValue(labels, label.TraefikDomain, p.Domain)
+	defaultRule := "Host:" + strings.ToLower(strings.Replace(serviceName, "/", ".", -1)) + "." + domain
+
 	return label.GetStringValue(labels, label.TraefikFrontendRule, defaultRule)
 }
 
@@ -164,6 +166,11 @@ func getServers(service rancherData) map[string]types.Server {
 	var servers map[string]types.Server
 
 	for index, ip := range service.Containers {
+		if len(ip) == 0 {
+			log.Warnf("Unable to find the IP address for a container in the service %q: this container is ignored.", service.Name)
+			continue
+		}
+
 		if servers == nil {
 			servers = make(map[string]types.Server)
 		}

provider/rancher/config_test.go

@@ -729,6 +729,16 @@ func TestProviderGetFrontendRule(t *testing.T) {
 			},
 			expected: "Host:foo.rancher.localhost",
 		},
+		{
+			desc: "with domain label",
+			service: rancherData{
+				Name: "test-service",
+				Labels: map[string]string{
+					label.TraefikDomain: "traefik.localhost",
+				},
+			},
+			expected: "Host:test-service.traefik.localhost",
+		},
 		{
 			desc: "host with /",
 			service: rancherData{
@@ -746,26 +756,6 @@ func TestProviderGetFrontendRule(t *testing.T) {
 			},
 			expected: "Host:foo.bar.com",
 		},
-		{
-			desc: "with Path label",
-			service: rancherData{
-				Name: "test-service",
-				Labels: map[string]string{
-					label.TraefikFrontendRule: "Path:/test",
-				},
-			},
-			expected: "Path:/test",
-		},
-		{
-			desc: "with PathPrefix label",
-			service: rancherData{
-				Name: "test-service",
-				Labels: map[string]string{
-					label.TraefikFrontendRule: "PathPrefix:/test2",
-				},
-			},
-			expected: "PathPrefix:/test2",
-		},
 	}
 
 	for _, test := range testCases {
@@ -849,6 +839,18 @@ func TestGetServers(t *testing.T) {
 			},
 			expected: nil,
 		},
+		{
+			desc: "should return nil when no server IPs",
+			service: rancherData{
+				Labels: map[string]string{
+					label.TraefikWeight: "7",
+				},
+				Containers: []string{""},
+				Health:     "healthy",
+				State:      "active",
+			},
+			expected: nil,
+		},
 		{
 			desc: "should use default weight when invalid weight value",
 			service: rancherData{