[JUJU-367] Improve get_charm_series to check the model for series for a local charm
#607
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
cderici
changed the title
get_charm_series to check the model for series for a local charmget_charm_series to check the model for series for a local charm
sed-i
reviewed
Dec 17, 2021
examples/upgrade_local_charm_k8s.py
Outdated
|
|
||
| 1. Connects to the current model | ||
| 2. Deploy a bundle and waits until it reports itself active | ||
| 3. Destroys the units and applications |
There was a problem hiding this comment.
Missing: upgrades the charm from local path.
juju/bundle.py
Outdated
|
|
||
| if series is None: | ||
| model_config = await model.get_config() | ||
| default_series = model_config.get("default-series") |
There was a problem hiding this comment.
In my case I have a k8s charm, but the "default-series" it has stored is:
<ConfigValue source='default' value='focal'>
Is that normal?
There was a problem hiding this comment.
Yeah that's normal, that's why we get the .value out of it (#L440), but we need to check if it's None first, though maybe I can make the coding a bit clearer there.
|
!!build!! |
|
|
jujubot
added a commit
that referenced
this pull request
Jan 31, 2022
#619 ## What's Changed * [JUJU-320] Unit public address by @SimonRichardson in #600 * [JUJU-244] Add attach-resource by @cderici in #601 * [JUJU-140] Model.wait_for_idle -- for apps with no units yet by @cderici in #575 * [JUJU-367] Improve `get_charm_series` to check the model for series for a local charm by @cderici in #607 * [JUJU-366] Utility for connecting directly to existing connection by @cderici in #605 * Use public-address key instead of public_address by @wolsen in #610 * [JUJU-376] `wait_for_idle` to support scale down by @cderici in #613 * [JUJU-378] Utility for block_until-ing with a custom coroutine by @cderici in #614 * Fallback to 'local-fan' by @dparv in #612 * Minor comments on docs for block_until related functions. by @juanmanuel-tirado in #617 * Additional checks in print status. by @juanmanuel-tirado in #622 ## New Contributors * @wolsen made their first contribution in #610 * @dparv made their first contribution in #612 [JUJU-320]: https://warthogs.atlassian.net/browse/JUJU-320?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-244]: https://warthogs.atlassian.net/browse/JUJU-244?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-140]: https://warthogs.atlassian.net/browse/JUJU-140?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-367]: https://warthogs.atlassian.net/browse/JUJU-367?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-366]: https://warthogs.atlassian.net/browse/JUJU-366?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-376]: https://warthogs.atlassian.net/browse/JUJU-376?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-378]: https://warthogs.atlassian.net/browse/JUJU-378?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
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
get_charm_seriesmethod for a local charm extracts theseriesinformation for a local charm. It's often called from the_handle_local_charmsfrom within the bundle.py when deploying local charms, which handles the case where no series information found by also checking the model config data.The
get_charm_seriesis also called fromapplication.pyinrefresh (upgrade_charm)method, which doesn't handle the "no series" case.This PR moves that logic (of also checking the model for series info) into the
get_charm_seriesby adding an additional model parameter. So, whichever entity that's calling theget_charm_seriesalso provides the associated model and need to do nothing else.Fixes #606
QA Steps
Also related:
This one ☝️ is using machine charms and was already passing before this PR too.
Notes & Discussion