CSS-4744 - Merge main forward into feature-rebac #984
Merged
Conversation
This file contains 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
Minor fix for the jimmctl model-status command.
Refactor the add model method.
Removed push from ci workflow.
Upgrades throw a CalledProcessError because `snap install` returns an error when the snap is already installed. Fix is to check whether jimm snap is installed and if so, remove it.
check and remove jimm snap during upgrades
Update to Juju 2.9.42 and some compatibility changes.
CSS-2522 Adds Sphinx documentation according to the Diataxis framework.
- also adds an explanation section on jaas tags
CSS-2435 Tutorial on group and access management.
Updated to juju 3.1.4
…ibs-postgres Switches machine charm to data platform libs.
* Added documentation and setup files * Improve docker compose * Merged backport ci/cd * Fix compose for two exposed services * Added improved setup instructions * Further improvements * Eliminated unnecessary sections
* Model status parser * Bring in API definition * Bring in storage facade calls * Update jimmtest api * Add api call * Add API params * Facade call * Initial backport of parser * Fix relation test * PR comments * Refactor according to PR comments * pr comments
Co-authored-by: Ales Stimec <[email protected]>
* Backport working workflows from feature-rebac * Only only v1 tags on main to trigger release
Minor tweaks
…eature-rebac CSS-4547 Backports charm changes from feature-rebac into main.
kian99
force-pushed
the
merge-main-forward
branch
2 times, most recently
from
7723598
to
d92fec7
Compare
kian99
force-pushed
the
merge-main-forward
branch
from
d92fec7
to
ea0af4f
Compare
Charm now persists vault data in unit state and ensures the file is pushed to the workload container on every update.
CSS-4705 k8s charm: Fix for the vault relation.
kian99
commented
Jul 5, 2023
| @@ -191,7 +191,7 @@ class _MetricsEndpointDict(TypedDict): | |||
| LIBAPI = 0 | |||
| LIBPATCH = 3 | |||
|
|
|||
| PYDEPS = ["cosl", "pydantic"] | |||
| PYDEPS = ["cosl", "pydantic == 1.10.*"] | |||
There was a problem hiding this comment.
Not sure I should be editing this file manually? But we're waiting on this PR to fix it canonical/grafana-agent-k8s-operator#215
There was a problem hiding this comment.
I think manual is fine for now, I suspect if you fetch lib again it'll overwrite it
| @@ -63,6 +63,7 @@ func init() { | |||
| r.AddMethod("JIMM", 3, "UpdateMigratedModel", updateMigratedModelMethod) | |||
| r.AddMethod("JIMM", 3, "AddCloudToController", addCloudToControllerMethod) | |||
| r.AddMethod("JIMM", 3, "RemoveCloudFromController", removeCloudFromControllerMethod) | |||
| r.AddMethod("JIMM", 3, "CrossModelQuery", crossModelQueryMethod) | |||
There was a problem hiding this comment.
We added this facade version in main but it wasn't present in feature-rebac thoughts?
| @@ -60,7 +60,7 @@ func init() { | |||
| r.AddMethod("ApplicationOffers", 4, "FindApplicationOffers", findOffersMethod) | |||
| r.AddMethod("ApplicationOffers", 4, "ApplicationOffers", applicationOffersMethod) | |||
|
|
|||
| return []int{1, 2, 3} | |||
| return []int{1, 2, 3, 4} | |||
There was a problem hiding this comment.
Also curious why this was only in main
- fix for the dashboard relation: keys using _ instead of - - properly rendering config.js for the dashboard
General fixes after QA
Co-authored-by: Ales Stimec <[email protected]>
kian99
changed the title
alesstimec
approved these changes
Jul 12, 2023
ale8k
approved these changes
Jul 12, 2023
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.
Description
Merging
mainintofeature-rebacbrings with it any fixes tomainthat are also appropriate tofeature-rebac. Note that most code changes have been discarded, e.g. there were some improvements made to "cross model queries" while backporting, those improvements should be made separately intofeature-rebac.Going forward we can do any common work in
mainand regularly merge main intofeature-rebac.Engineering checklist
Check only items that apply