Merge branch '2.9' into merge-2.9-20220519

addyess · May 19, 2022 · 292a252 · 292a252
2 parents bd3d06a + 31559b7
commit 292a252
Show file tree

Hide file tree

Showing 316 changed files with 3,762 additions and 11,798 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,13 +9,15 @@ on:
       - 'testing/**'
       - 'tests/**'
   pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
     paths-ignore:
       - 'acceptancetests/**'
       - 'doc/**'
       - 'snap/**'
       - 'testcharms/**'
       - 'testing/**'
       - 'tests/**'
+  workflow_dispatch:
 
 permissions:
   contents: read

diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
@@ -1,5 +1,5 @@
 name: "CLA check"
-on: [pull_request]
+on: [pull_request, workflow_dispatch]
 permissions:
   contents: read
 

diff --git a/.github/workflows/client-tests.yml b/.github/workflows/client-tests.yml
@@ -9,13 +9,15 @@ on:
       - 'testing/**'
       - 'tests/**'
   pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
     paths-ignore:
       - 'acceptancetests/**'
       - 'doc/**'
       - 'snap/**'
       - 'testcharms/**'
       - 'testing/**'
       - 'tests/**'
+  workflow_dispatch:
 
 permissions:
   contents: read

diff --git a/.github/workflows/microk8s-tests.yml b/.github/workflows/microk8s-tests.yml
@@ -2,7 +2,7 @@ name: Test Kubeflow
 
 # The small `edge` bundle has been deprecated, `lite` bundle takes 40mins to run which is too slow for gh action.
 # Disable this one for now, please check `nw-deploy-kubeflow` on Jenkins.
-on: {}
+on: workflow_dispatch
 
 env:
   DOCKER_USERNAME: jujuqabot

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -1,5 +1,10 @@
 name: "Smoke"
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+  workflow_dispatch:
+
 jobs:
 
   smoke:
@@ -152,7 +157,7 @@ jobs:
         sg microk8s "microk8s kubectl create -f .github/reg.yml"
 
         # TODO:(jack-w-shaw) Figure out why we need this and do something nicer
-        sudo microk8s refresh-certs
+        sudo microk8s refresh-certs --cert ca.crt
 
         # Wait for registry
         sg microk8s "microk8s kubectl wait --for condition=available deployment registry -n container-registry --timeout 180s" || true

diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
@@ -1,5 +1,9 @@
 name: "Snapcraft"
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+  workflow_dispatch:
 permissions:
   contents: read
 

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -1,5 +1,9 @@
 name: "Static Analysis"
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+  workflow_dispatch:
 permissions:
   contents: read
 

diff --git a/.github/workflows/update-brew-formulae.yml b/.github/workflows/update-brew-formulae.yml
@@ -4,6 +4,7 @@ on:
     types: [published]
   schedule:
     - cron:  '0 */12 * * *'
+  workflow_dispatch:
 permissions:
   contents: read
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -21,9 +21,8 @@ Documentation:
 * [source tree docs](doc/)
 
 Community:
