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

Fix password secret pointer

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-20 21:16:57 -05:00
parent cb6f458c86
commit d50df7fcd2
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -465,27 +465,29 @@ func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zita
Host: zitadel.Spec.SMTPConfig.Host, Host: zitadel.Spec.SMTPConfig.Host,
Id: resp.SmtpConfig.Id, Id: resp.SmtpConfig.Id,
} }
var password *string
if zitadel.Spec.SMTPConfig.User != nil && zitadel.Spec.SMTPConfig.Password != nil { if zitadel.Spec.SMTPConfig.User != nil && zitadel.Spec.SMTPConfig.Password != nil {
passwordSecret, err := r.RefResolver.SecretKeyRef(ctx, zitadel.Spec.SMTPConfig.Password.SecretKeyRef, zitadel.Namespace)
if err != nil {
return ctrl.Result{}, err
}
password = &passwordSecret
adminRequest.User = *zitadel.Spec.SMTPConfig.User adminRequest.User = *zitadel.Spec.SMTPConfig.User
} }
if zitadel.Spec.SMTPConfig.ReplyToAddress != nil { if zitadel.Spec.SMTPConfig.ReplyToAddress != nil {
adminRequest.ReplyToAddress = *zitadel.Spec.SMTPConfig.ReplyToAddress adminRequest.ReplyToAddress = *zitadel.Spec.SMTPConfig.ReplyToAddress
} }
passwordSecret, err := r.RefResolver.SecretKeyRef(ctx, zitadel.Spec.SMTPConfig.Password.SecretKeyRef, zitadel.Namespace)
if err != nil {
return ctrl.Result{}, err
}
if _, err = adminClient.UpdateSMTPConfig(ctx, adminRequest); err != nil { if _, err = adminClient.UpdateSMTPConfig(ctx, adminRequest); err != nil {
if !strings.Contains(err.Error(), "No changes") { if !strings.Contains(err.Error(), "No changes") {
return ctrl.Result{}, fmt.Errorf("Could not update SMTP config: %v", err) return ctrl.Result{}, fmt.Errorf("Could not update SMTP config: %v", err)
} }
} }
smtpId = resp.SmtpConfig.Id smtpId = resp.SmtpConfig.Id
if zitadel.Spec.SMTPConfig.Password != nil { if password != nil {
if _, err = adminClient.UpdateSMTPConfigPassword(ctx, &adm.UpdateSMTPConfigPasswordRequest{ if _, err = adminClient.UpdateSMTPConfigPassword(ctx, &adm.UpdateSMTPConfigPasswordRequest{
Password: passwordSecret, Password: *password,
}); err != nil { }); err != nil {
if !strings.Contains(err.Error(), "No changes") { if !strings.Contains(err.Error(), "No changes") {
return ctrl.Result{}, fmt.Errorf("Could not update SMTP config: %v", err) return ctrl.Result{}, fmt.Errorf("Could not update SMTP config: %v", err)