Merge pull request #31 from ibuildthecloud/labels

Support labels on Load Balancers

librcompose/util/util.go

@@ -10,3 +10,12 @@ func Convert(src, target interface{}) error {
 
 	return yaml.Unmarshal(newBytes, target)
 }
+
+func ConvertToInterfaceMap(input map[string]string) map[string]interface{} {
+	result := map[string]interface{}{}
+	for k, v := range input {
+		result[k] = v
+	}
+
+	return result
+}

rancher/service.go

@@ -17,6 +17,7 @@ import (
 	"github.com/rancherio/go-rancher/hostaccess"
 	"github.com/rancherio/rancher-compose/librcompose/docker"
 	"github.com/rancherio/rancher-compose/librcompose/project"
+	"github.com/rancherio/rancher-compose/librcompose/util"
 )
 
 const (
@@ -227,7 +228,8 @@ func (r *RancherService) createLbService() (*rancherClient.Service, error) {
 		Name:               r.name,
 		LoadBalancerConfig: lbConfig,
 		LaunchConfig: rancherClient.LaunchConfig{
-			Ports: r.serviceConfig.Ports,
+			Ports:  r.serviceConfig.Ports,
+			Labels: util.ConvertToInterfaceMap(r.serviceConfig.Labels.MapParts()),
 		},
 		Scale:         int64(r.getConfiguredScale()),
 		EnvironmentId: r.context.Environment.Id,

tests/integration/cattletest/core/test_compose.py

@@ -523,6 +523,9 @@ def test_up_relink(client, compose):
     image: rancher/load-balancer-service
     links:
     - web
+    labels:
+      a: b
+      c: d
 web:
     image: nginx
 '''
@@ -535,6 +538,11 @@ def test_up_relink(client, compose):
     assert len(consumed) == 1
     assert consumed[0].name == 'web'
 
+    assert lb.launchConfig.labels == {
+        'a': 'b',
+        'c': 'd',
+    }
+
     template2 = '''
 lb:
     image: nginx