-* https://jujucharms.com/community/
-* https://discourse.jujucharms.com/
-* [#juju on freenode](http://webchat.freenode.net/?channels=juju)
+* https://chat.charmhub.io
+* https://discourse.charmhub.io/
 
 Building Juju
 =============
@@ -408,6 +407,5 @@ beyond the workflow and the [issue tracker](https://bugs.launchpad.net/juju/+bug
 
 Use the following links to contact the community:
 
- - Community page: https://jujucharms.com/community/
- - IRC channel on freenode: `#juju`
- - Discourse forum: [https://discourse.jujucharms.com/](https://discourse.jujucharms.com/)
+ - Mattermost chat: [https://chat.charmhub.io/](https://chat.charmhub.io/)
+ - Discourse forum: [https://discourse.charmhub.io/](https://discourse.charmhub.io/)
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -6,7 +6,7 @@
 
  - [ ] Requires a [pylibjuju](https://github.com/juju/python-libjuju) change
  - [ ] Added [integration tests](https://github.com/juju/juju/tree/develop/tests) for the PR
- - [ ] Added or updated [doc.go](https://discourse.jujucharms.com/t/readme-in-packages/451) related to packages changed
+ - [ ] Added or updated [doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) related to packages changed
  - [ ] Comments answer the question of why design decisions were made
 
 ## QA steps

diff --git a/acceptancetests/README.md b/acceptancetests/README.md
@@ -58,8 +58,8 @@ The script is parameter-rich and should be able to accept any tweaks that you wa
 
 Further description can be found here in discourse:
 
-here: [discourse-link](https://discourse.jujucharms.com/t/call-for-testing-running-acceptance-tests-locally-and-easily/1449)
-and here: [discourse-link](https://discourse.jujucharms.com/t/wip-juju-acceptance-testing-primer/1482)
+here: [discourse-link](https://discourse.charmhub.io/t/call-for-testing-running-acceptance-tests-locally-and-easily/1449)
+and here: [discourse-link](https://discourse.charmhub.io/t/wip-juju-acceptance-testing-primer/1482)
 
 ### Quick run using LXD
 To run a test locally with lxd and locally complied juju:

diff --git a/acceptancetests/repository/charms/mediawiki/README.md b/acceptancetests/repository/charms/mediawiki/README.md
@@ -118,7 +118,7 @@ When set to true this option will enable the following MediaWiki options: `$wgDe
 
 [1]: https://juju.ubuntu.com/docs/getting-started.html
 [2]: https://juju.ubuntu.com/docs/getting-started.html#installation
-[3]: http://jujucharms.com/charms/precise/mysql
+[3]: http://charmhub.io/mysql
 [4]: http://www.mediawiki.org/wiki/Manual:$wgDefaultSkin
 [5]: http://packages.ubuntu.com/precise/mediawiki
 [6]: http://www.mediawiki.org/wiki/Download_from_Git

diff --git a/acceptancetests/repository/charms/mysql/README.md b/acceptancetests/repository/charms/mysql/README.md
@@ -45,7 +45,7 @@ You can add further slaves with:
 
 ## Monitoring
 
-This charm provides relations that support monitoring via either [Nagios](https://jujucharms.com/precise/nagios) or [Munin](https://jujucharms.com/precise/munin/). Refer to the appropriate charm for usage.
+This charm provides relations that support monitoring via either [Nagios](https://charmhub.io/nagios) or [Munin](https://charmhub.io/munin/). Refer to the appropriate charm for usage.
 
 # Configuration
 

diff --git a/acceptancetests/repository/charms/statusstresser/README.md b/acceptancetests/repository/charms/statusstresser/README.md
@@ -48,5 +48,5 @@ This charm has no configuration options.
 
 - Author: Juju Charm Community
 - Report bugs at: [http://bugs.launchpad.net/charms/+source/ubuntu](http://bugs.launchpad.net/charms/+source/ubuntu)
-- Location: [http://jujucharms.com/charms/precise/ubuntu](http://jujucharms.com/charms/precise/ubuntu)
+- Location: [http://charmhub.io/ubuntu](http://charmhub.io/ubuntu)
 
diff --git a/acceptancetests/repository/charms/ubuntu/README.md b/acceptancetests/repository/charms/ubuntu/README.md
@@ -48,5 +48,5 @@ This charm has no configuration options.
 
 - Author: Juju Charm Community
 - Report bugs at: [http://bugs.launchpad.net/charms/+source/ubuntu](http://bugs.launchpad.net/charms/+source/ubuntu)
-- Location: [http://jujucharms.com/charms/precise/ubuntu](http://jujucharms.com/charms/precise/ubuntu)
+- Location: [http://charmhub.io/ubuntu](http://charmhub.io/ubuntu)
 
diff --git a/acceptancetests/repository/trusty/mysql/README.md b/acceptancetests/repository/trusty/mysql/README.md
@@ -45,7 +45,7 @@ You can add further slaves with:
 
 ## Monitoring
 
-This charm provides relations that support monitoring via either [Nagios](https://jujucharms.com/precise/nagios) or [Munin](https://jujucharms.com/precise/munin/). Refer to the appropriate charm for usage.
+This charm provides relations that support monitoring via either [Nagios](https://charmhub.io/nagios) or [Munin](https://charmhub.io/munin/). Refer to the appropriate charm for usage.
 
 # Configuration
 

diff --git a/acceptancetests/repository/trusty/statusstresser/README.md b/acceptancetests/repository/trusty/statusstresser/README.md
@@ -48,5 +48,5 @@ This charm has no configuration options.
 
 - Author: Juju Charm Community
 - Report bugs at: [http://bugs.launchpad.net/charms/+source/ubuntu](http://bugs.launchpad.net/charms/+source/ubuntu)
-- Location: [http://jujucharms.com/charms/precise/ubuntu](http://jujucharms.com/charms/precise/ubuntu)
+- Location: [http://charmhub.io/ubuntu](http://charmhub.io/ubuntu)
 
diff --git a/acceptancetests/repository/trusty/ubuntu/README.md b/acceptancetests/repository/trusty/ubuntu/README.md
@@ -48,5 +48,5 @@ This charm has no configuration options.
 
 - Author: Juju Charm Community
 - Report bugs at: [http://bugs.launchpad.net/charms/+source/ubuntu](http://bugs.launchpad.net/charms/+source/ubuntu)
-- Location: [http://jujucharms.com/charms/precise/ubuntu](http://jujucharms.com/charms/precise/ubuntu)
+- Location: [http://charmhub.io/ubuntu](http://charmhub.io/ubuntu)
 
diff --git a/acceptancetests/repository/xenial/mysql/README.md b/acceptancetests/repository/xenial/mysql/README.md
@@ -45,7 +45,7 @@ You can add further slaves with:
 
 ## Monitoring
 
-This charm provides relations that support monitoring via either [Nagios](https://jujucharms.com/precise/nagios) or [Munin](https://jujucharms.com/precise/munin/). Refer to the appropriate charm for usage.
+This charm provides relations that support monitoring via either [Nagios](https://charmhub.io/nagios) or [Munin](https://charmhub.io/munin/). Refer to the appropriate charm for usage.
 
 # Configuration
 

diff --git a/acceptancetests/repository/xenial/ubuntu/README.md b/acceptancetests/repository/xenial/ubuntu/README.md
@@ -48,5 +48,5 @@ This charm has no configuration options.
 
 - Author: Juju Charm Community
 - Report bugs at: [http://bugs.launchpad.net/charms/+source/ubuntu](http://bugs.launchpad.net/charms/+source/ubuntu)
-- Location: [http://jujucharms.com/charms/precise/ubuntu](http://jujucharms.com/charms/precise/ubuntu)
+- Location: [http://charmhub.io/ubuntu](http://charmhub.io/ubuntu)