Merge pull request #1030 from M00nF1sh/fix_sg

k8s-ci-robot · web-flow · commit 6101b02dbba3 · 2019-09-16T11:12:39.000-07:00
fix sg rule handling bug when scale down to 0 under ip mode
diff --git a/internal/alb/sg/instance_attachment_v2.go b/internal/alb/sg/instance_attachment_v2.go
@@ -106,6 +106,9 @@ func (c *instanceAttachmentControllerV2) findInstanceSGsForTgGroup(ctx context.C
 			sgIDs.Insert(aws.StringValue(group.GroupId))
 		}
 	}
+	if len(sgIDs) == 0 {
+		return nil, nil
+	}
 	sgs, err := c.cloud.DescribeSecurityGroups(ctx, &ec2.DescribeSecurityGroupsInput{
 		GroupIds: aws.StringSlice(sgIDs.List()),
 	})

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,9 @@ func (c *instanceAttachmentControllerV2) findInstanceSGsForTgGroup(ctx context.C`
`106`	`106`	`sgIDs.Insert(aws.StringValue(group.GroupId))`
`107`	`107`	`}`
`108`	`108`	`}`
	`109`	`+ if len(sgIDs) == 0 {`
	`110`	`+ return nil, nil`
	`111`	`+ }`
`109`	`112`	`sgs, err := c.cloud.DescribeSecurityGroups(ctx, &ec2.DescribeSecurityGroupsInput{`
`110`	`113`	`GroupIds: aws.StringSlice(sgIDs.List()),`
`111`	`114`	`})`