K8s Content Cache Charm

Merge ~hloeung/charm-k8s-content-cache:master into charm-k8s-content-cache:master

  1. Git
  2. lp:~hloeung/charm-k8s-content-cache
  3. master
  4. Merge into master
Proposed by Haw Loeung
Status: Merged
Approved by: Haw Loeung
Approved revision: 7c0a3cdba01ee3640281e07440434688880830e1
Merged at revision: c7acf87632001bd6d8f3e0c04658df25a7c2cc6f
Proposed branch: ~hloeung/charm-k8s-content-cache:master
Merge into: charm-k8s-content-cache:master
Diff against target: 69 lines (+11/-6)
3 files modified
Makefile (+5/-3)
README.md (+2/-2)
metadata.yaml (+4/-1)
Reviewer Review Type Date Requested Status
Paul Collins lgtm Approve
Canonical IS Reviewers Pending
Review via email: mp+403167@code.launchpad.net

Commit message

Rename charm to content-cache-k8s to avoid conflicts with the non-k8s charm

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
Paul Collins (pjdc) :
review: Approve (lgtm)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision c7acf87632001bd6d8f3e0c04658df25a7c2cc6f

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index af2c5d1..aca7573 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -1,15 +1,17 @@
6 # Copyright (C) 2020 Canonical Ltd.
7 # See LICENSE file for licensing details.
8
9-lint:
10+blacken:
11 @echo "Normalising python layout with black."
12 @tox -e black
13+
14+lint: blacken
15 @echo "Running flake8"
16 @tox -e lint
17
18 # We actually use the build directory created by charmcraft,
19 # but the .charm file makes a much more convenient sentinel.
20-unittest: content-cache.charm
21+unittest: content-cache-k8s.charm
22 @tox -e unit
23
24 test: lint unittest
25@@ -18,7 +20,7 @@ clean:
26 @echo "Cleaning files"
27 @git clean -fXd
28
29-content-cache.charm: src/*.py requirements.txt
30+content-cache-k8s.charm: lib/charms/*/v*/*.py src/*.py requirements.txt
31 charmcraft build
32
33 .PHONY: lint test unittest clean
34diff --git a/README.md b/README.md
35index 7a2aa87..6034fed 100644
36--- a/README.md
37+++ b/README.md
38@@ -31,7 +31,7 @@ cache `archive.ubuntu.com` on `archive.local`:
39 --config site=archive.local \
40 --config backend=http://archive.ubuntu.com:80 \
41 --config juju-external-hostname=archive.local
42- juju expose content-cache
43+ juju expose content-cache-k8s
44
45 And then you can test the deployment with:
46
47@@ -63,4 +63,4 @@ And now let's request a resource which has headers telling us not to cache:
48
49 ---
50
51-For more details, [see here](https://charmhub.io/content-cache/docs)
52+For more details, [see here](https://charmhub.io/content-cache-k8s/docs)
53diff --git a/metadata.yaml b/metadata.yaml
54index 7facfdc..a6b4466 100644
55--- a/metadata.yaml
56+++ b/metadata.yaml
57@@ -1,8 +1,11 @@
58-name: content-cache
59+name: content-cache-k8s
60+display-name: Content-cache
61 description: |
62 A service providing local caches of HTTP servers and useful for building content delivery networks (CDN).
63 summary: |
64 A service providing local caches of HTTP servers and useful for building content delivery networks (CDN).
65 docs: https://discourse.charmhub.io/t/content-cache-documentation-overview/3992
66+maintainers:
67+ - launchpad.net/~content-cache-charmers
68 series: [kubernetes]
69 min-juju-version: 2.8.0 # charm storage in state

Subscribers

People subscribed via source and target branches