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

Handle not changed error

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-16 17:28:58 -05:00
parent ea6d3d979b
commit aa8ce7483c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -533,12 +533,15 @@ func (r *ZitadelClusterReconciler) reconcileDomainPolicy(ctx context.Context, zi
if err != nil { if err != nil {
return ctrl.Result{}, err return ctrl.Result{}, err
} }
if _, err = adminClient.UpdateDomainPolicy(ctx, &adm.UpdateDomainPolicyRequest{ if _, err = adminClient.UpdateDomainPolicy(ctx, &adm.UpdateDomainPolicyRequest{
UserLoginMustBeDomain: zitadel.Spec.DomainSettings.UserLoginMustBeDomain, UserLoginMustBeDomain: zitadel.Spec.DomainSettings.UserLoginMustBeDomain,
ValidateOrgDomains: zitadel.Spec.DomainSettings.ValidateOrgDomains, ValidateOrgDomains: zitadel.Spec.DomainSettings.ValidateOrgDomains,
SmtpSenderAddressMatchesInstanceDomain: zitadel.Spec.DomainSettings.SMTPSenderAddressMatchesInstanceDomain, SmtpSenderAddressMatchesInstanceDomain: zitadel.Spec.DomainSettings.SMTPSenderAddressMatchesInstanceDomain,
}); err != nil { }); err != nil {
return ctrl.Result{}, fmt.Errorf("Could not update domain policy config: %v", err) if !strings.Contains(err.Error(), "not been changed") {
return ctrl.Result{}, fmt.Errorf("Could not update domain policy config: %v", err)
}
} }
return ctrl.Result{}, nil return ctrl.Result{}, nil
} }