Merge chrony and chrony-client charm - #16
Draft
weiiwang01 wants to merge 3 commits into
Draft
Conversation
# Conflicts: # chrony-client-operator/pyproject.toml # chrony-client-operator/uv.lock # chrony-operator/pyproject.toml # chrony-operator/uv.lock # pyproject.toml # uv.lock
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
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.
What this PR does
Merge the chrony and chrony-client charm source code so that they share the same code, differing only in the charm entrypoint.
Also update the chrony charm to install the chrony exporter bundled inside the charm file instead of installing it from the PPA, matching the behavior of chrony-client.
Why we need it
The chrony and chrony-client charms share a lot of code, especially the chrony management part. In the past, this was done by copying and pasting code between the two charms. Now all the charm code is merged into the same directory, so it can be reused by the chrony and chrony-client charms with a simple python import.
This greatly reduces the project structure complexity and maintenance cost, and simplifies the unit tests and linting checks.
Checklist
docs/changelog.mdwith user-relevant changesdocs/release-notes/artifacts. If no change artifact is necessary, I tagged the PR with the labelno-release-note.(e.g., in
.github/workflows/integration_tests.yaml, ensure themoduleslist is correct)terraform fmtpasses andtflintreports no errors