postgresql-charms-single-kernel 16.3.18__tar.gz → 16.3.19__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (84) hide show
  1. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/PKG-INFO +1 -1
  2. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/pyproject.toml +3 -3
  3. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/pyproject.toml.orig +3 -3
  4. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/core/config.py +5 -3
  5. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/core/state.py +2 -2
  6. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/config.py +3 -0
  7. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/database.py +9 -7
  8. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/patroni.py +7 -2
  9. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/scripts/authorisation_rules_observer.py +1 -1
  10. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/scripts/cluster_topology_observer.py +1 -1
  11. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/templates/patroni.yml.j2 +19 -6
  12. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/utils/__init__.py +23 -2
  13. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/LICENSE +0 -0
  14. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/README.md +0 -0
  15. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/__init__.py +0 -0
  16. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/charms/__init__.py +0 -0
  17. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/charms/abstract_charm.py +0 -0
  18. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/charms/k8s_charm.py +0 -0
  19. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/charms/vm_charm.py +0 -0
  20. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/compat/__init__.py +0 -0
  21. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/compat/postgresql.py +0 -0
  22. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/compat/pyproject.toml +0 -0
  23. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/config/__init__.py +0 -0
  24. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/config/enums.py +0 -0
  25. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/config/exceptions.py +0 -0
  26. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/config/literals.py +0 -0
  27. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/config/locales.py +0 -0
  28. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/config/pyproject.toml +0 -0
  29. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/config/statuses.py +0 -0
  30. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/core/__init__.py +0 -0
  31. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/core/peer_relation.py +0 -0
  32. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/core/relation_state.py +0 -0
  33. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/core/s3.py +0 -0
  34. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/events/__init__.py +0 -0
  35. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/events/async_replication.py +0 -0
  36. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/events/backup.py +0 -0
  37. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/events/database.py +0 -0
  38. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/events/ldap.py +0 -0
  39. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/events/logical_replication.py +0 -0
  40. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/events/observer.py +0 -0
  41. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/events/postgresql.py +0 -0
  42. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/events/tls.py +0 -0
  43. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/events/tls_transfer.py +0 -0
  44. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/events/watcher.py +0 -0
  45. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/lib/charms/data_platform_libs/v0/data_interfaces.py +0 -0
  46. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/lib/charms/data_platform_libs/v0/s3.py +0 -0
  47. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/lib/charms/data_platform_libs/v1/data_models.py +0 -0
  48. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/lib/charms/glauth_k8s/v0/ldap.py +0 -0
  49. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/__init__.py +0 -0
  50. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/async_replication.py +0 -0
  51. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/backup.py +0 -0
  52. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/base.py +0 -0
  53. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/cluster.py +0 -0
  54. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/k8s.py +0 -0
  55. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/logical_replication.py +0 -0
  56. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/observer.py +0 -0
  57. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/raft.py +0 -0
  58. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/refresh.py +0 -0
  59. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/restore.py +0 -0
  60. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/managers/tls.py +0 -0
  61. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/scripts/raft_observer.py +0 -0
  62. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/scripts/rotate_logs.py +0 -0
  63. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/templates/__init__.py +0 -0
  64. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/templates/k8s/pgbackrest.conf.j2 +0 -0
  65. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/templates/k8s/pgbackrest.logrotate.j2 +0 -0
  66. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/templates/vm/pgbackrest.conf.j2 +0 -0
  67. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/templates/vm/pgbackrest.logrotate.j2 +0 -0
  68. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/templates/vm/raft-observer.service.j2 +0 -0
  69. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/templates/vm/raft-observer.timer.j2 +0 -0
  70. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/utils/arch.py +0 -0
  71. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/utils/backup.py +0 -0
  72. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/utils/filesystem.py +0 -0
  73. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/utils/postgresql.py +0 -0
  74. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/utils/s3.py +0 -0
  75. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/utils/secret.py +0 -0
  76. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/utils/status.py +0 -0
  77. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/workload/__init__.py +0 -0
  78. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/workload/base.py +0 -0
  79. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/workload/k8s.py +0 -0
  80. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/workload/paths/__init__.py +0 -0
  81. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/workload/paths/base.py +0 -0
  82. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/workload/paths/k8s.py +0 -0
  83. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/workload/paths/vm.py +0 -0
  84. {postgresql_charms_single_kernel-16.3.18 → postgresql_charms_single_kernel-16.3.19}/single_kernel_postgresql/workload/vm.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: postgresql-charms-single-kernel
