Skip to content

Merge master 2.9#481

Merged
jujubot merged 26 commits intojuju:2.9from
SimonRichardson:merge-master-2.9
Mar 31, 2021
Merged

Merge master 2.9#481
jujubot merged 26 commits intojuju:2.9from
SimonRichardson:merge-master-2.9

Conversation

@SimonRichardson
Copy link
Copy Markdown
Member

@SimonRichardson SimonRichardson commented Mar 31, 2021

Merge 2.9 into master

This is brings in 2.9-rc3 schema as well, so that we're dealing with
the latest changes.

Conflicts:
_client3.py - just re-ran the make client as the code is autogenerated.

5e23162 (upstream/master) Merge pull request #480 from SimonRichardson/release-2.8.6
3e23b74 (origin/master, origin/HEAD, master) Merge pull request #479 from SimonRichardson/schema-update-2.8.10
7f96863 Merge pull request #478 from SimonRichardson/scale-typo
fd1438c Merge pull request #475 from achilleasa/provide-accessor-for-machine-hostname-field
1015f4d Expand wait_for_idle to support waiting for status (#473)
7829fd0 Merge pull request #471 from SimonRichardson/release-2.8.5
fd36c8f Merge pull request #470 from juju/johnsca/bundle-charm-files-and-wait
3d91d6b Merge pull request #469 from juju/johnsca/accept-charm-files
4e4e108 Merge pull request #465 from juju/johnsca/update-websockets/py39
d696937 Merge pull request #467 from gnuoy/issue/466

johnsca and others added 26 commits January 28, 2021 14:43
Using websockets < 8.0 on Python >= 3.9 fails with a TypeError in the
websockets library. However, version 8 of websockets drops support for
older versions of Python that we still need to support, so this uses
conditional dependencies to support both.
This PR implements add_space and get_spaces. Since spaces are not
implemented with the LXD provider there is not corresponding
functional test. Closes issue juju#466.
juju#467

This PR implements add_space and get_spaces. Since spaces are not
implemented with the LXD provider there is not corresponding
functional test. Closes issue juju#466.
The library already creates a charm archive for local charms, but needed
a few tweaks to accept an already-archived file.
juju#465

Using websockets < 8.0 on Python >= 3.9 fails with a TypeError in the websockets library. However, version 8 of websockets drops support for older versions of Python that we still need to support, so this uses conditional dependencies to support both.
juju#469

The library already creates a charm archive for local charms, but needed a few tweaks to accept an already-archived file.
Bundles which referenced local `.charm` files were failing.

This also adds a `Model.wait_for_bundle()` helper, which waits for all
of the units deployed by the bundle to come up and for all hooks to
settle. It is not as powerful as `juju-wait`, but it at least provides
an easy way to block until a deployed bundle has settled into a steady
state.
Split `wait_for_bundle` off into `utils` and made the helper on `Model`
more generic. Also removed an errant `print` with an f-string and
updated the GitHub Workflow to run lint and unit tests against all
versions to ensure that things like that get caught quickly (as it broke
on Python 3.5).
…wait

juju#470

Bundles which referenced local `.charm` files were failing.

This also adds a `Model.wait_for_bundle()` helper, which waits for all of the units deployed by the bundle to come up and for all hooks to settle. It is not as powerful as `juju-wait`, but it at least provides an easy way to block until a deployed bundle has settled into a steady state.
2.8.5
^^^^^

Monday February 8 2021

 * Implement add_space and get_spaces.
 * Update facade controllers.
 * Support already archived (.charm or .zip) local charms.
 * Introduction of wait_for_bundle method.
 * Bug fix - Handle None in list_offers results
 * Bug fix - Update libraries to support Python 3.9+
juju#471

2.8.5
^^^^^

Monday February 8 2021

 pr_props Implement add_space and get_spaces.
 pr_props Update facade controllers.
 pr_props Support already archived (.charm or .zip) local charms.
 pr_props Introduction of wait_for_bundle method.
 pr_props Bug fix - Handle None in list_offers results
 pr_props Bug fix - Update libraries to support Python 3.9+
Improve the `Model.wait_for_idle` helper to allow waiting for the
workload status to become "active" as well, and to raise on "blocked"
status in addition to "error".

Also adds log messages to track progress of waiting.
This allows users to access the hostname value reported by the machine
agent when it starts. This feature only works on 2.8.10+ controllers; in
all other cases (older controllers, machines with pending agents), the
property returns None.
…ine-hostname-field

juju#475

This allows users to access the hostname value reported by the machine
agent when it starts. This feature only works on 2.8.10+ controllers; in
all other cases (older controllers, machines with pending agents), the
property returns None.

Fixes juju#474 and works in conjunction with the changes from juju/juju#12760
The name of the param is ScaleApplicationParams not
ScaleApplicationParam. This should have really be caught in a test, but
for now fix this so we can get a release out.
juju#478

The name of the param is ScaleApplicationParams not
ScaleApplicationParam. This should have really be caught in a test, but
for now, fix this so we can get a release out.

Fixes: juju#477
2.8.6
^^^^^

Tuesday March 23 2021

* Update facade methods for Juju 2.8.10
* Bug fix - Fix typo in param name for ScaleApplications
* Introduction of hostname property for Machines
juju#480

2.8.6
^^^^^

Tuesday March 23 2021

* Update facade methods for Juju 2.8.10
* Bug fix - Fix typo in param name for ScaleApplications
* Introduction of hostname property for Machines
@manadart
Copy link
Copy Markdown
Member

manadart commented Mar 31, 2021

Given that this is:

  1. a collection of already reviewed patches and;
  2. is a ~100kloc diff,

I'm prepared to approve it based on a skim.

@SimonRichardson
Copy link
Copy Markdown
Member Author

$$merge$$

@SimonRichardson
Copy link
Copy Markdown
Member Author

@jujubot jujubot merged commit bde724b into juju:2.9 Mar 31, 2021
@SimonRichardson SimonRichardson deleted the merge-master-2.9 branch March 31, 2021 09:48
@SimonRichardson SimonRichardson mentioned this pull request May 20, 2021
jujubot added a commit that referenced this pull request May 26, 2021
#494

The following merges 2.9 into master.

eed19e4 (upstream/2.9, origin/2.9, 2.9) Merge pull request #492 from tlm/kube-proxy-support-2
ab33f33 Merge pull request #493 from SimonRichardson/remove-machine-workaround
5c2dfa9 Merge pull request #491 from tlm/2.9.1-facades
b24e750 Merge pull request #490 from tlm/kube-proxy-support-2
aaa651c Merge pull request #482 from SimonRichardson/find-parameters
bde724b Merge pull request #481 from SimonRichardson/merge-master-2.9
fa1b85f Merge pull request #464 from SimonRichardson/charm-hub-url
195191b Merge pull request #463 from SimonRichardson/charm-hub-origin
d6d157f Merge pull request #462 from SimonRichardson/charm-hub-find
6fab2ee Merge pull request #460 from SimonRichardson/charm-hub-info
5e61dd2 Merge pull request #459 from SimonRichardson/rename-upgrade-charm-refresh
73604c8 Merge pull request #456 from SimonRichardson/update-schema-2.9-rc3
6c0437a Merge pull request #457 from SimonRichardson/ensure-charm-store-prefix
eb849e4 Merge pull request #455 from SimonRichardson/2.9
1a77394 Merge pull request #449 from achilleasa/support-new-expose-params-for-applications
ad3c449 Merge pull request #448 from achilleasa/gen-2.9-beta-client
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants