software-engineering/zitadel-k8s-operator
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix error message handling activating smtp

Browse Source 
[ZITADOPER-7]
This commit is contained in:
Haim Kortovich
2024-12-31 11:07:42 -05:00
parent 17241dfa4f
commit 4295fb70d8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal/controller/zitadelcluster_controller.go
View File

@@ -584,8 +584,10 @@ func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zita
if _, err := adminClient.ActivateSMTPConfig(ctx, &adm.ActivateSMTPConfigRequest{ if _, err := adminClient.ActivateSMTPConfig(ctx, &adm.ActivateSMTPConfigRequest{
Id: smtpId, Id: smtpId,
}); err != nil { }); err != nil {
if !strings.Contains(err.Error(), "AlreadyActive") {
return ctrl.Result{}, fmt.Errorf("Error activating SMTP config: %v", err) return ctrl.Result{}, fmt.Errorf("Error activating SMTP config: %v", err)
} }
}
patch := client.MergeFrom(zitadel.DeepCopy()) patch := client.MergeFrom(zitadel.DeepCopy())
zitadel.Status.SMTPProviderId = smtpId zitadel.Status.SMTPProviderId = smtpId
return ctrl.Result{}, r.Status().Patch(ctx, zitadel, patch) return ctrl.Result{}, r.Status().Patch(ctx, zitadel, patch)