make sure we use port in reconciller connection strings

Author: halkeye

pkg/controller/postgres/postgres_controller.go

@@ -5,12 +5,7 @@ import (
 	goerr "errors"
 	"fmt"
 
-	"github.com/movetokube/postgres-operator/pkg/config"
-
 	"github.com/go-logr/logr"
-	dbv1alpha1 "github.com/movetokube/postgres-operator/pkg/apis/db/v1alpha1"
-	"github.com/movetokube/postgres-operator/pkg/postgres"
-	"github.com/movetokube/postgres-operator/pkg/utils"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
@@ -21,6 +16,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
+
+	dbv1alpha1 "github.com/movetokube/postgres-operator/pkg/apis/db/v1alpha1"
+	"github.com/movetokube/postgres-operator/pkg/config"
+	"github.com/movetokube/postgres-operator/pkg/postgres"
+	"github.com/movetokube/postgres-operator/pkg/utils"
 )
 
 var log = logf.Log.WithName("controller_postgres")
@@ -34,7 +34,16 @@ func Add(mgr manager.Manager) error {
 // newReconciler returns a new reconcile.Reconciler
 func newReconciler(mgr manager.Manager) reconcile.Reconciler {
 	c := config.Get()
-	pg, err := postgres.NewPG(c.PostgresHost, c.PostgresUser, c.PostgresPass, c.PostgresPort, c.PostgresUriArgs, c.PostgresDefaultDb, c.CloudProvider, log.WithName("postgres"))
+	pg, err := postgres.NewPG(
+		fmt.Sprintf("%s:%s", c.PostgresHost, c.PostgresPort),
+		c.PostgresUser,
+		c.PostgresPass,
+		c.PostgresPort,
+		c.PostgresUriArgs,
+		c.PostgresDefaultDb,
+		c.CloudProvider,
+		log.WithName("postgres"),
+	)
 	if err != nil {
 		return nil
 	}
@@ -44,6 +53,7 @@ func newReconciler(mgr manager.Manager) reconcile.Reconciler {
 		scheme:         mgr.GetScheme(),
 		pg:             pg,
 		pgHost:         c.PostgresHost,
+		pgPort:         c.PostgresPort,
 		instanceFilter: c.AnnotationFilter,
 	}
 }
@@ -78,6 +88,7 @@ type ReconcilePostgres struct {
 	scheme         *runtime.Scheme
 	pg             postgres.PG
 	pgHost         string
+	pgPort         uint32
 	instanceFilter string
 }
 

pkg/controller/postgresuser/postgresuser_controller.go

@@ -7,13 +7,7 @@ import (
 	"fmt"
 	"text/template"
 
-	"github.com/movetokube/postgres-operator/pkg/config"
-
 	"github.com/go-logr/logr"
-	dbv1alpha1 "github.com/movetokube/postgres-operator/pkg/apis/db/v1alpha1"
-	"github.com/movetokube/postgres-operator/pkg/postgres"
-	"github.com/movetokube/postgres-operator/pkg/utils"
-
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -27,6 +21,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
+
+	dbv1alpha1 "github.com/movetokube/postgres-operator/pkg/apis/db/v1alpha1"
+	"github.com/movetokube/postgres-operator/pkg/config"
+	"github.com/movetokube/postgres-operator/pkg/postgres"
+	"github.com/movetokube/postgres-operator/pkg/utils"
 )
 
 var log = logf.Log.WithName("controller_postgresuser")
@@ -45,7 +44,16 @@ func Add(mgr manager.Manager) error {
 // newReconciler returns a new reconcile.Reconciler
 func newReconciler(mgr manager.Manager) reconcile.Reconciler {
 	c := config.Get()
-	pg, err := postgres.NewPG(c.PostgresHost, c.PostgresUser, c.PostgresPass, c.PostgresPort, c.PostgresUriArgs, c.PostgresDefaultDb, c.CloudProvider, log.WithName("postgresuser"))
+	pg, err := postgres.NewPG(
+		fmt.Sprintf("%s:%s", c.PostgresHost, c.PostgresPort),
+		c.PostgresUser,
+		c.PostgresPass,
+		c.PostgresPort,
+		c.PostgresUriArgs,
+		c.PostgresDefaultDb,
+		c.CloudProvider,
+		log.WithName("postgresuser"),
+	)
 	if err != nil {
 		return nil
 	}