Merge branch 'add-tag-support' into 'master'

Enable tags to be specified in ELBV2 input Closes #1 See merge request !7
kubernetes-sigs · Mar 1, 2017 · 45fac13 · 45fac13
2 parents 3fdaf26 + 2b65a28
commit 45fac13
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkg/cmd/controller/elbv2.go b/pkg/cmd/controller/elbv2.go
@@ -134,10 +134,10 @@ func (elb *ELBV2) createALB(a *albIngress) error {
 	}
 
 	albParams := &elbv2.CreateLoadBalancerInput{
-		Name:    aws.String(a.Name()),
-		Subnets: a.annotations.subnets,
-		Scheme:  a.annotations.scheme,
-		// Tags:           a.annotations.tags,
+		Name:           aws.String(a.Name()),
+		Subnets:        a.annotations.subnets,
+		Scheme:         a.annotations.scheme,
+		Tags:           a.annotations.tags,
 		SecurityGroups: a.annotations.securityGroups,
 	}