Remove unnecessary abstraction

Author: LimKianAn

controllers/postgres_controller.go

@@ -138,10 +138,9 @@ func (r *PostgresReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 		log.Info("finalizer added")
 	}
 
-	// Check if zalando dependencies are installed. If not, install them.
-	if err := r.ensureZalandoDependencies(ctx, instance); err != nil {
+	if err := r.CreateOrUpdateOperator(ctx, instance); err != nil {
 		r.recorder.Eventf(instance, "Warning", "Error", "failed to install operator: %v", err)
-		return ctrl.Result{}, fmt.Errorf("error while ensuring Zalando dependencies: %w", err)
+		return ctrl.Result{}, fmt.Errorf("error while installing zalando dependencies: %w", err)
 	}
 
 	if err := r.createOrUpdateZalandoPostgresql(ctx, instance, log); err != nil {
@@ -231,15 +230,6 @@ func (r *PostgresReconciler) createOrUpdateZalandoPostgresql(ctx context.Context
 	return nil
 }
 
-// ensureZalandoDependencies makes sure Zalando resources are installed in the service-cluster.
-func (r *PostgresReconciler) ensureZalandoDependencies(ctx context.Context, p *pg.Postgres) error {
-	if err := r.InstallOrUpdateOperator(ctx, p); err != nil {
-		return fmt.Errorf("error while installing zalando dependencies: %w", err)
-	}
-
-	return nil
-}
-
 func (r *PostgresReconciler) isManagedByUs(obj *pg.Postgres) bool {
 	if obj.Spec.PartitionID != r.PartitionID {
 		return false

pkg/operatormanager/operatormanager.go

@@ -104,8 +104,8 @@ func New(CtrlClient client.Client, conf *rest.Config, fileName string, scheme *r
 	}, nil
 }
 
-// InstallOrUpdateOperator installs or updates the operator Stored in `OperatorManager`
-func (m *OperatorManager) InstallOrUpdateOperator(ctx context.Context, instance *pg.Postgres) error {
+// CreateOrUpdateOperator installs or updates the operator Stored in `OperatorManager`
+func (m *OperatorManager) CreateOrUpdateOperator(ctx context.Context, instance *pg.Postgres) error {
 	namespace := instance.ToPeripheralResourceNamespace()
 
 	// Make sure the namespace exists.