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

Upgrade to v3 and trust smtp domain

Browse Source 
[ZITADOPER-7]
This commit is contained in:
Haim Kortovich
2024-11-14 17:07:31 -05:00
parent 8deee2bc82
commit 53f028a748
20 changed files with 155 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,11 +39,11 @@ import (
systemapiaccount "bitbucket.org/topmanage-software-engineering/zitadel-k8s-operator/src/pkg/systemapi"
zitadelClient "bitbucket.org/topmanage-software-engineering/zitadel-k8s-operator/src/pkg/zitadel"
"github.com/hashicorp/go-multierror"
"github.com/zitadel/zitadel-go/v2/pkg/client/system"
adm "github.com/zitadel/zitadel-go/v2/pkg/client/zitadel/admin"
authn "github.com/zitadel/zitadel-go/v2/pkg/client/zitadel/authn"
object "github.com/zitadel/zitadel-go/v2/pkg/client/zitadel/object"
pb "github.com/zitadel/zitadel-go/v2/pkg/client/zitadel/system"
"github.com/zitadel/zitadel-go/v3/pkg/client/system"
adm "github.com/zitadel/zitadel-go/v3/pkg/client/zitadel/admin"
authn "github.com/zitadel/zitadel-go/v3/pkg/client/zitadel/authn"
object "github.com/zitadel/zitadel-go/v3/pkg/client/zitadel/object"
pb "github.com/zitadel/zitadel-go/v3/pkg/client/zitadel/system"
appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
@@ -371,7 +371,7 @@ func (r *ZitadelClusterReconciler) reconcileDefaultInstance(ctx context.Context,
if err != nil {
return ctrl.Result{}, err
}
ztdClient, err := system.NewClient(GetIssuer(zitadel), GetAPI(zitadel), system.JWTProfileFromKey([]byte(privateKeyData), masterkey.OwnerName), system.WithInsecure())
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)
}
@@ -472,6 +472,12 @@ func (r *ZitadelClusterReconciler) reconcileSMTPConfig(ctx context.Context, zita
if err != nil {
return ctrl.Result{}, err
}
_, err = adminClient.AddInstanceTrustedDomain(ctx, &adm.AddInstanceTrustedDomainRequest{
Domain: strings.Split(zitadel.Spec.SMTPConfig.SenderAddress, "@")[1],
})
if err != nil {
return ctrl.Result{}, err
}
var smtpId string
resp, err := adminClient.GetSMTPConfig(ctx, &adm.GetSMTPConfigRequest{})
if err != nil {