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

remove transaction duration

Browse Source 
[ZITADOPER-7]
This commit is contained in:
Haim Kortovich
2024-12-31 17:31:26 -05:00
parent 35999b45b7
commit 566290b6b1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -519,9 +519,9 @@ func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zita
return ctrl.Result{}, fmt.Errorf("Error creating sytem client: %v", err) return ctrl.Result{}, fmt.Errorf("Error creating sytem client: %v", err)
} }
defer ztdClient.Connection.Close() defer ztdClient.Connection.Close()
_, domain, _ := strings.Cut(zitadel.Spec.SMTPConfig.SenderAddress, "@")
_, err = ztdClient.AddDomain(ctx, &pb.AddDomainRequest{ _, err = ztdClient.AddDomain(ctx, &pb.AddDomainRequest{
Domain: strings.Split(zitadel.Spec.SMTPConfig.SenderAddress, "@")[1], Domain: domain,
InstanceId: zitadel.Status.DefaultInstanceId, InstanceId: zitadel.Status.DefaultInstanceId,
}) })
if err != nil { if err != nil {
@@ -536,6 +536,10 @@ func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zita
} }
defer adminClient.Connection.Close() defer adminClient.Connection.Close()
_, err = adminClient.AddInstanceTrustedDomain(ctx, &adm.AddInstanceTrustedDomainRequest{
Domain: domain,
})
resp, err := adminClient.GetEmailProvider(ctx, &adm.GetEmailProviderRequest{}) resp, err := adminClient.GetEmailProvider(ctx, &adm.GetEmailProviderRequest{})
if err != nil { if err != nil {
if strings.Contains(err.Error(), "not found") { if strings.Contains(err.Error(), "not found") {

4
src/pkg/builder/deployment_builder.go
View File

@@ -134,10 +134,6 @@ func (b *Builder) buildDepContainers(zitadel *zitadelv1alpha1.ZitadelCluster) *[
Name: "ZITADEL_DATABASE_COCKROACH_USER_SSL_KEY", Name: "ZITADEL_DATABASE_COCKROACH_USER_SSL_KEY",
Value: "/certs/tls.key", Value: "/certs/tls.key",
}, },
{
Name: "ZITADEL_PROJECTIONS_TRANSACTIONDURATION",
Value: "0",
},
}, },
Ports: []corev1.ContainerPort{ Ports: []corev1.ContainerPort{
{Name: deployment.ZitadelName, ContainerPort: deployment.ZitadelPort}, {Name: deployment.ZitadelName, ContainerPort: deployment.ZitadelPort},