diff --git a/src/internal/controller/zitadelcluster_controller.go b/src/internal/controller/zitadelcluster_controller.go index 1cec4b6..06a1947 100644 --- a/src/internal/controller/zitadelcluster_controller.go +++ b/src/internal/controller/zitadelcluster_controller.go @@ -519,9 +519,9 @@ func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zita return ctrl.Result{}, fmt.Errorf("Error creating sytem client: %v", err) } defer ztdClient.Connection.Close() - + _, domain, _ := strings.Cut(zitadel.Spec.SMTPConfig.SenderAddress, "@") _, err = ztdClient.AddDomain(ctx, &pb.AddDomainRequest{ - Domain: strings.Split(zitadel.Spec.SMTPConfig.SenderAddress, "@")[1], + Domain: domain, InstanceId: zitadel.Status.DefaultInstanceId, }) if err != nil { @@ -536,6 +536,10 @@ func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zita } defer adminClient.Connection.Close() + _, err = adminClient.AddInstanceTrustedDomain(ctx, &adm.AddInstanceTrustedDomainRequest{ + Domain: domain, + }) + resp, err := adminClient.GetEmailProvider(ctx, &adm.GetEmailProviderRequest{}) if err != nil { if strings.Contains(err.Error(), "not found") { diff --git a/src/pkg/builder/deployment_builder.go b/src/pkg/builder/deployment_builder.go index 8d88a2e..40dc694 100644 --- a/src/pkg/builder/deployment_builder.go +++ b/src/pkg/builder/deployment_builder.go @@ -134,10 +134,6 @@ func (b *Builder) buildDepContainers(zitadel *zitadelv1alpha1.ZitadelCluster) *[ Name: "ZITADEL_DATABASE_COCKROACH_USER_SSL_KEY", Value: "/certs/tls.key", }, - { - Name: "ZITADEL_PROJECTIONS_TRANSACTIONDURATION", - Value: "0", - }, }, Ports: []corev1.ContainerPort{ {Name: deployment.ZitadelName, ContainerPort: deployment.ZitadelPort},