Merge 2.9 into 3.0 #15506
Merged
Merge 2.9 into 3.0 #15506
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
Most of the time they're constant, ens5 primary and ens6 hotplugged, but this is not always the case. This was causing occassional failures. Fix this by using ip to figure out which interfaces we should use instead of hard coding them
…ability_of_spaces_ec2_2.9 juju#15487 Most of the time they're constant, ens5 primary and ens6 hotplugged, but this is not always the case. This was causing occasional failures. Fix this by using ip to figure out which interfaces we should use instead of hard coding them ## Checklist - [x] Code style: imports ordered, good names, simple structure, etc - [x] Comments saying why design decisions were made - ~[ ] Go unit tests, with comments saying what you're testing~ - [x] [Integration tests](https://github.com/juju/juju/tree/develop/tests), with comments saying what you're testing - ~[ ] [doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) added or updated in changed packages~ ## QA steps ```sh ./main.sh -v -c aws -R eu-west-2 spaces_ec2 test_upgrade_charm_with_bind ./main.sh -v -c aws -R eu-west-2 spaces_ec2 test_juju_bind ``` Should both pass
Add juju- to aks test resource group name for easy cleanup.
juju#15492 The interactive add-cloud is painful because it will often reject the endpoint URL without giving any reason why. See https://bugs.launchpad.net/juju/+bug/1908630 ``` Enter the API endpoint url for the cloud []: 172.31.47.119 Can't validate endpoint: No Openstack server running at 172.31.47.119 Enter the API endpoint url for the cloud []: http://172.31.47.119/ Can't validate endpoint: No Openstack server running at http://172.31.47.119/ Enter the API endpoint url for the cloud []: http://172.31.47.119/identity/v3 Can't validate endpoint: No Openstack server running at http://172.31.47.119/identity/v3 Enter the API endpoint url for the cloud []: 172.31.47.119/identity Can't validate endpoint: No Openstack server running at 172.31.47.119/identity Enter the API endpoint url for the cloud []: http://172.31.47.119/identity Can't validate endpoint: No Openstack server running at http://172.31.47.119/identity ``` In the Openstack provider's `Ping` method, at least pass on the error information to the user, to make it a little less painful. ``` Enter the API endpoint url for the cloud []: 172.31.47.119 Can't validate endpoint: No Openstack server running at 172.31.47.119: auth options fetching failed caused by: request available auth options: failed executing the request / caused by: Get "/": unsupported protocol scheme "" Enter the API endpoint url for the cloud []: http://172.31.47.119 Can't validate endpoint: No Openstack server running at http://172.31.47.119: auth options fetching failed caused by: request available auth options: failed executing the request http://172.31.47.119/ caused by: Get "http://172.31.47.119/": dial tcp 172.31.47.119:80: connect: no route to host ``` Do the same with the MAAS and LXD providers. Also, fix a silly check in the LXD provider's `Ping` method that was rejecting perfectly good URLs. We're already using `lxd.EnsureHostPort(endpoint)` to fill in the scheme/port if not provided, but we were checking the returned value equals the input (and returning an unhelpful error if not). Remove this check. ## Checklist *If an item is not applicable, use `~strikethrough~`.* - [x] Code style: imports ordered, good names, simple structure, etc - ~[ ] Comments saying why design decisions were made~ - [x] Go unit tests, with comments saying what you're testing - ~[ ] [Integration tests](https://github.com/juju/juju/tree/develop/tests), with comments saying what you're testing~ - ~[ ] [doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) added or updated in changed packages~ ## QA steps Run `juju add-cloud` interactively, and provide a bogus URL.
When dealing with invalid yaml in local bundle, the error was treated as if the file was not present, therefore continuing to treat the input as a charm bundle url. This fix returns the error if it's a NotValid error.
In future versions more firewall related tests will be added
…e_ec2_to_firewall juju#15499 In future versions more firewall related tests have be added Change the name here to keep the suite names consistent ## Checklist - ~[ ] Code style: imports ordered, good names, simple structure, etc~ - ~[ ] Comments saying why design decisions were made~ - ~[ ] Go unit tests, with comments saying what you're testing~ - [x] [Integration tests](https://github.com/juju/juju/tree/develop/tests), with comments saying what you're testing - ~[ ] [doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) added or updated in changed packages~ ## QA steps ```sh ./main.sh -v -c aws -p ec2 firewall ```
juju#15497 When dealing with invalid yaml in local bundle, the error was treated as if the file was not present, therefore continuing to treat the input as a charm bundle url. This patch fixes the returned error if it's a NotValid error. ## Checklist - [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 - [ ] ~[Integration tests](https://github.com/juju/juju/tree/develop/tests), with comments saying what you're testing~ - [ ] ~[doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) added or updated in changed packages~ ## QA steps Having an empty juju model and this test.yaml bundle: ```yaml series: focal applications: ubuntu: charm: ubuntu channel: stable revision: 21 num_units: 1 to: - "0" constraints: arch=amd64 va machines: "0": constraints: arch=amd64 ``` then you should get this error: ```sh $ juju diff-bundle test.yaml ERROR cannot unmarshal bundle contents: unmarshal document 0: yaml: line 12: could not find expected ':' ``` if you remove line 12 then: ```sh $ juju diff-bundle test.yaml applications: ubuntu: missing: model machines: "0": missing: model ``` ## Bug reference https://bugs.launchpad.net/juju/+bug/2015315
SimonRichardson
approved these changes
Apr 19, 2023
|
/merge |
|
/merge |
Merged
jujubot
added a commit
that referenced
this pull request
May 9, 2023
#15561 Merges the following patches: - #15558 - #15554 - #15555 - #15553 - #15552 - #15549 - #15538 - #15541 - #15534 - #15537 - #15535 - #15533 - #15529 - #15530 - #15522 - #15527 - #15523 - #15514 - #15524 - #15515 - #15520 - #15518 - #15510 - #15506 - #15500 - #15508 - #15497 - #15499 - #15492 - #15490 - #15487 ### Conflicts None.
Merged
jujubot
added a commit
that referenced
this pull request
May 10, 2023
#15565 Merges the following patches: - #15561 - #15558 - #15554 - #15555 - #15553 - #15552 - #15549 - #15538 - #15541 - #15534 - #15537 - #15535 - #15533 - #15529 - #15530 - #15522 - #15527 - #15523 - #15514 - #15524 - #15515 - #15520 - #15518 - #15510 - #15506 - #15500 - #15508 - #15497 - #15499 - #15492 - #15490 - #15487 ### Conflicts None.
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.
Merges:
Conflicts solved trivially: