Merge pull request #237 from joshwget/v2-lb-selectors

Fix selectors for v2 load balancers

rancher/lb_service.go

@@ -146,24 +146,29 @@ frontend %s
 			}
 		}
 		for _, portRule := range config.LbConfig.PortRules {
-			targetService, err := r.FindExisting(portRule.Service)
-			if err != nil {
-				return err
-			}
-			if targetService == nil {
-				return fmt.Errorf("Failed to find existing service: %s", portRule.Service)
-			}
-			service.LbConfig.PortRules = append(service.LbConfig.PortRules, client.PortRule{
+			finalPortRule := client.PortRule{
 				SourcePort:  int64(portRule.SourcePort),
 				Protocol:    portRule.Protocol,
 				Path:        portRule.Path,
 				Hostname:    portRule.Hostname,
-				ServiceId:   targetService.Id,
 				TargetPort:  int64(portRule.TargetPort),
 				Priority:    int64(portRule.Priority),
 				BackendName: portRule.BackendName,
 				Selector:    portRule.Selector,
-			})
+			}
+
+			if portRule.Service != "" {
+				targetService, err := r.FindExisting(portRule.Service)
+				if err != nil {
+					return err
+				}
+				if targetService == nil {
+					return fmt.Errorf("Failed to find existing service: %s", portRule.Service)
+				}
+				finalPortRule.ServiceId = targetService.Id
+			}
+
+			service.LbConfig.PortRules = append(service.LbConfig.PortRules, finalPortRule)
 		}
 
 		launchConfig.Ports = r.serviceConfig.Ports

rancher/service.go

@@ -551,7 +551,7 @@ func (r *RancherService) DependentServices() []project.ServiceRelationship {
 	lbConfig := r.RancherConfig().LbConfig
 	if lbConfig != nil {
 		for _, portRule := range lbConfig.PortRules {
-			if !strings.Contains(portRule.Service, "/") {
+			if portRule.Service != "" && !strings.Contains(portRule.Service, "/") {
 				result = append(result, project.NewServiceRelationship(portRule.Service, project.RelTypeLink))
 			}
 		}