kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14737 from hakman/fix_control-plane_tgs 

aws: Use EnsureTask to reference shared target groups
This commit is contained in:
Kubernetes Prow Robot 2022-12-07 09:22:39 -08:00 committed by GitHub
parent bf6b23f034 0c020cb6e9
commit a09154f668
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/model/awsmodel/autoscalinggroup.go
View File

@ -480,7 +480,9 @@ func (b *AutoscalingGroupModelBuilder) buildAutoScalingGroupTask(c *fi.ModelBuil
Shared: fi.PtrTo(true),
}
t.LoadBalancers = append(t.LoadBalancers, lb)
c.EnsureTask(lb)
if err := c.EnsureTask(lb); err != nil {
return nil, err
}
}
if extLB.TargetGroupARN != nil {
@ -489,13 +491,15 @@ func (b *AutoscalingGroupModelBuilder) buildAutoScalingGroupTask(c *fi.ModelBuil
return nil, err
}
tg := &awstasks.TargetGroup{
Name: fi.PtrTo(name + "-" + targetGroupName),
Name: fi.PtrTo(targetGroupName),
Lifecycle: b.Lifecycle,
ARN: extLB.TargetGroupARN,
Shared: fi.PtrTo(true),
}
t.TargetGroups = append(t.TargetGroups, tg)
c.AddTask(tg)
if err := c.EnsureTask(tg); err != nil {
return nil, err
}
}
}
sort.Stable(awstasks.OrderLoadBalancersByName(t.LoadBalancers))

6
upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go
View File

@ -188,11 +188,7 @@ func (e *AutoscalingGroup) Find(c *fi.Context) (*AutoscalingGroup, error) {
if err != nil {
return nil, err
}
if targetGroupName != awsup.GetResourceName32(c.Cluster.Name, "tcp") && targetGroupName != awsup.GetResourceName32(c.Cluster.Name, "tls") {
actual.TargetGroups = append(actual.TargetGroups, &TargetGroup{ARN: aws.String(*tg), Name: aws.String(targetGroupName)})
} else {
actual.TargetGroups = append(actual.TargetGroups, &TargetGroup{ARN: aws.String(*tg), Name: aws.String(fi.ValueOf(g.AutoScalingGroupName) + "-" + targetGroupName)})
}
actual.TargetGroups = append(actual.TargetGroups, &TargetGroup{ARN: aws.String(*tg), Name: aws.String(targetGroupName)})
}
}
sort.Stable(OrderTargetGroupsByName(actual.TargetGroups))