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

bigkraig · bigkraig · commit 45fac1324e34 · 2017-03-01T14:29:47.000Z
Enable tags to be specified in ELBV2 input Closes #1 See merge request !7
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,
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -134,10 +134,10 @@ func (elb ELBV2) createALB(a albIngress) error {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`albParams := &elbv2.CreateLoadBalancerInput{`
`137`		`- Name: aws.String(a.Name()),`
`138`		`- Subnets: a.annotations.subnets,`
`139`		`- Scheme: a.annotations.scheme,`
`140`		`- // Tags: a.annotations.tags,`
	`137`	`+ Name: aws.String(a.Name()),`
	`138`	`+ Subnets: a.annotations.subnets,`
	`139`	`+ Scheme: a.annotations.scheme,`
	`140`	`+ Tags: a.annotations.tags,`
`141`	`141`	`SecurityGroups: a.annotations.securityGroups,`
`142`	`142`	`}`
`143`	`143`