Merge pull request #10666 from hakman/same-lb-multiple-igs

Allow attaching same external load balancer to multiple instance groups

pkg/model/awsmodel/autoscalinggroup.go

@@ -450,8 +450,12 @@ func (b *AutoscalingGroupModelBuilder) buildAutoScalingGroupTask(c *fi.ModelBuil
 
 	for _, extLB := range ig.Spec.ExternalLoadBalancers {
 		if extLB.LoadBalancerName != nil {
+			loadBalancerName := fi.StringValue(extLB.LoadBalancerName)
+			if loadBalancerName != awsup.GetResourceName32(b.Cluster.Name, "api") && loadBalancerName != awsup.GetResourceName32(b.Cluster.Name, "bastion") {
+				loadBalancerName = name + "-" + loadBalancerName
+			}
 			lb := &awstasks.ClassicLoadBalancer{
-				Name:             extLB.LoadBalancerName,
+				Name:             fi.String(loadBalancerName),
 				LoadBalancerName: extLB.LoadBalancerName,
 				Shared:           fi.Bool(true),
 			}
@@ -473,6 +477,7 @@ func (b *AutoscalingGroupModelBuilder) buildAutoScalingGroupTask(c *fi.ModelBuil
 			c.AddTask(tg)
 		}
 	}
+	sort.Stable(awstasks.OrderLoadBalancersByName(t.LoadBalancers))
 	sort.Stable(awstasks.OrderTargetGroupsByName(t.TargetGroups))
 
 	// @step: are we using a mixed instance policy

tests/integration/update_cluster/externallb/cloudformation.json

@@ -80,6 +80,7 @@
           }
         ],
         "LoadBalancerNames": [
+          "my-external-elb-1",
           "my-external-elb-2",
           "my-external-elb-3"
         ],

tests/integration/update_cluster/externallb/in-v1alpha2.yaml

@@ -80,8 +80,9 @@ spec:
   subnets:
   - us-test-1a
   externalLoadBalancers:
-  - targetGroupArn: arn:aws:elasticloadbalancing:us-test-1:000000000000:targetgroup/my-external-tg-1/1
   - targetGroupArn: arn:aws:elasticloadbalancing:us-test-1:000000000000:targetgroup/my-external-tg-2/2
+  - targetGroupArn: arn:aws:elasticloadbalancing:us-test-1:000000000000:targetgroup/my-external-tg-1/1
   - targetGroupArn: arn:aws:elasticloadbalancing:us-test-1:000000000000:targetgroup/my-external-tg-3/3
   - loadBalancerName: my-external-elb-2
+  - loadBalancerName: my-external-elb-1
   - loadBalancerName: my-external-elb-3

tests/integration/update_cluster/externallb/kubernetes.tf

@@ -86,7 +86,7 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-externallb-example-c
     id      = aws_launch_template.master-us-test-1a-masters-externallb-example-com.id
     version = aws_launch_template.master-us-test-1a-masters-externallb-example-com.latest_version
   }
-  load_balancers      = ["my-external-elb-2", "my-external-elb-3"]
+  load_balancers      = ["my-external-elb-1", "my-external-elb-2", "my-external-elb-3"]
   max_size            = 1
   metrics_granularity = "1Minute"
   min_size            = 1

upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go

@@ -115,8 +115,12 @@ func (e *AutoscalingGroup) Find(c *fi.Context) (*AutoscalingGroup, error) {
 
 	actual.LoadBalancers = []*ClassicLoadBalancer{}
 	for _, lb := range g.LoadBalancerNames {
+		loadBalancerName := fi.StringValue(lb)
+		if loadBalancerName != awsup.GetResourceName32(c.Cluster.Name, "api") && loadBalancerName != awsup.GetResourceName32(c.Cluster.Name, "bastion") {
+			loadBalancerName = fi.StringValue(g.AutoScalingGroupName) + "-" + loadBalancerName
+		}
 		actual.LoadBalancers = append(actual.LoadBalancers, &ClassicLoadBalancer{
-			Name:             aws.String(*lb),
+			Name:             aws.String(loadBalancerName),
 			LoadBalancerName: aws.String(*lb),
 		})
 	}
@@ -158,6 +162,7 @@ func (e *AutoscalingGroup) Find(c *fi.Context) (*AutoscalingGroup, error) {
 			}
 		}
 	}
+	sort.Stable(OrderLoadBalancersByName(actual.LoadBalancers))
 
 	actual.TargetGroups = []*TargetGroup{}
 	if len(g.TargetGroupARNs) > 0 {

upup/pkg/fi/cloudup/awstasks/classic_load_balancer.go

@@ -687,6 +687,15 @@ func (_ *ClassicLoadBalancer) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *Cl
 	return nil
 }
 
+// OrderLoadBalancersByName implements sort.Interface for []OrderLoadBalancersByName, based on name
+type OrderLoadBalancersByName []*ClassicLoadBalancer
+
+func (a OrderLoadBalancersByName) Len() int      { return len(a) }
+func (a OrderLoadBalancersByName) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+func (a OrderLoadBalancersByName) Less(i, j int) bool {
+	return fi.StringValue(a[i].Name) < fi.StringValue(a[j].Name)
+}
+
 type terraformLoadBalancer struct {
 	LoadBalancerName *string                          `json:"name" cty:"name"`
 	Listener         []*terraformLoadBalancerListener `json:"listener" cty:"listener"`
@@ -821,12 +830,12 @@ func (_ *ClassicLoadBalancer) RenderTerraform(t *terraform.TerraformTarget, a, e
 func (e *ClassicLoadBalancer) TerraformLink(params ...string) *terraform.Literal {
 	shared := fi.BoolValue(e.Shared)
 	if shared {
-		if e.Name == nil {
+		if e.LoadBalancerName == nil {
 			klog.Fatalf("Name must be set, if LB is shared: %s", e)
 		}
 
-		klog.V(4).Infof("reusing existing LB with name %q", *e.Name)
-		return terraform.LiteralFromStringValue(*e.Name)
+		klog.V(4).Infof("reusing existing LB with name %q", *e.LoadBalancerName)
+		return terraform.LiteralFromStringValue(*e.LoadBalancerName)
 	}
 
 	prop := "id"
@@ -966,12 +975,12 @@ func (_ *ClassicLoadBalancer) RenderCloudformation(t *cloudformation.Cloudformat
 func (e *ClassicLoadBalancer) CloudformationLink() *cloudformation.Literal {
 	shared := fi.BoolValue(e.Shared)
 	if shared {
-		if e.Name == nil {
+		if e.LoadBalancerName == nil {
 			klog.Fatalf("Name must be set, if LB is shared: %s", e)
 		}
 
-		klog.V(4).Infof("reusing existing LB with name %q", *e.Name)
-		return cloudformation.LiteralString(*e.Name)
+		klog.V(4).Infof("reusing existing LB with name %q", *e.LoadBalancerName)
+		return cloudformation.LiteralString(*e.LoadBalancerName)
 	}
 
 	return cloudformation.Ref("AWS::ElasticLoadBalancing::LoadBalancer", *e.Name)