fix(organization): simplify Reconcile method

Author: rafalgalaw

internal/controller/organization_controller.go

@@ -46,7 +46,7 @@ type OrganizationReconciler struct {
 //+kubebuilder:rbac:groups=garm-operator.mercedes-benz.com,namespace=xxxxx,resources=organizations/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=garm-operator.mercedes-benz.com,namespace=xxxxx,resources=organizations/finalizers,verbs=update
 
-func (r *OrganizationReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+func (r *OrganizationReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.Result, retErr error) {
 	log := log.FromContext(ctx)
 
 	organizationClient := garmClient.NewOrganizationClient()
@@ -61,12 +61,6 @@ func (r *OrganizationReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		return ctrl.Result{}, err
 	}
 
-	return r.reconcile(ctx, organizationClient, organization)
-}
-
-func (r *OrganizationReconciler) reconcile(ctx context.Context, organizationClient garmClient.OrganizationClient, organization *garmoperatorv1beta1.Organization) (res ctrl.Result, retErr error) {
-	log := log.FromContext(ctx)
-
 	initialOrganization := organization.DeepCopy()
 
 	// Ignore objects that are paused

internal/controller/organization_controller_test.go

@@ -928,7 +928,9 @@ func TestOrganizationReconciler_reconcileNormal(t *testing.T) {
 			mockOrganizationClient := mock.NewMockOrganizationClient(mockCtrl)
 			tt.expectGarmRequest(mockOrganizationClient.EXPECT())
 
-			_, err = reconciler.reconcile(context.Background(), mockOrganizationClient, organization)
+			organization.InitializeConditions()
+
+			_, err = reconciler.reconcileNormal(context.Background(), mockOrganizationClient, organization)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("OrganizationReconciler.reconcileNormal() error = %v, wantErr %v", err, tt.wantErr)
 				return