Merge pull request #873 from spencerhance/ilb-subnet-e2e-fix

Update CreateILBSubnet() to catch 400s as well
kubernetes · Sep 27, 2019 · 2f7515d · 2f7515d
2 parents 5bef228 + bb876b6
commit 2f7515d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/e2e/fixtures.go b/pkg/e2e/fixtures.go
@@ -275,9 +275,9 @@ func CreateILBSubnet(s *Sandbox, name string, ipCidrRange string) error {
 	klog.V(2).Infof("Creating ILB Subnet: %+v", subnet)
 	err := s.f.Cloud.BetaSubnetworks().Insert(context.Background(), meta.RegionalKey(subnet.Name, s.f.Region), subnet)
 	if err != nil {
-		// GCE returns a 409 when there is already an "ACTIVE" subnet set up for ILB
-		if utils.IsHTTPErrorCode(err, http.StatusConflict) {
-			klog.V(3).Info("ILB subnet already exists")
+		// GCE returns a 409 or 400 when there is already an subnet in the range
+		if utils.IsHTTPErrorCode(err, http.StatusConflict) || utils.IsHTTPErrorCode(err, http.StatusBadRequest) {
+			klog.V(3).Infof("Warning: ILB subnet already exists: %v", err)
 			return ErrSubnetExists
 		} else {
 			return fmt.Errorf("Error creating ILB subnet: %v", err)