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

catch add trsuted domain error

Browse Source 
[ZITADOPER-07]
This commit is contained in:
Haim Kortovich
2024-12-30 14:42:22 -05:00
parent 996a74f752
commit d9cc13459d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -512,7 +512,9 @@ func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zita
Domain: strings.Split(zitadel.Spec.SMTPConfig.SenderAddress, "@")[1], Domain: strings.Split(zitadel.Spec.SMTPConfig.SenderAddress, "@")[1],
}) })
if err != nil { if err != nil {
return ctrl.Result{}, err if !strings.Contains(err.Error(), "AlreadyExists") {
return ctrl.Result{}, fmt.Errorf("Could add smtp trusted domain: %v", err)
}
} }
var smtpId string var smtpId string
resp, err := adminClient.GetSMTPConfig(ctx, &adm.GetSMTPConfigRequest{}) resp, err := adminClient.GetSMTPConfig(ctx, &adm.GetSMTPConfigRequest{})
@@ -600,7 +602,7 @@ func (r *ZitadelClusterReconciler) reconcileDomainPolicy(ctx context.Context, zi
ValidateOrgDomains: zitadel.Spec.DomainSettings.ValidateOrgDomains, ValidateOrgDomains: zitadel.Spec.DomainSettings.ValidateOrgDomains,
SmtpSenderAddressMatchesInstanceDomain: zitadel.Spec.DomainSettings.SMTPSenderAddressMatchesInstanceDomain, SmtpSenderAddressMatchesInstanceDomain: zitadel.Spec.DomainSettings.SMTPSenderAddressMatchesInstanceDomain,
}); err != nil { }); err != nil {
if !strings.Contains(err.Error(), "AlreadyExists") { if !strings.Contains(err.Error(), "not been changed") {
return ctrl.Result{}, fmt.Errorf("Could not update domain policy config: %v", err) return ctrl.Result{}, fmt.Errorf("Could not update domain policy config: %v", err)
} }
} }