Skip to content

Commit d661e84

Browse files
committed
rebased to features/database-controllers
1 parent 56ad340 commit d661e84

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

internal/controller/postgrescluster_controller.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import (
2020
"context"
2121
"errors"
2222
"fmt"
23-
"time"
24-
2523
cnpgv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
2624
enterprisev4 "github.com/splunk/splunk-operator/api/v4"
2725
corev1 "k8s.io/api/core/v1"
@@ -125,7 +123,7 @@ func (r *PostgresClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
125123
return ctrl.Result{RequeueAfter: retryDelay}, nil
126124
case err != nil:
127125
logger.Error(err, "Failed to get CNPG Cluster")
128-
r.setCondition(postgresCluster, metav1.ConditionFalse, "ClusterGetFailed", err.Error())
126+
r.setCondition(postgresCluster, "Ready", metav1.ConditionFalse, "ClusterGetFailed", err.Error())
129127
return res, err
130128
}
131129
cnpgCluster = existingCNPG
@@ -152,7 +150,7 @@ func (r *PostgresClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
152150
// 7. Reconcile ManagedRoles from PostgresCluster to CNPG Cluster
153151
if err := r.reconcileManagedRoles(ctx, postgresCluster, cnpgCluster); err != nil {
154152
logger.Error(err, "Failed to reconcile managed roles")
155-
r.setCondition(postgresCluster, metav1.ConditionFalse, "ManagedRolesFailed", err.Error())
153+
r.setCondition(postgresCluster, "Ready", metav1.ConditionFalse, "ManagedRolesFailed", err.Error())
156154
return res, err
157155
}
158156
// 7. Reconcile Connection Pooler if enabled in class
@@ -164,7 +162,7 @@ func (r *PostgresClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
164162
return res, poolerErr
165163
}
166164
if requeuePooler {
167-
return ctrl.Result{RequeueAfter: retryDelaytimer}, nil
165+
return ctrl.Result{RequeueAfter: retryDelay}, nil
168166
}
169167
// 7. Report progress back to the user and manage the reconciliation lifecycle.
170168
logger.Info("Reconciliation completed successfully", "name", postgresCluster.Name)
@@ -350,7 +348,6 @@ func (r *PostgresClusterReconciler) deleteConnectionPoolers(ctx context.Context,
350348
return nil
351349
}
352350

353-
// ensureConnectionPooler creates a CNPG Pooler resource if it doesn't exist.
354351
// ensureConnectionPooler creates a CNPG Pooler resource if it doesn't exist.
355352
func (r *PostgresClusterReconciler) ensureConnectionPooler(
356353
ctx context.Context,

0 commit comments

Comments
 (0)