Skip to content

Commit

Permalink
Merge pull request #12433 from hmlanigan/charmhub-caas-common-facade
Browse files Browse the repository at this point in the history
#12433

Add CharmHub to the set commonModelFacadeNames. To allow k8s controllers to deploy CharmHub charms.

## QA steps

Steps assume that microk8s and docker is setup already.

```console
$ make microk8s-operator-update
$ juju bootstrap microk8s wednesday-k8s
$ export JUJU_DEV_FEATURE_FLAGS="charm-hub"
$ juju add-model six --config charm-hub-url="https://api.staging.snapcraft.io"

# the find command should not fail
$ juju find --series kubernetes

# deploy a charmhub k8s charm
$ juju deploy postgresql-k8s
$ juju status
Model Controller Cloud/Region Version SLA Timestamp
six wednesday-k8s microk8s/localhost 2.9-rc3 unsupported 14:33:24Z

App Version Status Scale Charm Store Rev OS Address Message
postgresql pgcharm:edge active 1 postgresql-k8s charmhub 5 kubernetes

Unit Workload Agent Address Ports Message
postgresql/0* active idle 10.1.246.77 5432/TCP Pod configured

$ juju show-status-log postgresql/0
Time Type Status Message
...
09 Dec 2020 14:32:45Z juju-unit idle
09 Dec 2020 14:32:45Z workload active Pod configured
```
  • Loading branch information
jujubot committed Dec 9, 2020
2 parents 18aff0b + ab08475 commit 28b46fc
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions apiserver/restrict_caasmodel.go
Expand Up @@ -22,6 +22,7 @@ var commonModelFacadeNames = set.NewStrings(
"Block",
"CharmRevisionUpdater",
"Charms",
"CharmHub",
"Cleaner",
"Client",
"Cloud",
Expand Down

0 comments on commit 28b46fc

Please sign in to comment.