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

Merge pull request #10199 from hakman/fix-nlb-reconciliation 

Fix AWS NLB reconciliation
This commit is contained in:
Kubernetes Prow Robot 2020-11-08 10:43:37 -08:00 committed by GitHub
parent 8c9cbcaae0 6c6a9daaf3
commit b91a40c52a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -803,7 +803,7 @@ func (e *AutoscalingGroup) getTGsToDetach(currentTGs []*TargetGroup) []*string {
for _, v := range currentTGs { for _, v := range currentTGs {
if _, ok := desiredTGs[*v.ARN]; !ok { if _, ok := desiredTGs[*v.ARN]; !ok {
tgsToDetach = append(tgsToDetach, v.Name) tgsToDetach = append(tgsToDetach, v.ARN)
} }
} }
return tgsToDetach return tgsToDetach

1
upup/pkg/fi/cloudup/awstasks/targetgroup.go
View File

@ -92,6 +92,7 @@ func (e *TargetGroup) Find(c *fi.Context) (*TargetGroup, error) {
UnhealthyThreshold: tg.UnhealthyThresholdCount, UnhealthyThreshold: tg.UnhealthyThresholdCount,
VPC: &VPC{ID: tg.VpcId}, VPC: &VPC{ID: tg.VpcId},
} }
e.ARN = tg.TargetGroupArn
tagsResp, err := cloud.ELBV2().DescribeTags(&elbv2.DescribeTagsInput{ tagsResp, err := cloud.ELBV2().DescribeTags(&elbv2.DescribeTagsInput{
ResourceArns: []*string{tg.TargetGroupArn}, ResourceArns: []*string{tg.TargetGroupArn},