diff --git a/src/internal/controller/zitadelcluster_controller.go b/src/internal/controller/zitadelcluster_controller.go index f0ee8eb..5ab9e44 100644 --- a/src/internal/controller/zitadelcluster_controller.go +++ b/src/internal/controller/zitadelcluster_controller.go @@ -584,7 +584,6 @@ func (r *ZitadelClusterReconciler) reconcileInitialHumanUser(ctx context.Context adminUser, err := managementClient.GetUserByLoginNameGlobal(ctx, &management.GetUserByLoginNameGlobalRequest{ LoginName: strings.ToLower(fmt.Sprintf("%s@%s.%s", admin.AccountName, zitadel.Spec.FirstOrgName, zitadel.Spec.Host)), }) - fmt.Println(adminUser) if err != nil { return ctrl.Result{}, fmt.Errorf("Error getting admin user: %v", err) } @@ -610,6 +609,16 @@ func (r *ZitadelClusterReconciler) reconcileInitialHumanUser(ctx context.Context if err != nil { return ctrl.Result{}, fmt.Errorf("Error adding human user: %v", err) } + { + if _, err := managementClient.AddOrgMember(middleware.SetOrgID(ctx, org.Org.Id), &management.AddOrgMemberRequest{ + UserId: userid, + Roles: []string{ + "ORG_OWNER", + }, + }); err != nil { + return ctrl.Result{}, fmt.Errorf("Error adding org member: %v", err) + } + } } else { userid = adminUser.User.Id } @@ -623,16 +632,6 @@ func (r *ZitadelClusterReconciler) reconcileInitialHumanUser(ctx context.Context return ctrl.Result{}, fmt.Errorf("Error setting password for member: %v", err) } } - { - if _, err := managementClient.UpdateOrgMember(middleware.SetOrgID(ctx, org.Org.Id), &management.UpdateOrgMemberRequest{ - UserId: userid, - Roles: []string{ - "ORG_OWNER", - }, - }); err != nil { - return ctrl.Result{}, fmt.Errorf("Error adding org member: %v", err) - } - } patch := client.MergeFrom(zitadel.DeepCopy()) zitadel.Status.InitialAdminId = userid