Skip to content

Commit b782594

Browse files
author
Fly.io CI
committed
fix
1 parent 23c9ae0 commit b782594

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

internal/controller/postgrescluster/controller.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,16 +138,16 @@ func (r *Reconciler) Reconcile(
138138

139139
// Check for and handle deletion of cluster. Return early if it is being
140140
// deleted or there was an error.
141-
if result, err := r.handleDelete(ctx, cluster); err != nil {
142-
span.RecordError(err)
143-
log.Error(err, "deleting")
144-
return runtime.ErrorWithBackoff(err)
141+
if deleteResult, deleteErr := r.handleDelete(ctx, cluster); deleteErr != nil {
142+
span.RecordError(deleteErr)
143+
log.Error(deleteErr, "deleting")
144+
return runtime.ErrorWithBackoff(deleteErr)
145145

146-
} else if result != nil {
146+
} else if deleteResult != nil {
147147
if log := log.V(1); log.Enabled() {
148-
log.Info("deleting", "result", fmt.Sprintf("%+v", *result))
148+
log.Info("deleting", "result", fmt.Sprintf("%+v", *deleteResult))
149149
}
150-
return *result, nil
150+
return *deleteResult, nil
151151
}
152152

153153
// Perform initial validation on a cluster
@@ -194,7 +194,6 @@ func (r *Reconciler) Reconcile(
194194
monitoringSecret *corev1.Secret
195195
exporterQueriesConfig *corev1.ConfigMap
196196
exporterWebConfig *corev1.ConfigMap
197-
err error
198197
)
199198

200199
patchClusterStatus := func() error {
@@ -253,7 +252,7 @@ func (r *Reconciler) Reconcile(
253252
// Set huge_pages = try if a hugepages resource limit > 0, otherwise set "off"
254253
postgres.SetHugePages(cluster, &pgParameters)
255254

256-
result := reconcile.Result{}
255+
result = reconcile.Result{}
257256

258257
if err == nil {
259258
rootCA, err = r.reconcileRootCertificate(ctx, cluster)

0 commit comments

Comments
 (0)