Merge ~mthaddon/charm-k8s-discourse/+git/charm-k8s-discourse:readme into charm-k8s-discourse:master

Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: 2392e86d8bafc596729bd2c170c5b8655d10fbc7
Merged at revision: 0f9efe99f5bf8cb1e3cff0c1a60a7daab8e6cfb1
Proposed branch: ~mthaddon/charm-k8s-discourse/+git/charm-k8s-discourse:readme
Merge into: charm-k8s-discourse:master
Diff against target: 73 lines (+21/-10)
1 file modified
README.md (+21/-10)
Reviewer Review Type Date Requested Status
Laurent Sesquès Approve
Canonical IS Reviewers Pending
Review via email: mp+394937@code.launchpad.net

Commit message

Update README to be more end-user focused, showing initial deployment steps up front

Description of the change

Update README to be more end-user focused, showing initial deployment steps up front

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Laurent Sesquès (sajoupa) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 0f9efe99f5bf8cb1e3cff0c1a60a7daab8e6cfb1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/README.md b/README.md
index fcaa8ea..0167267 100644
--- a/README.md
+++ b/README.md
@@ -11,11 +11,22 @@ cloud, attached to a controller using `juju add-k8s`.
1111
12## Usage12## Usage
1313
14See config option descriptions in config.yaml.14To get started with a test environment, first deploy Redis in an IaaS model:
1515
16After deploying this charm, you will need to create a relation to a PostgreSQL16 juju deploy cs:~redis-charmers/redis # Note the deployed IP as ${REDIS_IP}
17database to provide backend storage for Discourse. You will also need to17
18deploy Redis and set your configuration to point to it.18Now deploy the Discourse and PostgreSQL charms within a Juju Kubernetes model
19as follows:
20
21 juju deploy cs:~postgresql-charmers/postgresql-k8s postgresql
22 juju deploy cs:~discourse-charmers/discourse-k8s discourse \
23 --config redis_host=${REDIS_IP} \
24 --config developer_emails="user@foo.internal" \
25 --config external_hostname="foo.internal" \
26 --config smtp_address="127.0.0.1" \
27 --config smtp_domain="foo.internal"
28 juju add-relation discourse postgresql:db-admin
29 juju expose discourse
1930
20### Static content and uploads31### Static content and uploads
2132
@@ -30,7 +41,7 @@ local storage.
3041
31### Developing42### Developing
3243
33Notes for deploying a test setup locally using microk8s:44Notes for deploying a test setup locally using MicroK8s:
3445
35 sudo snap install juju --classic46 sudo snap install juju --classic
36 sudo snap install juju-wait --classic47 sudo snap install juju-wait --classic
@@ -57,11 +68,11 @@ Notes for deploying a test setup locally using microk8s:
57 juju status68 juju status
5869
59The charm will not function without a database, so you will need to70The charm will not function without a database, so you will need to
60deploy `cs:postgresql` somewhere. You will also need a redis application71deploy `cs:postgresql` somewhere. You will also need a Redis application
61to connect to, such as `cs:~redis-charmers/redis`.72to connect to, such as `cs:~redis-charmers/redis`.
6273
63If postgresql is deployed in the same model you plan to use for74If PostgreSQL is deployed in the same model you plan to use for
64discourse, simply use `juju relate discourse postgresql:db`. (This75Discourse, simply use `juju relate discourse postgresql:db-admin`. (This
65deployment style is recommended for testing purposes only.)76deployment style is recommended for testing purposes only.)
6677
67Cross-model relations are also supported. Create a suitable model on78Cross-model relations are also supported. Create a suitable model on
@@ -70,7 +81,7 @@ a different cloud, for example, LXD or OpenStack.
70 juju switch database81 juju switch database
71 juju deploy cs:postgresql82 juju deploy cs:postgresql
72 juju deploy cs:~redis-charmers/redis # Use the IP address for the `redis_host` config option to discourse83 juju deploy cs:~redis-charmers/redis # Use the IP address for the `redis_host` config option to discourse
73 juju offer postgresql:db84 juju offer postgresql:db-admin
7485
75In most k8s deployments, traffic to external services from worker pods86In most k8s deployments, traffic to external services from worker pods
76will be SNATed by some part of the infrastructure. You will need to87will be SNATed by some part of the infrastructure. You will need to
@@ -80,7 +91,7 @@ know what the source addresses or address range is for the next step.
80 juju find-offers # note down offer URL; example used below:91 juju find-offers # note down offer URL; example used below:
81 juju relate discourse admin/database.postgresql --via 10.9.8.0/2492 juju relate discourse admin/database.postgresql --via 10.9.8.0/24
8293
83(In the case of postgresql, `--via` is needed so that the charm can94(In the case of PostgreSQL, `--via` is needed so that the charm can
84configure `pga_hba.conf` to let the k8s pods connect to the database.)95configure `pga_hba.conf` to let the k8s pods connect to the database.)
8596
86## Testing97## Testing

Subscribers

People subscribed via source and target branches