forked from juju/juju
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request juju#17513 from Aflynn50/noble-migration-support
juju#17513 When upgrading a 3.4 controller that had charms deployed to noble there is an error saying that noble is deprecated. This is because Noble is not marked as "supported" in the list of supported ubuntu versions. Marking it as supported however, raises another problem. When a charm is deployed the supported base resolver first checks for the latest LTS. This means that any new charms deployed would be default go to noble. To fix this, I have swapped the preference in the supported base resolver for the latest LTS, with the juju default supported LTS base. Now it will try to deploy to noble only if the charm does not deploy to the juju default supported base (which is currently jammy) Also in this PR: In [upgrader_test.go](https://github.com/juju/juju/pull/17513/files#diff-6972f1b636a8694b7b87d984c6b4877d61cd166dca69accb93eea8a29b48c1da) `ubuntuVersions` actually listed unsupported ubuntu versions. This was changed and noble was removed from this list. <!-- Why this change is needed and what it does. --> ## Checklist <!-- If an item is not applicable, use `~strikethrough~`. --> - [x] Code style: imports ordered, good names, simple structure, etc - [x] Comments saying why design decisions were made - [x] Go unit tests, with comments saying what you're testing - [x] [Integration tests](https://github.com/juju/juju/tree/main/tests), with comments saying what you're testing ## QA steps Go to /testcharms/charm-hub/charms/juju-qa-test Add the following to the charmcraft.yaml: ``` bases: - build-on: - name: "ubuntu" channel: "22.04" - name: "ubuntu" channel: "24.04" run-on: - name: "ubuntu" channel: "22.04" architectures: ["amd64"] - name: "ubuntu" channel: "24.04" architectures: ["amd64"] ``` Then do: ``` $ charmcraft pack ``` Now, to test do: ``` $ juju bootstrap lxd ``` Observe that the controller is on `ubuntu@22.04`. ``` $ juju add-model default $ juju deploy ./juju-qa-test_ubuntu-22.04-amd64-arm64_ubuntu-24.04-amd64-arm64.charm Located local charm "juju-qa-test", revision 0 Deploying "juju-qa-test" from local charm "juju-qa-test", revision 0 on ubuntu@24.04/stable ``` Observe that by default it deploys to `ubuntu@24.04`. Now test an upgrade. ``` $ juju upgrade-controller --build-agent no prepackaged agent binaries available, using local agent binary 3.4.4.2 (built from source) best version: 3.4.4.2 started upgrade to 3.4.4.2 ``` <!-- Describe steps to verify that the change works. --> ## Documentation changes <!-- How it affects user workflow (CLI or API). --> ## Links <!-- Link to all relevant specification, documentation, bug, issue or JIRA card. --> **Launchpad bug:** https://bugs.launchpad.net/juju/+bug/2068671
- Loading branch information
Showing
13 changed files
with
95 additions
and
44 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
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