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

add domain instead of trusted domain

Browse Source 
[ZITADOPER-7]
This commit is contained in:
Haim Kortovich
2024-12-31 16:44:00 -05:00
parent 1b0f581712
commit 35999b45b7
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -510,18 +510,32 @@ func (r *ZitadelClusterReconciler) reconcileDefaultInstance(ctx context.Context,
} }
func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zitadel *zitadelv1alpha1.ZitadelCluster) (ctrl.Result, error) { func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zitadel *zitadelv1alpha1.ZitadelCluster) (ctrl.Result, error) {
adminClient, err := zitadelClient.NewAdminClient(ctx, zitadel, *r.RefResolver) privateKeyData, err := r.RefResolver.SecretKeyRef(ctx, corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: systemapiaccount.SystemAPIAccountName(zitadel)}, Key: systemapiaccount.Key}, zitadel.Namespace)
if err != nil { if err != nil {
return ctrl.Result{}, err return ctrl.Result{}, err
} }
_, err = adminClient.AddInstanceTrustedDomain(ctx, &adm.AddInstanceTrustedDomainRequest{ ztdClient, err := system.NewClient(ctx, GetIssuer(zitadel), GetAPI(zitadel), system.JWTProfileFromKey([]byte(privateKeyData), masterkey.OwnerName), system.WithInsecure())
if err != nil {
return ctrl.Result{}, fmt.Errorf("Error creating sytem client: %v", err)
}
defer ztdClient.Connection.Close()
_, err = ztdClient.AddDomain(ctx, &pb.AddDomainRequest{
Domain: strings.Split(zitadel.Spec.SMTPConfig.SenderAddress, "@")[1], Domain: strings.Split(zitadel.Spec.SMTPConfig.SenderAddress, "@")[1],
InstanceId: zitadel.Status.DefaultInstanceId,
}) })
if err != nil { if err != nil {
if !strings.Contains(err.Error(), "AlreadyExists") { if !strings.Contains(err.Error(), "AlreadyExists") {
return ctrl.Result{}, fmt.Errorf("Could add smtp trusted domain: %v", err) return ctrl.Result{}, fmt.Errorf("Could add smtp trusted domain: %v", err)
} }
} }
adminClient, err := zitadelClient.NewAdminClient(ctx, zitadel, *r.RefResolver)
if err != nil {
return ctrl.Result{}, err
}
defer adminClient.Connection.Close()
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") {