Skip to content

Commit f7d4ebd

Browse files
committed
Fix: handle external database case for postgres exporter setup (#138)
1 parent 5366e6e commit f7d4ebd

1 file changed

Lines changed: 13 additions & 8 deletions

File tree

controllers/postgresservice_controller.go

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -399,15 +399,20 @@ func (r *PostgresServiceReconciler) reconcilePostgresServiceCluster(cr *qubershi
399399

400400
// configure postgres-exporter user
401401
if cr.Spec.PostgresExporter != nil && cr.Spec.PostgresExporter.Install {
402-
patroniCore, err := r.helper.GetPatroniCoreCR()
403-
if err != nil {
404-
r.logger.Error("Can't get PatroniCore CR")
405-
panic(err)
402+
skipInstall := false
403+
if cr.Spec.ExternalDataBase == nil {
404+
patroniCore, err := r.helper.GetPatroniCoreCR()
405+
if err != nil {
406+
r.logger.Error("Can't get PatroniCore CR")
407+
panic(err)
408+
}
409+
if patroniCore.Spec.Patroni.StandbyCluster != nil {
410+
r.logger.Info("PatroniCore indicates standby cluster; skipping postgres-exporter setup (read-only)")
411+
skipInstall = true
412+
}
406413
}
407-
if patroniCore.Spec.Patroni.StandbyCluster != nil {
408-
r.logger.Info("PatroniCore indicates standby cluster; skipping postgres-exporter setup (read-only)")
409-
} else {
410-
if err := postgresexporter.SetUpExporter(cr.Spec.PostgresExporter); err != nil { //REWORK
414+
if !skipInstall {
415+
if err := postgresexporter.SetUpExporter(cr.Spec.PostgresExporter); err != nil {
411416
return err
412417
}
413418
}

0 commit comments

Comments
 (0)