From baaf56b8de6d6bd7519c124c386f1785b1cb3717 Mon Sep 17 00:00:00 2001
From: Haim Kortovich <haim.kortovich@topmanage.com>
Date: Mon, 20 May 2024 20:14:34 -0500
Subject: [PATCH] Add initialAdmin to reconcile

[ZITADOPER-1]
---
 ops/chart/crds/organization-crd.yaml                          | 4 ++--
 src/api/v1alpha1/organization_types.go                        | 2 +-
 src/config/crd/bases/zitadel.topmanage.com_organizations.yaml | 4 ++--
 src/internal/controller/organization_controller.go            | 4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ops/chart/crds/organization-crd.yaml b/ops/chart/crds/organization-crd.yaml
index 10d96e5..32e6032 100644
--- a/ops/chart/crds/organization-crd.yaml
+++ b/ops/chart/crds/organization-crd.yaml
@@ -95,7 +95,7 @@ spec:
           status:
             description: OrganizationStatus defines the observed state of Organization
             properties:
-              AdminId:
+              adminId:
                 default: ""
                 type: string
               conditions:
@@ -173,7 +173,7 @@ spec:
                 default: ""
                 type: string
             required:
-            - AdminId
+            - adminId
             - orgId
             type: object
         type: object
diff --git a/src/api/v1alpha1/organization_types.go b/src/api/v1alpha1/organization_types.go
index 0a74374..d3009d3 100644
--- a/src/api/v1alpha1/organization_types.go
+++ b/src/api/v1alpha1/organization_types.go
@@ -54,7 +54,7 @@ type OrganizationStatus struct {
 	// +kubebuilder:default=""
 	OrgId string `json:"orgId"`
 	// +kubebuilder:default=""
-	AdminId string `json:"AdminId"`
+	AdminId string `json:"adminId"`
 }
 
 func (d *OrganizationStatus) SetCondition(condition metav1.Condition) {
diff --git a/src/config/crd/bases/zitadel.topmanage.com_organizations.yaml b/src/config/crd/bases/zitadel.topmanage.com_organizations.yaml
index bd29e5f..748b880 100644
--- a/src/config/crd/bases/zitadel.topmanage.com_organizations.yaml
+++ b/src/config/crd/bases/zitadel.topmanage.com_organizations.yaml
@@ -96,7 +96,7 @@ spec:
           status:
             description: OrganizationStatus defines the observed state of Organization
             properties:
-              AdminId:
+              adminId:
                 default: ""
                 type: string
               conditions:
@@ -174,7 +174,7 @@ spec:
                 default: ""
                 type: string
             required:
-            - AdminId
+            - adminId
             - orgId
             type: object
         type: object
diff --git a/src/internal/controller/organization_controller.go b/src/internal/controller/organization_controller.go
index 2bf9d0a..6b6634f 100644
--- a/src/internal/controller/organization_controller.go
+++ b/src/internal/controller/organization_controller.go
@@ -102,6 +102,10 @@ func (wr *wrappedOrganizationReconciler) Reconcile(ctx context.Context, ztdClien
 			Name:      "organization",
 			Reconcile: wr.reconcileOrg,
 		},
+		{
+			Name:      "admin",
+			Reconcile: wr.reconcileInitialAdmin,
+		},
 	}
 	for _, p := range phases {
 		err := p.Reconcile(ctx, ztdClient)