Deduplicate

Author: eberlep

api/v1/postgres_types.go

@@ -624,6 +624,14 @@ func (p *Postgres) generateDatabaseName() string {
 	return generatedDatabaseName
 }
 
+// ToReadWriteHostsList Force Patroni to add target_session_attrs=read-write by providing a comma separated list (with the same IP...).
+// This hopefully prevents cascading replicating by preventing the standby leader pod of the standby cluster to
+// connect to a read-only pod in the primary cluster (which would break our sync replication to the standby cluster).
+// https://patroni.readthedocs.io/en/latest/standby_cluster.html
+func (p *Postgres) ToReadWriteHostsList() string {
+	return strings.Join([]string{p.Spec.PostgresConnection.ConnectionIP, p.Spec.PostgresConnection.ConnectionIP}, ",")
+}
+
 func (p *Postgres) ToPeripheralResourceNamespace() string {
 	// We only want letters and numbers
 	projectID := alphaNumericRegExp.ReplaceAllString(p.Spec.ProjectID, "")
@@ -789,13 +797,7 @@ func (p *Postgres) ToUnstructuredZalandoPostgresql(z *zalando.Postgresql, c *cor
 		z.Spec.StandbyCluster = nil
 	} else {
 		// overwrite connection info
-
-		// Force Patroni to add target_session_attrs=read-write by providing a comma separated list (with the same IP...).
-		// This hopefully prevents cascading replicating by preventing the standby leader pod of the standby cluster to
-		// connect to a read-only pod in the primary cluster (which would break our sync replication to the standby cluster).
-		// https://patroni.readthedocs.io/en/latest/standby_cluster.html
-		standbyHosts := strings.Join([]string{p.Spec.PostgresConnection.ConnectionIP, p.Spec.PostgresConnection.ConnectionIP}, ",")
-
+		standbyHosts := p.ToReadWriteHostsList()
 		z.Spec.StandbyCluster = &zalando.StandbyDescription{
 			StandbyHost: standbyHosts,
 			StandbyPort: strconv.FormatInt(int64(p.Spec.PostgresConnection.ConnectionPort), 10),

controllers/postgres_controller.go

@@ -1138,13 +1138,7 @@ func (r *PostgresReconciler) checkAndUpdatePatroniReplicationConfig(log logr.Log
 			return requeueAfterReconcile, r.httpPatchPatroni(log, ctx, instance, leaderIP, nil)
 		}
 
-		// Force Patroni to add target_session_attrs=read-write by providing a comma separated list (with the same IP...).
-		// This hopefully prevents cascading replicating by preventing the standby leader pod of the standby cluster to
-		// connect to a read-only pod in the primary cluster (which would break our sync replication to the standby cluster).
-		// https://patroni.readthedocs.io/en/latest/standby_cluster.html
-		standbyHosts := strings.Join([]string{instance.Spec.PostgresConnection.ConnectionIP, instance.Spec.PostgresConnection.ConnectionIP}, ",")
-
-		if resp.StandbyCluster.Host != standbyHosts {
+		if resp.StandbyCluster.Host != instance.ToReadWriteHostsList() {
 			log.V(debugLogLevel).Info("host mismatch, updating and requeing", "updating", resp)
 			return requeueAfterReconcile, r.httpPatchPatroni(log, ctx, instance, leaderIP, nil)
 		}
@@ -1260,7 +1254,7 @@ func (r *PostgresReconciler) httpPatchPatroni(log logr.Logger, ctx context.Conte
 		// This hopefully prevents cascading replicating by preventing the standby leader pod of the standby cluster to
 		// connect to a read-only pod in the primary cluster (which would break our sync replication to the standby cluster).
 		// https://patroni.readthedocs.io/en/latest/standby_cluster.html
-		standbyHosts := strings.Join([]string{instance.Spec.PostgresConnection.ConnectionIP, instance.Spec.PostgresConnection.ConnectionIP}, ",")
+		standbyHosts := instance.ToReadWriteHostsList()
 
 		request = PatroniConfig{
 			StandbyCluster: &PatroniStandbyCluster{