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

handle user not found

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-16 19:16:15 -05:00
parent a20e056a9b
commit a9ffb7c35c
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -585,7 +585,9 @@ func (r *ZitadelClusterReconciler) reconcileInitialHumanUser(ctx context.Context
LoginName: strings.ToLower(fmt.Sprintf("%s@%s.%s", admin.AccountName, zitadel.Spec.FirstOrgName, zitadel.Spec.Host)), LoginName: strings.ToLower(fmt.Sprintf("%s@%s.%s", admin.AccountName, zitadel.Spec.FirstOrgName, zitadel.Spec.Host)),
}) })
if err != nil { if err != nil {
return ctrl.Result{}, fmt.Errorf("Error getting admin user: %v", err) if !strings.Contains(err.Error(), "could not be found") {
return ctrl.Result{}, fmt.Errorf("Error getting admin user: %v", err)
}
} }
var userid string var userid string
if adminUser.User == nil { if adminUser.User == nil {
@@ -632,6 +634,17 @@ func (r *ZitadelClusterReconciler) reconcileInitialHumanUser(ctx context.Context
return ctrl.Result{}, fmt.Errorf("Error setting password for member: %v", err) 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()) patch := client.MergeFrom(zitadel.DeepCopy())
zitadel.Status.InitialAdminId = userid zitadel.Status.InitialAdminId = userid