Merge pull request #10201 from hakman/automated-cherry-pick-of-#10199-upstream-release-1.19

k8s-ci-robot · web-flow · commit 3ffd446051b9 · 2020-11-09T09:10:26.000-08:00
Automated cherry pick of #10199: Fix AWS NLB reconciliation
diff --git a/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go b/upup/pkg/fi/cloudup/awstasks/autoscalinggroup.go
@@ -803,7 +803,7 @@ func (e *AutoscalingGroup) getTGsToDetach(currentTGs []*TargetGroup) []*string {
 
 	for _, v := range currentTGs {
 		if _, ok := desiredTGs[*v.ARN]; !ok {
-			tgsToDetach = append(tgsToDetach, v.Name)
+			tgsToDetach = append(tgsToDetach, v.ARN)
 		}
 	}
 	return tgsToDetach
diff --git a/upup/pkg/fi/cloudup/awstasks/targetgroup.go b/upup/pkg/fi/cloudup/awstasks/targetgroup.go
@@ -92,6 +92,7 @@ func (e *TargetGroup) Find(c *fi.Context) (*TargetGroup, error) {
 		UnhealthyThreshold: tg.UnhealthyThresholdCount,
 		VPC:                &VPC{ID: tg.VpcId},
 	}
+	e.ARN = tg.TargetGroupArn
 
 	tagsResp, err := cloud.ELBV2().DescribeTags(&elbv2.DescribeTagsInput{
 		ResourceArns: []*string{tg.TargetGroupArn},

Original file line number	Diff line number	Diff line change
`@@ -803,7 +803,7 @@ func (e AutoscalingGroup) getTGsToDetach(currentTGs []TargetGroup) []*string {`
`803`	`803`
`804`	`804`	`for _, v := range currentTGs {`
`805`	`805`	`if _, ok := desiredTGs[*v.ARN]; !ok {`
`806`		`- tgsToDetach = append(tgsToDetach, v.Name)`
	`806`	`+ tgsToDetach = append(tgsToDetach, v.ARN)`
`807`	`807`	`}`
`808`	`808`	`}`
`809`	`809`	`return tgsToDetach`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ func (e TargetGroup) Find(c fi.Context) (*TargetGroup, error) {`
`92`	`92`	`UnhealthyThreshold: tg.UnhealthyThresholdCount,`
`93`	`93`	`VPC: &VPC{ID: tg.VpcId},`
`94`	`94`	`}`
	`95`	`+ e.ARN = tg.TargetGroupArn`
`95`	`96`
`96`	`97`	`tagsResp, err := cloud.ELBV2().DescribeTags(&elbv2.DescribeTagsInput{`
`97`	`98`	`ResourceArns: []*string{tg.TargetGroupArn},`