3
- Version: 16.3.18
3
+ Version: 16.3.19
4
4
  Summary: Shared and reusable code for PostgreSQL-related charms
5
5
  Author: Canonical Data Platform
6
6
  Author-email: Canonical Data Platform <data-platform@lists.launchpad.net>
@@ -1,7 +1,7 @@
1
1
  [project]
2
2
  name = "postgresql-charms-single-kernel"
3
3
  description = "Shared and reusable code for PostgreSQL-related charms"
4
- version = "16.3.18"
4
+ version = "16.3.19"
5
5
  readme = "README.md"
6
6
  classifiers = [
7
7
  "Development Status :: 3 - Alpha",
@@ -158,10 +158,10 @@ exclude = [
158
158
  ]
159
159
 
160
160
  [dependency-groups]
161
- format = ["ruff==0.16.10"]
161
+ format = ["ruff==0.17.0"]
162
162
  lint = [
163
163
  "codespell==2.4.3",
164
- "ty==0.0.84",
164
+ "ty==0.0.86",
165
165
  ]
166
166
  unit = [
167
167
  "coverage[toml]==7.16.2",
@@ -4,7 +4,7 @@
4
4
  [project]
5
5
  name = "postgresql-charms-single-kernel"
6
6
  description = "Shared and reusable code for PostgreSQL-related charms"
7
- version = "16.3.18"
7
+ version = "16.3.19"
8
8
  readme = "README.md"
9
9
  license = {file = "LICENSE"}
10
10
  authors = [
@@ -64,11 +64,11 @@ module-root = ""
64
64
 
65
65
  [dependency-groups]
66
66
  format = [
67
- "ruff==0.16.10"
67
+ "ruff==0.17.0"
68
68
  ]
69
69
  lint = [
70
70
  "codespell==2.4.3",
71
- "ty==0.0.84"
71
+ "ty==0.0.86"
72
72
  ]
73
73
  unit = [
74
74
  "coverage[toml]==7.16.2",
@@ -262,6 +262,8 @@ class K8SCharmConfig(CharmConfig):
262
262
  locales the K8s rock provides and the VM snap does not (``C.utf8``, ``POSIX``).
263
263
  """
264
264
 
265
- response_lc_monetary: K8S_LOCALES | None = Field(default=None)
266
- response_lc_numeric: K8S_LOCALES | None = Field(default=None)
267
- response_lc_time: K8S_LOCALES | None = Field(default=None)
265
+ # Intentional widening: the K8s rock also ships C.utf8 and POSIX (see locales.py).
266
+ # ty flags literal-set expansion as invalid-attribute-override; pydantic handles it.
267
+ response_lc_monetary: K8S_LOCALES | None = Field(default=None) # ty: ignore[invalid-attribute-override]
268
+ response_lc_numeric: K8S_LOCALES | None = Field(default=None) # ty: ignore[invalid-attribute-override]
269
+ response_lc_time: K8S_LOCALES | None = Field(default=None) # ty: ignore[invalid-attribute-override]
@@ -43,7 +43,7 @@ from single_kernel_postgresql.lib.charms.data_platform_libs.v0.data_interfaces i
43
43
  DataPeerUnitData,
44
44
  )
45
45
  from single_kernel_postgresql.lib.charms.data_platform_libs.v0.s3 import S3Requirer
46
- from single_kernel_postgresql.utils import unit_name_to_pod_name
46
+ from single_kernel_postgresql.utils import bracket_ipv6_host, unit_name_to_pod_name
47
47
  from single_kernel_postgresql.utils.secret import translate_field_to_secret_key
48
48
  from single_kernel_postgresql.utils.status import format_status
49
49
 
@@ -239,7 +239,7 @@ class CharmState(Object):
239
239
  @cached_property
240
240
  def patroni_url(self) -> str:
241
241
  """Patroni REST API URL."""
242
- return f"https://{self.endpoint}:8008"
242
+ return f"https://{bracket_ipv6_host(self.endpoint)}:8008"
243
243
 
244
244
  @property
245
245
  def peer_members_ips(self) -> set[str]:
@@ -735,6 +735,9 @@ class ConfigManager(BaseManager):
735
735
  "listen_ips": self.state.listen_ips,
736
736
  "raft_password": self.state.application.raft_password,
737
737
  "watcher": watcher_raft_address,
738
+ "watcher_addr": watcher_raft_address.rsplit(":", 1)[0]
739
+ if watcher_raft_address
740
+ else None,
738
741
  "pg_cron_available": "pg_cron" in snap_libraries,
739
742
  "shared_preload_libraries": ",".join(
740
743
  library for library in SHARED_PRELOAD_LIBRARIES if library in snap_libraries
@@ -35,7 +35,7 @@ from single_kernel_postgresql.lib.charms.data_platform_libs.v0.data_interfaces i
35
35
  )
36
36
  from single_kernel_postgresql.managers.base import BaseManager
37
37
  from single_kernel_postgresql.managers.patroni import ClusterMember
38
- from single_kernel_postgresql.utils import label2name, new_password
38
+ from single_kernel_postgresql.utils import bracket_ipv6_host, label2name, new_password
39
39
  from single_kernel_postgresql.utils.postgresql import (
40
40
  ACCESS_GROUP_RELATION,
41
41
  ACCESS_GROUPS,
@@ -441,21 +441,23 @@ class DatabaseManager(BaseManager):
441
441
  # A stale leader unit without a peer address publishes "None:5432",
442
442
  # as the charm did.
443
443
  primary_unit_ip = self.state.unit_database_address(unit, self.relation_name)
444
- rw_endpoint = f"{primary_unit_ip}:{DATABASE_PORT}"
444
+ rw_endpoint = f"{bracket_ipv6_host(primary_unit_ip)}:{DATABASE_PORT}"
445
445
  else:
446
446
  replica_ip = self.state.unit_database_address(unit, self.relation_name)
447
447
  if not replica_ip:
448
448
  continue
449
449
  if ro_hosts:
450
- ro_hosts = f"{ro_hosts},{replica_ip}"
451
- ro_endpoints = f"{ro_endpoints},{replica_ip}:{DATABASE_PORT}"
450
+ ro_hosts = f"{ro_hosts},{bracket_ipv6_host(replica_ip)}"
451
+ ro_endpoints = (
452
+ f"{ro_endpoints},{bracket_ipv6_host(replica_ip)}:{DATABASE_PORT}"
453
+ )
452
454
  else:
453
- ro_hosts = replica_ip
454
- ro_endpoints = f"{replica_ip}:{DATABASE_PORT}"
455
+ ro_hosts = bracket_ipv6_host(replica_ip) or ""
456
+ ro_endpoints = f"{bracket_ipv6_host(replica_ip)}:{DATABASE_PORT}"
455
457
  if not ro_hosts and primary_unit_ip:
456
458
  # If there are no replicas, fallback to primary
457
459
  ro_endpoints = rw_endpoint
458
- ro_hosts = primary_unit_ip
460
+ ro_hosts = bracket_ipv6_host(primary_unit_ip) or ""
459
461
  return rw_endpoint, ro_endpoints, ro_hosts
460
462
 
461
463
  def _k8s_endpoints(self) -> tuple[str, str, str]:
@@ -60,7 +60,12 @@ from single_kernel_postgresql.config.literals import (
60
60
  from single_kernel_postgresql.config.statuses import GeneralStatuses
61
61
  from single_kernel_postgresql.core.state import CharmState
62
62
  from single_kernel_postgresql.managers.base import BaseManager
63
- from single_kernel_postgresql.utils import _change_owner, label2name, parallel_patroni_get_request
63
+ from single_kernel_postgresql.utils import (
64
+ _change_owner,
65
+ bracket_ipv6_host,
66
+ label2name,
67
+ parallel_patroni_get_request,
68
+ )
64
69
  from single_kernel_postgresql.workload.base import BaseWorkload
65
70
 
66
71
  logger = logging.getLogger(__name__)
@@ -852,7 +857,7 @@ class PatroniManager(BaseManager):
852
857
  for attempt in Retrying(stop=stop_after_delay(10), wait=wait_fixed(1)):
853
858
  with attempt:
854
859
  r = requests.get(
855
- f"https://{self.state.primary_endpoint}:8008/health",
860
+ f"https://{bracket_ipv6_host(self.state.primary_endpoint)}:8008/health",
856
861
  verify=self.verify,
857
862
  auth=self._patroni_auth,
858
863
  timeout=API_REQUEST_TIMEOUT,
@@ -34,7 +34,7 @@ async def _httpx_get_request(url: str):
34
34
  with suppress(FileNotFoundError):
35
35
  # Certificate bundle is not secret
36
36
  ssl_ctx.load_verify_locations(cafile=f"/tmp/{TLS_CA_BUNDLE_FILE}") # noqa: S108
37
- async with AsyncClient(timeout=API_REQUEST_TIMEOUT, verify=ssl_ctx) as client:
37
+ async with AsyncClient(timeout=API_REQUEST_TIMEOUT, verify=ssl_ctx, trust_env=False) as client:
38
38
  try:
39
39
  return (await client.get(url)).json()
40
40
  except Exception as e:
@@ -35,7 +35,7 @@ async def _httpx_get_request(url: str):
35
35
  ssl_ctx = create_default_context()
36
36
  with suppress(FileNotFoundError):
37
37
  ssl_ctx.load_verify_locations(cafile=f"{PATRONI_CONF_PATH}/{TLS_CA_BUNDLE_FILE}")
38
- async with AsyncClient(timeout=API_REQUEST_TIMEOUT, verify=ssl_ctx) as client:
38
+ async with AsyncClient(timeout=API_REQUEST_TIMEOUT, verify=ssl_ctx, trust_env=False) as client:
39
39
  try:
40
40
  return (await client.get(url)).json()
41
41
  except Exception as e:
@@ -8,6 +8,8 @@
8
8
  {%- set pg_log_dir = postgresql_log_path if is_vm else logs_storage_path ~ '/' ~ version ~ '/main/pg_logs' -%}
9
9
  {%- set pg_bin_dir = '/snap/charmed-postgresql/current/usr/lib/postgresql/' ~ version ~ '/bin' if is_vm else '/usr/lib/postgresql/' ~ version ~ '/bin' -%}
10
10
  {%- set pgb_flag = pgbackrest_configuration_file ~ ' ' if is_vm else '' -%}
11
+ {#- Single-host pg_hba address: the prefix length depends on the address family. #}
12
+ {%- macro hba_addr(addr) -%}{{ addr }}{{ '/128' if ':' in (addr or '') else '/32' }}{%- endmacro -%}
11
13
  #########################################################################################
12
14
  # [ WARNING ]
13
15
  # patroni configuration file maintained by the postgres-operator
@@ -31,7 +33,7 @@ log:
31
33
  file_size: 600
32
34
 
33
35
  restapi:
34
- listen: '{{ self_ip if is_vm else '0.0.0.0' }}:8008'
36
+ listen: '{{ self_ip if is_vm else "*" }}:8008'
35
37
  connect_address: '{{ node_addr }}:8008'
36
38
  {%- if patroni_password %}
37
39
  authentication:
@@ -173,16 +175,18 @@ bootstrap:
173
175
  {%- if not is_vm %}
174
176
  pg_hba:
175
177
  - {{ hba_type }} all all 0.0.0.0/0 {{ instance_password_encryption }}
178
+ - {{ hba_type }} all all ::/0 {{ instance_password_encryption }}
176
179
  - {{ hba_type }} replication replication 127.0.0.1/32 scram-sha-256
180
+ - {{ hba_type }} replication replication ::1/128 scram-sha-256
177
181
  {%- for endpoint in extra_replication_endpoints %}
178
- - {{ hba_type }} replication replication {{ endpoint }}/32 scram-sha-256
182
+ - {{ hba_type }} replication replication {{ hba_addr(endpoint) }} scram-sha-256
179
183
  {%- endfor %}
180
184
  bypass_api_service: true
181
185
  pod_ip: '{{ endpoint }}'
182
186
  {%- endif %}
183
187
 
184
188
  postgresql:
185
- listen: {{ listen_ips | join(',') if is_vm else '0.0.0.0' }}:5432
189
+ listen: '{{ listen_ips | join(',') if is_vm else "*" }}:5432'
186
190
  basebackup:
187
191
  - waldir: {{ wal_path }}
188
192
  connect_address: '{{ node_addr }}:5432'
@@ -230,37 +234,46 @@ postgresql:
230
234
  - local all monitoring password
231
235
  {%- for role in ['charmed_stats', 'charmed_read', 'charmed_dml', 'charmed_backup', 'charmed_dba', 'charmed_admin', 'charmed_databases_owner'] %}
232
236
  - {{ hba_type }} all +{{ role }} 0.0.0.0/0 scram-sha-256
237
+ - {{ hba_type }} all +{{ role }} ::/0 scram-sha-256
233
238
  {%- endfor %}
234
239
  {%- if not connectivity %}
235
- - {{ hba_type }} all all {{ self_ip ~ '/32' if is_vm else endpoint ~ '.' ~ namespace ~ '.svc.cluster.local' }} {{ instance_password_encryption }}
240
+ - {{ hba_type }} all all {{ hba_addr(self_ip) if is_vm else endpoint ~ '.' ~ namespace ~ '.svc.cluster.local' }} {{ instance_password_encryption }}
236
241
  - {{ hba_type }} all all 0.0.0.0/0 reject
242
+ - {{ hba_type }} all all ::/0 reject
237
243
  {%- elif enable_ldap %}
238
244
  - {{ hba_type }} all +identity_access 0.0.0.0/0 ldap {{ ldap_parameters }}
245
+ - {{ hba_type }} all +identity_access ::/0 ldap {{ ldap_parameters }}
239
246
  - {{ hba_type }} all +internal_access 0.0.0.0/0 {{ instance_password_encryption }}
247
+ - {{ hba_type }} all +internal_access ::/0 {{ instance_password_encryption }}
240
248
  {%- for user, databases in user_databases_map.items() %}
241
249
  - {{ hba_type }} {{ databases }} {{ user }} 0.0.0.0/0 {{ instance_password_encryption }}
250
+ - {{ hba_type }} {{ databases }} {{ user }} ::/0 {{ instance_password_encryption }}
242
251
  {%- endfor %}
243
252
  {%- else %}
244
253
  - {{ hba_type }} all +internal_access 0.0.0.0/0 {{ instance_password_encryption }}
254
+ - {{ hba_type }} all +internal_access ::/0 {{ instance_password_encryption }}
245
255
  {%- for user, databases in user_databases_map.items() %}
246
256
  {%- if 'pgbouncer_auth_relation_' in user %}
247
257
  - {{ hba_type }} {{ databases }} {{ user }} 0.0.0.0/0 md5
258
+ - {{ hba_type }} {{ databases }} {{ user }} ::/0 md5
248
259
  {%- else %}
249
260
  - {{ hba_type }} {{ databases }} {{ user }} 0.0.0.0/0 {{ instance_password_encryption }}
261
+ - {{ hba_type }} {{ databases }} {{ user }} ::/0 {{ instance_password_encryption }}
250
262
  {%- endif %}
251
263
  {%- endfor %}
252
264
  {%- endif %}
253
265
  {%- if is_vm and watcher_addr %}
254
266
  # Allow watcher to connect for health checks
255
- - {{ hba_type }} postgres watcher {{ watcher_addr }}/32 scram-sha-256
267
+ - {{ hba_type }} postgres watcher {{ hba_addr(watcher_addr) }} scram-sha-256
256
268
  {%- endif %}
257
269
  - {{ hba_type }} replication replication 127.0.0.1/32 scram-sha-256
270
+ - {{ hba_type }} replication replication ::1/128 scram-sha-256
258
271
  {%- if not is_vm %}
259
272
  - {{ hba_type }} replication replication 127.0.0.6/32 scram-sha-256
260
273
  {%- endif %}
261
274
  # Allow replications connections from other cluster members.
262
275
  {%- for endpoint in extra_replication_endpoints %}
263
- - {{ hba_type }} replication replication {{ endpoint }}/32 scram-sha-256
276
+ - {{ hba_type }} replication replication {{ hba_addr(endpoint) }} scram-sha-256
264
277
  {%- endfor %}
265
278
  {%- if is_vm %}
266
279
  {%- for peer_ip in peers_ips %}
@@ -108,6 +108,22 @@ def label2name(label: str) -> str:
108
108
  return "/".join(label.rsplit("-", 1))
109
109
 
110
110
 
111
+ def bracket_ipv6_host(host: str | None) -> str | None:
112
+ """Quote an IPv6 literal so it is valid in a URL authority (RFC 3986).
113
+
114
+ An IPv6 literal in a URL must be bracketed, otherwise the client parses
115
+ the address at the first colon. Other hosts (and None) pass through, as
116
+ does a literal that is already bracketed.
117
+
118
+ Args:
119
+ host: a bare host name or address, or None.
120
+
121
+ Returns:
122
+ The host, bracketed when it is an IPv6 literal.
123
+ """
124
+ return f"[{host}]" if host and ":" in host and not host.startswith("[") else host
125
+
126
+
111
127
  def render_file(
112
128
  substrate: Substrates, path: str, content: str, mode: int, change_owner: bool = True
113
129
  ) -> None:
@@ -177,7 +193,10 @@ async def _httpx_get_request(
177
193
  else:
178
194
  ssl_ctx.check_hostname = False
179
195
  ssl_ctx.verify_mode = CERT_NONE
180
- async with AsyncClient(auth=auth, timeout=API_REQUEST_TIMEOUT, verify=ssl_ctx) as client:
196
+ # Patroni is reached directly: never through the proxy configured in the hook environment.
197
+ async with AsyncClient(
198
+ auth=auth, timeout=API_REQUEST_TIMEOUT, verify=ssl_ctx, trust_env=False
199
+ ) as client:
181
200
  try:
182
201
  return (await client.get(url)).raise_for_status().json()
183
202
  except (HTTPError, ValueError):
@@ -188,7 +207,9 @@ async def _async_get_request(
188
207
  uri: str, endpoints: list[str], cafile: str, auth: BasicAuth | None, verify: bool = True
189
208
  ) -> dict[str, Any] | None:
190
209
  tasks = [
191
- create_task(_httpx_get_request(f"https://{ip}:8008{uri}", cafile, auth, verify))
210
+ create_task(
211
+ _httpx_get_request(f"https://{bracket_ipv6_host(ip)}:8008{uri}", cafile, auth, verify)
212
+ )
192
213
  for ip in endpoints
193
214
  ]
194
215
  for task in as_completed(tasks):