Skip to content

Commit ff5a0fa

Browse files
committed
Merge branch 'main' into better-status-condition
2 parents 52fad45 + dddc9e2 commit ff5a0fa

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

internal/controller/user/reconcile.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -440,11 +440,11 @@ func (r *S3UserReconciler) handleUpdate(
440440
}
441441
} else {
442442
r.SetProgressingCondition(ctx,
443-
req,
444-
userResource,
445-
metav1.ConditionTrue,
446-
s3v1alpha1.Reconciling,
447-
fmt.Sprintf("The user %s will be deleted from the S3 backend, then recreated (through another reconcile), the secret %s will be kept.", userResource.Name, currentUserSecret.Name))
443+
req,
444+
userResource,
445+
metav1.ConditionTrue,
446+
s3v1alpha1.Reconciling,
447+
fmt.Sprintf("The user %s will be deleted from the S3 backend, then recreated (through another reconcile), the secret %s will be kept.", userResource.Name, currentUserSecret.Name))
448448

449449
}
450450

0 commit comments

Comments
 (0)