Merge pull request #1129 from flavianmissi/OCPBUGS-42732

openshift-merge-bot[bot] · web-flow · commit dc19aa4621c6 · 2024-10-15T07:00:40.000Z
OCPBUGS-42732: pkg/storage/azure: also check for auth failure error code on deletion
diff --git a/pkg/storage/azure/azure.go b/pkg/storage/azure/azure.go
@@ -1142,7 +1142,7 @@ func (d *driver) removeStorageContainerViaTrack2SDK(cr *imageregistryv1.Config,
 	}
 	err = blobClient.DeleteStorageContainer(d.Context, d.Config.Container)
 	if err != nil {
-		if bloberror.HasCode(err, bloberror.AuthorizationPermissionMismatch) {
+		if bloberror.HasCode(err, bloberror.AuthorizationPermissionMismatch) || bloberror.HasCode(err, bloberror.AuthorizationFailure) {
 			util.UpdateCondition(cr, defaults.StorageExists, operatorapiv1.ConditionUnknown, storageExistsReasonAzureError, fmt.Sprintf("Unable to delete storage container due to delete container permission missing, trying account deletion: %s", err))
 			return false, nil
 		} else if bloberror.HasCode(err, "AccountNotFound") {

Original file line number	Diff line number	Diff line change
`@@ -1142,7 +1142,7 @@ func (d driver) removeStorageContainerViaTrack2SDK(cr imageregistryv1.Config,`
`1142`	`1142`	`}`
`1143`	`1143`	`err = blobClient.DeleteStorageContainer(d.Context, d.Config.Container)`
`1144`	`1144`	`if err != nil {`
`1145`		`- if bloberror.HasCode(err, bloberror.AuthorizationPermissionMismatch) {`
	`1145`	`+ if bloberror.HasCode(err, bloberror.AuthorizationPermissionMismatch) \|\| bloberror.HasCode(err, bloberror.AuthorizationFailure) {`
`1146`	`1146`	`util.UpdateCondition(cr, defaults.StorageExists, operatorapiv1.ConditionUnknown, storageExistsReasonAzureError, fmt.Sprintf("Unable to delete storage container due to delete container permission missing, trying account deletion: %s", err))`
`1147`	`1147`	`return false, nil`
`1148`	`1148`	`} else if bloberror.HasCode(err, "AccountNotFound") {`