Skip to content

Commit 6ace8ab

Browse files
authored
Merge pull request #141 from cryptobioz/fix-postgresuser-getpostgrescr
fix(postgresuser): return k8s client error before annotations
2 parents 31c8947 + 639b50f commit 6ace8ab

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pkg/controller/postgresuser/postgresuser_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,11 +350,11 @@ func (r *ReconcilePostgresUser) getPostgresCR(instance *dbv1alpha1.PostgresUser)
350350
database := dbv1alpha1.Postgres{}
351351
err := r.client.Get(context.TODO(),
352352
types.NamespacedName{Namespace: instance.Namespace, Name: instance.Spec.Database}, &database)
353-
if !utils.MatchesInstanceAnnotation(database.Annotations, r.instanceFilter) {
354-
err = fmt.Errorf("database \"%s\" is not managed by this operator", database.Name)
353+
if err != nil {
355354
return nil, err
356355
}
357-
if err != nil {
356+
if !utils.MatchesInstanceAnnotation(database.Annotations, r.instanceFilter) {
357+
err = fmt.Errorf("database \"%s\" is not managed by this operator", database.Name)
358358
return nil, err
359359
}
360360
if !database.Status.Succeeded {

0 commit comments

Comments
 (0)