Merge pull request kubernetes#92227 from M00nF1sh/nlb_vpc_cidr

k8s-ci-robot · web-flow · commit c232e4fae9c6 · 2020-06-22T15:02:25.000-07:00
fix aws loadbalancer vpc cidr calculation
diff --git a/staging/src/k8s.io/legacy-cloud-providers/aws/aws_loadbalancer.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws_loadbalancer.go
@@ -721,6 +721,9 @@ func (c *Cloud) getVpcCidrBlocks() ([]string, error) {
 
 	cidrBlocks := make([]string, 0, len(vpcs.Vpcs[0].CidrBlockAssociationSet))
 	for _, cidr := range vpcs.Vpcs[0].CidrBlockAssociationSet {
+		if aws.StringValue(cidr.CidrBlockState.State) != ec2.VpcCidrBlockStateCodeAssociated {
+			continue
+		}
 		cidrBlocks = append(cidrBlocks, aws.StringValue(cidr.CidrBlock))
 	}
 	return cidrBlocks, nil

Original file line number	Diff line number	Diff line change
`@@ -721,6 +721,9 @@ func (c *Cloud) getVpcCidrBlocks() ([]string, error) {`
`721`	`721`
`722`	`722`	`cidrBlocks := make([]string, 0, len(vpcs.Vpcs[0].CidrBlockAssociationSet))`
`723`	`723`	`for _, cidr := range vpcs.Vpcs[0].CidrBlockAssociationSet {`
	`724`	`+ if aws.StringValue(cidr.CidrBlockState.State) != ec2.VpcCidrBlockStateCodeAssociated {`
	`725`	`+ continue`
	`726`	`+ }`
`724`	`727`	`cidrBlocks = append(cidrBlocks, aws.StringValue(cidr.CidrBlock))`
`725`	`728`	`}`
`726`	`729`	`return cidrBlocks, nil`