Merge ~mthaddon/charm-k8s-content-cache/+git/charm-k8s-content-cache:deploy-from-charmstore into charm-k8s-content-cache:master

Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: 258576c8dbe2603fa6d51adb766ff49fa6f950ed
Merged at revision: bf52300397d7494f6164499478a472e14066e94c
Proposed branch: ~mthaddon/charm-k8s-content-cache/+git/charm-k8s-content-cache:deploy-from-charmstore
Merge into: charm-k8s-content-cache:master
Diff against target: 62 lines (+17/-16)
1 file modified
README.md (+17/-16)
Reviewer Review Type Date Requested Status
Gareth Woolridge Approve
Canonical IS Reviewers Pending
Review via email: mp+395075@code.launchpad.net

Commit message

Update README for deploying from charmstore

Description of the change

Update README for deploying from charmstore

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
Gareth Woolridge (moon127) wrote :

LGTM

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

Change successfully merged at revision bf52300397d7494f6164499478a472e14066e94c

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index b1002ff..ddca31c 100644
3--- a/README.md
4+++ b/README.md
5@@ -6,17 +6,13 @@ Deploy content caching layer into K8s.
6
7 ## Usage
8
9-Build the charm:
10+To deploy this charm into a k8s model:
11
12- `charmcraft build`
13+ juju deploy cs:~content-cache-charmers/content-cache-k8s --config site=mysite.local --config backend=http://mybackend.local:80
14
15-Deploy:
16+And then you can test the deployment with:
17
18- `juju deploy ./content-cache.charm --config site=mysite.local --config backend=http://mybackend.local:80`
19-
20-### Test Deployment
21-
22-`curl --resolve mysite.local:80:<ingress IP> http://mysite.local`
23+ curl --resolve mysite.local:80:<ingress IP> http://mysite.local
24
25 ### Scale Out Usage
26
27@@ -26,23 +22,28 @@ Just run `juju scale-application <application name> 3`.
28
29 Build the docker image:
30
31- `git clone https://git.launchpad.net/charm-k8s-content-cache`
32- `cd charm-k8s-content-cache/docker`
33- `docker build . -t myimage:v<revision>`
34- `docker tag myimage:v<revision> localhost:32000/myimage:v<revision>`
35- `docker push localhost:32000/myimage:v<revision>`
36+ git clone https://git.launchpad.net/charm-k8s-content-cache
37+ cd charm-k8s-content-cache/docker
38+ docker build . -t myimage:v<revision>
39+ docker tag myimage:v<revision> localhost:32000/myimage:v<revision>
40+ docker push localhost:32000/myimage:v<revision>
41
42 Then, to use your new image, either replace the `deploy` step above with
43
44- `juju deploy ./content-cache.charm --config image_path=localhost:32000/myimage:v<revision> --config site=mysite.local --config backend=http://mybackend.local:80`
45+ juju deploy cs:~content-cache-charmers/content-cache-k8s --config image_path=localhost:32000/myimage:v<revision> --config site=mysite.local --config backend=http://mybackend.local:80
46
47 Or, if you have already deployed content-cache:
48
49- `juju config content-cache image_path=localhost:32000/myimage:v<revision>`
50+ juju config content-cache image_path=localhost:32000/myimage:v<revision>
51
52 ## Developing
53
54-Just run `make lint`.
55+To build the charm locally, just run `charmcraft build`. You can then deploy
56+using:
57+
58+ juju deploy ./content-cache.charm
59+
60+To run lint against the code, run `make lint`.
61
62 ## Testing
63

Subscribers

People subscribed via source and target branches