From 19345c3f7fb6342936b10d930d83f86addec803a Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 20 Nov 2020 06:44:42 +0200 Subject: [PATCH] Order attached TargetGrups list by name --- pkg/model/awsmodel/autoscalinggroup.go | 1 + upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/model/awsmodel/autoscalinggroup.go b/pkg/model/awsmodel/autoscalinggroup.go index 91eb4695e8..b060645d80 100644 --- a/pkg/model/awsmodel/autoscalinggroup.go +++ b/pkg/model/awsmodel/autoscalinggroup.go @@ -418,6 +418,7 @@ func (b *AutoscalingGroupModelBuilder) buildAutoScalingGroupTask(c *fi.ModelBuil c.AddTask(tg) } } + sort.Stable(awstasks.OrderTargetGroupsByName(t.TargetGroups)) // @step: are we using a mixed instance policy if ig.Spec.MixedInstancesPolicy != nil { diff --git a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go index adf8f37033..4823405704 100644 --- a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go +++ b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go @@ -179,6 +179,7 @@ func (e *AutoscalingGroup) Find(c *fi.Context) (*AutoscalingGroup, error) { return nil, err } actual.TargetGroups = targetGroups + sort.Stable(OrderTargetGroupsByName(actual.TargetGroups)) } if g.VPCZoneIdentifier != nil {