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

activate smtp provider

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-20 21:05:10 -05:00
parent 554196961a
commit ebc8cb4b05
6 changed files with 47 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -450,6 +450,7 @@ func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zita
if err != nil {
return ctrl.Result{}, err
}
var smtpId string
resp, err := adminClient.GetSMTPConfig(ctx, &adm.GetSMTPConfigRequest{})
if err != nil {
if !strings.Contains(err.Error(), "SMTP configuration not found") {
@@ -462,6 +463,7 @@ func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zita
SenderName: zitadel.Spec.SMTPConfig.SenderName,
Tls: zitadel.Spec.SMTPConfig.TLS,
Host: zitadel.Spec.SMTPConfig.Host,
Id: resp.SmtpConfig.Id,
}
if zitadel.Spec.SMTPConfig.User != nil && zitadel.Spec.SMTPConfig.Password != nil {
@@ -480,6 +482,7 @@ func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zita
return ctrl.Result{}, fmt.Errorf("Could not update SMTP config: %v", err)
}
}
smtpId = resp.SmtpConfig.Id
if zitadel.Spec.SMTPConfig.Password != nil {
if _, err = adminClient.UpdateSMTPConfigPassword(ctx, &adm.UpdateSMTPConfigPasswordRequest{
Password: passwordSecret,
@@ -508,12 +511,21 @@ func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zita
adminRequest.ReplyToAddress = *zitadel.Spec.SMTPConfig.ReplyToAddress
}
if _, err = adminClient.AddSMTPConfig(ctx, adminRequest); err != nil {
addRes, err := adminClient.AddSMTPConfig(ctx, adminRequest)
if err != nil {
return ctrl.Result{}, fmt.Errorf("Could not add SMTP config: %v", err)
}
smtpId = addRes.Id
}
return ctrl.Result{}, nil
if _, err := adminClient.ActivateSMTPConfig(ctx, &adm.ActivateSMTPConfigRequest{
Id: smtpId,
}); err != nil {
return ctrl.Result{}, fmt.Errorf("Error activating SMTP config: %v", err)
}
patch := client.MergeFrom(zitadel.DeepCopy())
zitadel.Status.SMTPProviderId = smtpId
return ctrl.Result{}, r.Status().Patch(ctx, zitadel, patch)
}
func (r *ZitadelClusterReconciler) reconcileDomainPolicy(ctx context.Context, zitadel *zitadelv1alpha1.ZitadelCluster) (ctrl.Result, error) {