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

Handle config not found

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-16 17:09:20 -05:00
parent bcdd2f2b8e
commit ea6d3d979b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,7 +192,7 @@ func (r *ZitadelClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reque
} }
if err := errBundle.ErrorOrNil(); err != nil { if err := errBundle.ErrorOrNil(); err != nil {
return ctrl.Result{RequeueAfter: 2 * time.Minute}, fmt.Errorf("error reconciling %s: %v", p.Name, err) return ctrl.Result{}, fmt.Errorf("error reconciling %s: %v", p.Name, err)
} }
} }
if !result.IsZero() { if !result.IsZero() {
@@ -464,9 +464,11 @@ func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zita
} }
resp, err := adminClient.GetSMTPConfig(ctx, &adm.GetSMTPConfigRequest{}) resp, err := adminClient.GetSMTPConfig(ctx, &adm.GetSMTPConfigRequest{})
if err != nil { if err != nil {
if !strings.Contains(err.Error(), "SMTP configuration not found") {
return ctrl.Result{}, fmt.Errorf("Error getting SMTP config: %v", err) return ctrl.Result{}, fmt.Errorf("Error getting SMTP config: %v", err)
} }
if resp.SmtpConfig != nil { }
if resp != nil {
adminRequest := &adm.UpdateSMTPConfigRequest{ adminRequest := &adm.UpdateSMTPConfigRequest{
SenderAddress: zitadel.Spec.SMTPConfig.SenderAddress, SenderAddress: zitadel.Spec.SMTPConfig.SenderAddress,
SenderName: zitadel.Spec.SMTPConfig.SenderName, SenderName: zitadel.Spec.SMTPConfig.SenderName,