Merge pull request #3457 from josh-ferrell/e2e_allocateaddress_fix

k8s-ci-robot · web-flow · commit c7752753f355 · 2022-05-05T10:58:21.000-07:00
Add timeout to AllocateAddress
diff --git a/test/e2e/shared/aws.go b/test/e2e/shared/aws.go
@@ -165,9 +165,14 @@ func (i *AWSInfrastructure) AllocateAddress() AWSInfrastructure {
 		return *i
 	}
 
-	if addr, _ := GetAddress(i.Context, *aa.AllocationId); addr != nil {
-		i.ElasticIP = addr
+	t := 0
+	addr, _ := GetAddress(i.Context, *aa.AllocationId)
+	for addr == nil || t < 180 {
+		time.Sleep(1 * time.Second)
+		addr, _ = GetAddress(i.Context, *aa.AllocationId)
+		t++
 	}
+	i.ElasticIP = addr
 	return *i
 }
 
@@ -236,9 +241,11 @@ func (i *AWSInfrastructure) CreateInfrastructure() AWSInfrastructure {
 		i.CreateInternetGateway()
 	}
 	i.AllocateAddress()
-	i.CreateNatGateway("public")
-	if i.NatGateway != nil && i.NatGateway.NatGatewayId != nil {
-		WaitForNatGatewayState(i.Context, *i.NatGateway.NatGatewayId, 180, "available")
+	if i.ElasticIP != nil && i.ElasticIP.AllocationId != nil {
+		i.CreateNatGateway("public")
+		if i.NatGateway != nil && i.NatGateway.NatGatewayId != nil {
+			WaitForNatGatewayState(i.Context, *i.NatGateway.NatGatewayId, 180, "available")
+		}
 	}
 	if len(i.Subnets) == 2 {
 		i.CreateRouteTable("public")

Original file line number	Diff line number	Diff line change
`@@ -165,9 +165,14 @@ func (i *AWSInfrastructure) AllocateAddress() AWSInfrastructure {`
`165`	`165`	`return *i`
`166`	`166`	`}`
`167`	`167`
`168`		`- if addr, _ := GetAddress(i.Context, *aa.AllocationId); addr != nil {`
`169`		`- i.ElasticIP = addr`
	`168`	`+ t := 0`
	`169`	`+ addr, _ := GetAddress(i.Context, *aa.AllocationId)`
	`170`	`+ for addr == nil \|\| t < 180 {`
	`171`	`+ time.Sleep(1 * time.Second)`
	`172`	`+ addr, _ = GetAddress(i.Context, *aa.AllocationId)`
	`173`	`+ t++`
`170`	`174`	`}`
	`175`	`+ i.ElasticIP = addr`
`171`	`176`	`return *i`
`172`	`177`	`}`
`173`	`178`
`@@ -236,9 +241,11 @@ func (i *AWSInfrastructure) CreateInfrastructure() AWSInfrastructure {`
`236`	`241`	`i.CreateInternetGateway()`
`237`	`242`	`}`
`238`	`243`	`i.AllocateAddress()`
`239`		`- i.CreateNatGateway("public")`
`240`		`- if i.NatGateway != nil && i.NatGateway.NatGatewayId != nil {`
`241`		`- WaitForNatGatewayState(i.Context, *i.NatGateway.NatGatewayId, 180, "available")`
	`244`	`+ if i.ElasticIP != nil && i.ElasticIP.AllocationId != nil {`
	`245`	`+ i.CreateNatGateway("public")`
	`246`	`+ if i.NatGateway != nil && i.NatGateway.NatGatewayId != nil {`
	`247`	`+ WaitForNatGatewayState(i.Context, *i.NatGateway.NatGatewayId, 180, "available")`
	`248`	`+ }`
`242`	`249`	`}`
`243`	`250`	`if len(i.Subnets) == 2 {`
`244`	`251`	`i.CreateRouteTable("public")`