github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use set interface methods.

pull/6/head
Trevor Pounds 2015-09-20 18:51:25 -07:00
parent d49ca164ef
commit ea85e2319b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
View File

@ -62,7 +62,7 @@ func (s *AWSCloud) ensureLoadBalancer(name string, listeners []*elb.Listener, su
additions := expected.Difference(actual) additions := expected.Difference(actual)
removals := actual.Difference(expected) removals := actual.Difference(expected)
if len(removals) != 0 { if removals.Len() != 0 {
request := &elb.DetachLoadBalancerFromSubnetsInput{} request := &elb.DetachLoadBalancerFromSubnetsInput{}
request.LoadBalancerName = aws.String(name) request.LoadBalancerName = aws.String(name)
request.Subnets = stringSetToPointers(removals) request.Subnets = stringSetToPointers(removals)
@ -74,7 +74,7 @@ func (s *AWSCloud) ensureLoadBalancer(name string, listeners []*elb.Listener, su
dirty = true dirty = true
} }
if len(additions) != 0 { if additions.Len() != 0 {
request := &elb.AttachLoadBalancerToSubnetsInput{} request := &elb.AttachLoadBalancerToSubnetsInput{}
request.LoadBalancerName = aws.String(name) request.LoadBalancerName = aws.String(name)
request.Subnets = stringSetToPointers(additions) request.Subnets = stringSetToPointers(additions)
@ -259,14 +259,14 @@ func (s *AWSCloud) ensureLoadBalancerInstances(loadBalancerName string, lbInstan
removals := actual.Difference(expected) removals := actual.Difference(expected)
addInstances := []*elb.Instance{} addInstances := []*elb.Instance{}
for instanceId := range additions { for _, instanceId := range additions.List() {
addInstance := &elb.Instance{} addInstance := &elb.Instance{}
addInstance.InstanceID = aws.String(instanceId) addInstance.InstanceID = aws.String(instanceId)
addInstances = append(addInstances, addInstance) addInstances = append(addInstances, addInstance)
} }
removeInstances := []*elb.Instance{} removeInstances := []*elb.Instance{}
for instanceId := range removals { for _, instanceId := range removals.List() {
removeInstance := &elb.Instance{} removeInstance := &elb.Instance{}
removeInstance.InstanceID = aws.String(instanceId) removeInstance.InstanceID = aws.String(instanceId)
removeInstances = append(removeInstances, removeInstance) removeInstances = append(removeInstances, removeInstance)