Merge pull request #10201 from hakman/automated-cherry-pick-of-#10199…

…-upstream-release-1.19 Automated cherry pick of #10199: Fix AWS NLB reconciliation
kubernetes · Nov 9, 2020 · 3ffd446 · 3ffd446
2 parents 203ee78 + 2534f73
commit 3ffd446
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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},