Skip to content

Commit fde543c

Browse files
committed
feat: Support IPV6 only K8s clusters
1 parent bb8a935 commit fde543c

3 files changed

Lines changed: 22 additions & 0 deletions

File tree

stackgres-k8s/e2e/spec/dbops-security-upgrade

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ e2e_test_install() {
2828
VERSION_AS_NUMBER_1_15_0="$(get_version_as_number 1.15.0-SNAPSHOT)"
2929
VERSION_AS_NUMBER_1_16_0="$(get_version_as_number 1.16.0-SNAPSHOT)"
3030
VERSION_AS_NUMBER_1_17_0="$(get_version_as_number 1.17.0-SNAPSHOT)"
31+
VERSION_AS_NUMBER_1_18_0="$(get_version_as_number 1.18.0-SNAPSHOT)"
3132

3233
CLUSTER_CRD="sgclusters.stackgres.io"
3334

@@ -849,6 +850,13 @@ check_cluster_before_security_upgrade() {
849850
| del(.postgresql.parameters.ssl_key_file)
850851
')"
851852
fi
853+
if [ "$PREVIOUS_VERSION_AS_NUMBER" -lt "$VERSION_AS_NUMBER_1_18_0" ]
854+
then
855+
PREVIOUS_PATRONI_CONFIG="$(printf '%s' "$PREVIOUS_PATRONI_CONFIG" | jq -Sc '.
856+
| .postgresql.parameters.listen_addresses = "localhost,::1"
857+
| .postgresql.pg_hba = (.postgresql.pg_hba|[.[0:5][], "host all all ::/0 md5", .[5:][], "host replication replicator ::/0 md5"])
858+
')"
859+
fi
852860
853861
if [ "$PATRONI_CONFIG" = "$PREVIOUS_PATRONI_CONFIG" ]
854862
then
@@ -874,6 +882,13 @@ check_cluster_before_security_upgrade() {
874882
| sed '/server_check_query = ;/d' \
875883
| sed 's/stats_users = /server_check_query = ;\nstats_users = /' > "$LOG_PATH/previous-pgbouncer-config-filtered.ini"
876884
PREVIOUS_PGBOUNCER_CONFIG="$(cat "$LOG_PATH/previous-pgbouncer-config-filtered.ini")"
885+
if [ "$PREVIOUS_VERSION_AS_NUMBER" -lt "$VERSION_AS_NUMBER_1_18_0" ]
886+
then
887+
PGBOUNCER_CONFIG="$(printf '%s' "$PGBOUNCER_CONFIG" \
888+
| sed "s/listen_addr = [\"']\?127\.0\.0\.1.*/listen_addr = 127.0.0.1,::1/")"
889+
PREVIOUS_PGBOUNCER_CONFIG="$(printf '%s' "$PREVIOUS_PGBOUNCER_CONFIG" \
890+
| sed "s/listen_addr = [\"']\?127\.0\.0\.1.*/listen_addr = 127.0.0.1,::1/")"
891+
fi
877892
878893
if [ "$PGBOUNCER_CONFIG" = "$PREVIOUS_PGBOUNCER_CONFIG" ]
879894
then

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsFlunetdConfigMap.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,11 @@ private String getFluentdConfig(final StackGresDistributedLogsContext distribute
9898
+ " bind 0.0.0.0\n"
9999
+ " port " + DistributedLogsCluster.FORWARD_PORT + "\n"
100100
+ " </source>\n"
101+
+ " <source>\n"
102+
+ " @type forward\n"
103+
+ " bind \"::\"\n"
104+
+ " port " + DistributedLogsCluster.FORWARD_PORT + "\n"
105+
+ " </source>\n"
101106
+ "\n"
102107
+ " <filter *.*.*.*.*>\n"
103108
+ " @type record_transformer\n"

stackgres-k8s/src/operator/src/main/resources/webconsole/stackgres-restapi.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ server {
88
server_name localhost;
99

1010
listen 9080;
11+
listen [::]:9080;
1112
listen 9443 ssl http2;
13+
listen [::]:9443 ssl http2;
1214
ssl_certificate /etc/operator/certs/tls.crt;
1315
ssl_certificate_key /etc/operator/certs/tls.key;
1416
ssl_protocols TLSv1.2 TLSv1.3;

0 commit comments

Comments
 (0)