Skip to content

Commit 04bcfe6

Browse files
committed
Golangci-lint update (nilerr linter)
internal/controller/postgrescluster/patroni.go:274:4: error is nil but it returns error (nilerr) return custom, err ^ internal/controller/postgrescluster/patroni.go:334:3: error is nil but it returns error (nilerr) return intent, err
1 parent 9999c90 commit 04bcfe6

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

internal/controller/postgrescluster/patroni.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,7 @@ func (r *Reconciler) reconcileReplicationSecret(
270270
}}
271271
err := errors.WithStack(r.Client.Get(ctx,
272272
client.ObjectKeyFromObject(custom), custom))
273-
if err == nil {
274-
return custom, err
275-
}
276-
return nil, err
273+
return custom, err
277274
}
278275

279276
existing := &corev1.Secret{ObjectMeta: naming.ReplicationClientCertSecret(cluster)}
@@ -330,10 +327,7 @@ func (r *Reconciler) reconcileReplicationSecret(
330327
if err == nil {
331328
err = errors.WithStack(r.apply(ctx, intent))
332329
}
333-
if err == nil {
334-
return intent, err
335-
}
336-
return nil, err
330+
return intent, err
337331
}
338332

339333
// replicationCertSecretProjection returns a secret projection of the postgrescluster's

0 commit comments

Comments
 (0)