Skip to content
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

Jump to bottom

Split into k8s, machine dirs #171

Closed
wants to merge 10 commits into from
Closed

Split into k8s, machine dirs #171

wants to merge 10 commits into from

Conversation

sed-i
Copy link
Contributor

@sed-i sed-i commented Apr 17, 2023

Issue

  1. Our CI currently does not support pseudo-hybrid charms - we would need to render-k8s/-machine in a centralized way. As a result, the release workflow is currently broken, and unit-machine and integration-machine are not running on PRs.
  2. README.md currently reflect the k8s charm and would have to be rewritten so it addresses both.
  3. Must remember to render before testing / manually publishing.

Solution

  • Split into separate charm libs.
  • Use the charm-path arg in CI.

NOTES:

  • This PR depends on charmcraft working with symlinks: Do not ignore symlinks to external files charmcraft#1079. If the charmcraft team rejects the proposal, we could duplicate the built-in files and use a hardlink for grafana-charm.py (can't use hardlinks for dirs).
  • Itests will currently fail because charmcraft does not create the symlink content under src/.

Context

NTA.

Testing Instructions

Run tox in both subdirs.

Release Notes

Split into k8s, machine dirs.

github-advanced-security[bot]
github-advanced-security bot found potential problems Apr 17, 2023
View reviewed changes
machine/lib/charms/operator_libs_linux/v1/snap.py


# Regex to locate 7-bit C1 ANSI sequences
ansi_filter = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")

Check warning

Code scanning / CodeQL

Overly permissive regular expression range

Suspicious character range that is equivalent to \[@A-Z\].
machine/lib/charms/operator_libs_linux/v1/snap.py


# Regex to locate 7-bit C1 ANSI sequences
ansi_filter = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")

Check warning

Code scanning / CodeQL

Overly permissive regular expression range

Suspicious character range that is equivalent to \[0-9:;<=>?\].
@sed-i
Copy link
Contributor Author

sed-i commented Sep 27, 2023

This is impl'd in:

@sed-i sed-i closed this Sep 27, 2023
@sed-i sed-i deleted the feature/split branch September 27, 2023 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@sed-i