Merge pull request openshift#8556 from cjschaef/ocpbugs-14963

OCPBUGS-14963: IBMCloud: Ignore failed VPC regions

Author: openshift-merge-bot[bot]

pkg/asset/installconfig/ibmcloud/client.go

@@ -20,6 +20,7 @@ import (
 	"github.com/IBM/platform-services-go-sdk/resourcemanagerv2"
 	"github.com/IBM/vpc-go-sdk/vpcv1"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 
 	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/installer/pkg/asset/installconfig/ibmcloud/responses"
@@ -581,8 +582,13 @@ func (c *Client) GetVPC(ctx context.Context, vpcID string) (*vpcv1.VPC, error) {
 		}
 
 		if vpc, detailedResponse, err := c.vpcAPI.GetVPC(c.vpcAPI.NewGetVPCOptions(vpcID)); err != nil {
-			if detailedResponse.GetStatusCode() != http.StatusNotFound {
-				return nil, err
+			if detailedResponse != nil {
+				// If the response code signifies the VPC was not found, simply move on to the next region; otherwise we log the response
+				if detailedResponse.GetStatusCode() != http.StatusNotFound {
+					logrus.Warnf("Unexpected response while checking VPC %s in %s region: %s", vpcID, *region.Name, detailedResponse)
+				}
+			} else {
+				logrus.Warnf("Failure collecting VPC %s in %s: %q", vpcID, *region.Name, err)
 			}
 		} else if vpc != nil {
 			return vpc, nil
@@ -629,10 +635,14 @@ func (c *Client) GetVPCByName(ctx context.Context, vpcName string) (*vpcv1.VPC,
 			return nil, fmt.Errorf("failed to set vpc api service url: %w", err)
 		}
 
-		vpcs, detailedResponse, err := c.vpcAPI.ListVpcsWithContext(ctx, c.vpcAPI.NewListVpcsOptions())
-		if err != nil {
-			if detailedResponse.GetStatusCode() != http.StatusNotFound {
-				return nil, err
+		if vpcs, detailedResponse, err := c.vpcAPI.ListVpcsWithContext(ctx, c.vpcAPI.NewListVpcsOptions()); err != nil {
+			if detailedResponse != nil {
+				// If the response code signifies no VPCs were not found, we simply move on to the next region; otherwise log the response
+				if detailedResponse.GetStatusCode() != http.StatusNotFound {
+					logrus.Warnf("Unexpected response while checking %s region: %s", *region.Name, detailedResponse)
+				}
+			} else {
+				logrus.Warnf("Failure collecting VPCs in %s: %q", *region.Name, err)
 			}
 		} else {
 			for _, vpc := range vpcs.Vpcs {

pkg/asset/installconfig/ibmcloud/metadata.go

@@ -173,6 +173,9 @@ func (m *Metadata) IsVPCPermittedNetwork(ctx context.Context, vpcName string) (b
 	}
 
 	vpc, err := client.GetVPCByName(ctx, vpcName)
+	if err != nil {
+		return false, err
+	}
 	for _, network := range networks {
 		if network == *vpc.CRN {
 			return true, nil