Update service instance delete to handle timeout error from contactin…

…g the broker

pkg/controller/controller.go

@@ -714,7 +714,7 @@ func (c *controller) getAuthCredentialsFromClusterServiceBroker(broker *v1beta1.
 			BearerConfig: bearerConfig,
 		}, nil
 	}
-	return nil, fmt.Errorf("empty auth info or unsupported auth mode: %s", authInfo)
+	return nil, fmt.Errorf("empty auth info or unsupported auth mode: %v", authInfo)
 }
 
 // getAuthCredentialsFromServiceBroker returns the auth credentials, if any, or
@@ -752,7 +752,7 @@ func (c *controller) getAuthCredentialsFromServiceBroker(broker *v1beta1.Service
 			BearerConfig: bearerConfig,
 		}, nil
 	}
-	return nil, fmt.Errorf("empty auth info or unsupported auth mode: %s", authInfo)
+	return nil, fmt.Errorf("empty auth info or unsupported auth mode: %v", authInfo)
 }
 
 func getBasicAuthConfig(secret *corev1.Secret) (*osb.BasicAuthConfig, error) {

pkg/controller/controller_instance.go

@@ -22,6 +22,7 @@ import (
 	"net/url"
 	"sync"
 	"time"
+	"strings"
 
 	osb "github.com/pmorie/go-open-service-broker-client/v2"
 	"k8s.io/klog"
@@ -937,6 +938,16 @@ func (c *controller) reconcileServiceInstanceDelete(instance *v1beta1.ServiceIns
 			`Error deprovisioning, %s at ClusterServiceBroker %q: %v`,
 			prettyName, brokerName, err,
 		)
+		// If this is a timeout error, that means we have difficulty contacting the broker, we should
+		// still mark the instance as deleted in this case
+		if strings.Contains(err.Error(), "connect: connection timed out") {
+			klog.V(4).Info(pcb.Message("DeprovisionInstance call errored because of timeout; still process deprovision as successful"))
+			if response.Async {
+				return c.processDeprovisionAsyncResponse(instance, response)
+			}
+			return c.processDeprovisionSuccess(instance)
+		}
+
 		if httpErr, ok := osb.IsHTTPError(err); ok {
 			msg = fmt.Sprintf("Deprovision call failed; received error response from broker: %v", httpErr)
 		}