Merge pull request #63369 from desaintmartin/automated-cherry-pick-of-#61002-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #61002: IsNotFound should check ErrDefault404 and Cherry pick of #61002 on release-1.10. #61002: IsNotFound should check ErrDefault404 and

Merge pull request #63369 from desaintmartin/automated-cherry-pick-of-#61002-upstream-release-1.10
aac3c70d · Kubernetes Submit Queue · GitHub · 18f4924f · 3de57084 · aac3c70d
Unverified Commit aac3c70d authored May 08, 2018 by Kubernetes Submit Queue Committed by GitHub May 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

openstack.go pkg/cloudprovider/providers/openstack/openstack.go +11 -2

No files found.
--- a/pkg/cloudprovider/providers/openstack/openstack.go
+++ b/pkg/cloudprovider/providers/openstack/openstack.go
@@ -608,8 +608,17 @@ func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
 }
 func isNotFound(err error) bool {
-	e, ok := err.(*gophercloud.ErrUnexpectedResponseCode)
+	if _, ok := err.(gophercloud.ErrDefault404); ok {
-	return ok && e.Actual == http.StatusNotFound
+		return true
+	}
+	if errCode, ok := err.(gophercloud.ErrUnexpectedResponseCode); ok {
+		if errCode.Actual == http.StatusNotFound {
+			return true
+		}
+	}
+	return false
 }
 // Zones indicates that we support zones