[JUJU-169] fix bundle deployment with 2.9 client and older controllers #13556
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
Include the application name to point user in the correct direction. With bundle handling, any number of applications could cause the problem. LP 1931739.
Help with debugging later by using the required logger in ChangeConfig if the model doesn't have one.
Fix for LP 1950237. Old controllers have the charm channel data, but do not include it in FullStatus results. It is available in ApplicationInfo. Covers cases where bundles are exported from old controllers, edited to include a channel, and deployed with newer clients. There may be others.
Existing model data now ensures that the channel is provided, to correctly determine if the bundle is attempting an upgrade by channel, assume a stable channel if none is provided in the bundle. Unit tests updated to include data as current controllers will return.
Include the application name so the person deploying the bundle has a starting point to fix the error.
…y with 2.9 < controllers
Allow the order of arguments to change from the expected alphabeticial ordering. Update the response appropriately too.
hpidcock
approved these changes
Dec 10, 2021
|
|
jujubot
added a commit
that referenced
this pull request
Dec 15, 2021
#13565 Merge from 2.9 bringing forward: - #13546 from manadart/2.9-unit-charm-url - #13564 from jujubot/increment-to-2.9.23 - #13556 from hmlanigan/deploy-bundle-2-8-controller Minor conflicts including those typical to version bumps: - apiserver/facades/agent/uniter/mocks/newlxdprofile.go - cmd/juju/application/deployer/bundlehandler_test.go - scripts/win-installer/setup.iss - snap/snapcraft.yaml - version/version.go
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.
Fix 1950237 by using ApplicationsInfo to find existing channels, rather than the status output, which doesn't contain the data in pre-2.9 controllers. This will only be done for pre 2.9 controllers, as is the case when the defaultCharmSchema is charmstore. Nicely, ApplicationsInfo is a bulk api call. However this necessitated requiring applications to have a channel from the bundle. To keep compatibility assume stable if channel not specified in the bundle.
Fix 1931739 by updating the error messages to include the application name causing the failure. Helps finding the problem in the bundle, where multiple applications exist.
Now that ChangeConfig is internal to juju, ensure there is always a logger.
QA steps
Please try various combinations of juju clients and controllers with deploying bundles and redeploying them with --dry-run to ensure no changes. Below are reproducers for the bugs resolved.
Bug reference
https://bugs.launchpad.net/juju/+bug/1950237
https://bugs.launchpad.net/juju/+bug/1931739