[DPE-10844] refactor(relations): adopt the single-kernel client relation - #1900
Draft
marceloneppel wants to merge 2 commits into
Draft
[DPE-10844] refactor(relations): adopt the single-kernel client relation#1900marceloneppel wants to merge 2 commits into
marceloneppel wants to merge 2 commits into
Conversation
marceloneppel
force-pushed
the
skl-02-adopt-database-provider
branch
from
August 17, 2026 19:47
6ddf535 to
f18998d
Compare
github-actions
Bot
added
the
Libraries: Out of sync
marceloneppel
force-pushed
the
skl-01-adopt-update-config
branch
2 times, most recently
from
August 18, 2026 21:20
43dac9e to
429abf3
Compare
Move the database (client) relation provider into the single-kernel library: delete the charm's src/relations/postgresql_provider.py and its tests, and wire the provider events through the lib's DatabaseManager. The charm implements get_resource_provider so the lib's ConfigManager reads substrate resources via the resource_provider injection contract (lib #215) on the db-provider lib branch. Pin the lib at the rebased test/02-db-events tip (archive-URL SHA, since the db-provider stack is not yet published to PyPI), stacked on the skl-01 16.3.5 update_config adoption. Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com>
marceloneppel
force-pushed
the
skl-02-adopt-database-provider
branch
from
August 18, 2026 21:34
b7e5521 to
2ee2329
Compare
The pinned archive moves from c1fab6a to 335f89b so the charm picks up the port review's parity fix: the requested-entity-secret read is now guarded against ModelError, restoring the block-and-recover behavior the 16/edge provider had for a pending cross-model secret grant, plus the manager test backfills that pin the ported behavior. Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue
src/relations/postgresql_provider.py(645 lines) is a near-copy of the K8s charm's version of the same file, and the library now owns the postgresql-client relation. Keeping both means two implementations of one databag contract drifting apart — which is where the doubled-port read-only URI the library fixes came from.Solution
Deletes the charm's provider and its tests, and constructs
single_kernel_postgresql.events.database.DatabaseEventsHandlerinstead. The remaining call sites move to the manager it builds:oversee_users()now takes the PostgreSQL client,update_endpoints()takes an optional relation id rather than an event.Two seams close with it:
refresh_endpointsis gone.ConfigManagerholds the database manager and refreshes endpoints itself.update_configno longer takes a user hash._collect_user_relationsdelegates to the manager, and the hash is derived from the same relation data the user-databases map comes from, sogenerate_user_hashhad nothing left to do.relations_user_databases_mapstays here — its computation diverges between the substrates and belongs to the core event-loop phase.Behaviour is unchanged on this substrate. The library keeps VM's
relation-<id>role names, its Patroni-member endpoint derivation, itscreatedbextra-user-role allowance, and itsPostgreSQLBaseErrorcatch, all substrate-gated.Depends on canonical/postgresql-single-kernel-library#209 through #214; pinned to that stack's tip until it is released.
Checklist