From a9ffb7c35c3d42213067ee825d613bfee91b9678 Mon Sep 17 00:00:00 2001 From: Haim Kortovich Date: Thu, 16 May 2024 19:16:15 -0500 Subject: [PATCH] handle user not found [ZITADOPER-1] --- .../controller/zitadelcluster_controller.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/internal/controller/zitadelcluster_controller.go b/src/internal/controller/zitadelcluster_controller.go index 5ab9e44..2889229 100644 --- a/src/internal/controller/zitadelcluster_controller.go +++ b/src/internal/controller/zitadelcluster_controller.go @@ -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)), }) 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 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) } } + { + 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