Skip to content

feat: use FQDN instead of pod IP for Patroni connect_address #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
marcelozani wants to merge 1 commit into from
Closed

feat: use FQDN instead of pod IP for Patroni connect_address #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...ain/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniConfigMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,12 @@ public static String name(ClusterContext clusterContext) {
.map(Object::toString)
.orElse("60"));
data.put("PATRONI_POSTGRESQL_LISTEN", (isEnvoyDisabled ? "0.0.0.0,[::]:" : "127.0.0.1,[::1]:") + EnvoyUtil.PG_PORT);
// Use FQDN instead of POD_IP for stable node registration in Citus pg_dist_node
data.put("PATRONI_CONFIG_SERVICE_NAME", PatroniUtil.configName(cluster));
data.put("PATRONI_POD_NAMESPACE", cluster.getMetadata().getNamespace());
data.put("PATRONI_POSTGRESQL_CONNECT_ADDRESS",
"${POD_IP}:" + (isEnvoyDisabled ? EnvoyUtil.PG_PORT : EnvoyUtil.PG_REPL_ENTRY_PORT));
"${POD_NAME}.${PATRONI_CONFIG_SERVICE_NAME}.${PATRONI_POD_NAMESPACE}.svc.cluster.local:"
+ (isEnvoyDisabled ? EnvoyUtil.PG_PORT : EnvoyUtil.PG_REPL_ENTRY_PORT));

data.put("PATRONI_RESTAPI_LISTEN", "*:" + EnvoyUtil.PATRONI_PORT);
data.put("PATRONI_POSTGRESQL_DATA_DIR", ClusterPath.PG_DATA_PATH.path());
Expand Down
3 changes: 2 additions & 1 deletion .../stackgres/operator/conciliation/factory/cluster/patroni/PatroniEnvironmentVariables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@ && getPostgresFlavorComponent(cluster) == StackGresComponent.BABELFISH) {
.build(),
new EnvVarBuilder()
.withName("PATRONI_RESTAPI_CONNECT_ADDRESS")
.withValue("${POD_IP}:" + EnvoyUtil.PATRONI_PORT)
// Use FQDN instead of POD_IP for stable node registration in Citus pg_dist_node
.withValue("${POD_NAME}.${PATRONI_CONFIG_SERVICE_NAME}.${PATRONI_POD_NAMESPACE}.svc.cluster.local:" + EnvoyUtil.PATRONI_PORT)
.build());

return ImmutableList.<EnvVar>builder()
Expand Down
4 changes: 2 additions & 2 deletions stackgres-k8s/src/operator/src/main/resources/templates/start-patroni.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,15 @@ fi
- 'host replication ${PATRONI_REPLICATION_USERNAME} 0.0.0.0/0 md5'
- 'host replication ${PATRONI_REPLICATION_USERNAME} ::/0 md5'
restapi:
connect_address: '${PATRONI_KUBERNETES_POD_IP}:8008'
connect_address: '${PATRONI_RESTAPI_CONNECT_ADDRESS}'
listen: "*:8008"
postgresql:
use_slots: true
use_pg_rewind: true
remove_data_directory_on_rewind_failure: true
use_unix_socket: true
use_unix_socket_repl: true
connect_address: '${PATRONI_KUBERNETES_POD_IP}:5432'
connect_address: '${PATRONI_POSTGRESQL_CONNECT_ADDRESS}'
listen: 0.0.0.0,[::]:5432
pg_ctl_timeout: $PATRONI_PG_CTL_TIMEOUT
authentication:
Expand Down