From b3110322d8416b4485b0714eddb57e9b65f1f076 Mon Sep 17 00:00:00 2001 From: Christian Muirhead Date: Fri, 8 Jan 2021 09:37:27 +1300 Subject: [PATCH] Continue reconciling Azure SQL managed users for unknown errors (#1336) These could be setup issues like the AAD admin not being set on the server - giving up immediately means the only way to get the user created successfully is to edit the resource to remove the finalizer, delete it, then re-add. The reconcile loop for regular users doesn't use this pattern of returning true, nil when it can't reach the server. --- .../azuresqlmanageduser/azuresqlmanageduser_reconcile.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/resourcemanager/azuresql/azuresqlmanageduser/azuresqlmanageduser_reconcile.go b/pkg/resourcemanager/azuresql/azuresqlmanageduser/azuresqlmanageduser_reconcile.go index 435437d53b8..318b73c6a75 100644 --- a/pkg/resourcemanager/azuresql/azuresqlmanageduser/azuresqlmanageduser_reconcile.go +++ b/pkg/resourcemanager/azuresql/azuresqlmanageduser/azuresqlmanageduser_reconcile.go @@ -81,9 +81,8 @@ func (s *AzureSqlManagedUserManager) Ensure(ctx context.Context, obj runtime.Obj return false, nil } - // Other failures are terminal instance.Status.SetFailedProvisioning(instance.Status.Message) - return true, nil + return false, nil } userExists, err := s.UserExists(ctx, db, requestedUsername)