charm-k8s-bind

Merge ~mthaddon/charm-k8s-bind/+git/charm-k8s-bind:rename-charm into charm-k8s-bind:master

  1. Git
  2. lp:~mthaddon/charm-k8s-bind/+git/charm-k8s-bind
  3. rename-charm
  4. Merge into master
Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: a2bf1f0fd18bb56a3b805017cac748faa72e52de
Merged at revision: 062a222b3144d59d6ad75548457de0ad1d1c16a4
Proposed branch: ~mthaddon/charm-k8s-bind/+git/charm-k8s-bind:rename-charm
Merge into: charm-k8s-bind:master
Diff against target: 125 lines (+14/-12)
5 files modified
.jujuignore (+1/-0)
Makefile (+2/-2)
README.md (+4/-4)
metadata.yaml (+2/-1)
tests/unit/test_charm.py (+5/-5)
Reviewer Review Type Date Requested Status
Barry Price Approve
Canonical IS Reviewers Pending
Review via email: mp+402883@code.launchpad.net

Commit message

Rename charm for consistency with others

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
Barry Price (barryprice) wrote :

LGTM +1

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

Change successfully merged at revision 062a222b3144d59d6ad75548457de0ad1d1c16a4

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.jujuignore b/.jujuignore
2index e8eb682..128851d 100644
3--- a/.jujuignore
4+++ b/.jujuignore
5@@ -1,4 +1,5 @@
6 *~
7+*.charm
8 .coverage
9 .gitignore
10 __pycache__
11diff --git a/Makefile b/Makefile
12index 6e99731..35b100d 100644
13--- a/Makefile
14+++ b/Makefile
15@@ -12,7 +12,7 @@ lint: blacken
16
17 # We actually use the build directory created by charmcraft,
18 # but the .charm file makes a much more convenient sentinel.
19-unittest: bind.charm
20+unittest: bind-k8s.charm
21 @tox -e unit
22
23 test: lint unittest
24@@ -21,7 +21,7 @@ clean:
25 @echo "Cleaning files"
26 @git clean -fXd
27
28-bind.charm: src/*.py requirements.txt
29+bind-k8s.charm: src/*.py requirements.txt
30 charmcraft build
31
32 image-deps:
33diff --git a/README.md b/README.md
34index d53b3a5..3e31d97 100644
35--- a/README.md
36+++ b/README.md
37@@ -16,7 +16,7 @@ details on using Juju with MicroK8s for easy local testing [see here](https://ju
38
39 To deploy this charm in a juju k8s model:
40 ```
41-juju deploy cs:~bind-charmers/bind
42+juju deploy bind-k8s
43 ```
44 The charm will deploy bind with its stock Ubuntu package configuration, which
45 will forward all queries to root name servers.
46@@ -30,7 +30,7 @@ which to populate the `/etc/bind/` directory within the pod(s).
47 Since bind won't allow recursion from external clients by default, to allow
48 easy testing, you can use [a repo with a copy of the stock config, modified to allow recursion from all RFC1918 networks](https://code.launchpad.net/~barryprice/junk/+git/etc-bind-stock-config-with-all-rfc1918-nets-allowed):
49 ```
50-juju config bind custom_config_repo=https://git.launchpad.net/~barryprice/junk/+git/etc-bind-stock-config-with-all-rfc1918-nets-allowed
51+juju config bind-k8s custom_config_repo=https://git.launchpad.net/~barryprice/junk/+git/etc-bind-stock-config-with-all-rfc1918-nets-allowed
52 ```
53 Once the application is ready, you should be able to query the App's IP address
54 (not the Unit addresses) directly from your local machine:
55@@ -44,8 +44,8 @@ bind-test myk8s-localhost myk8s/localhost 2.8.6 unsupported 16:44:30+07:0
56 App Version Status Scale Charm Store Rev OS Address Notes
57 bind bind:edge active 1 bind jujucharms 2 kubernetes 10.152.183.246
58
59-Unit Workload Agent Address Ports Message
60-bind/0* active idle 10.1.25.35 53/TCP,53/UDP Pod configured
61+Unit Workload Agent Address Ports Message
62+bind-k8s/0* active idle 10.1.25.35 53/TCP,53/UDP Pod configured
63
64 $ dig +short example.com @10.152.183.246
65 93.184.216.34
66diff --git a/metadata.yaml b/metadata.yaml
67index 7b1d7b2..6c09e29 100644
68--- a/metadata.yaml
69+++ b/metadata.yaml
70@@ -1,4 +1,5 @@
71-name: bind
72+name: bind-k8s
73+display-name: Bind
74 summary: The original, complete open source DNS implementation.
75 docs: https://discourse.charmhub.io/t/bind-documentation-overview/3973
76 description: |
77diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
78index 85fe103..3938f12 100644
79--- a/tests/unit/test_charm.py
80+++ b/tests/unit/test_charm.py
81@@ -117,7 +117,7 @@ class TestBindK8s(unittest.TestCase):
82 'version': 2,
83 'containers': [
84 {
85- 'name': 'bind',
86+ 'name': 'bind-k8s',
87 'imageDetails': {'imagePath': 'example.com/bind:v1'},
88 'ports': [
89 {'containerPort': 53, 'name': 'domain-tcp', 'protocol': 'TCP'},
90@@ -137,7 +137,7 @@ class TestBindK8s(unittest.TestCase):
91 'version': 2,
92 'containers': [
93 {
94- 'name': 'bind',
95+ 'name': 'bind-k8s',
96 'imageDetails': {
97 'imagePath': 'secure.example.com/bind:v1',
98 'username': 'test-user',
99@@ -161,7 +161,7 @@ class TestBindK8s(unittest.TestCase):
100 'version': 2,
101 'containers': [
102 {
103- 'name': 'bind',
104+ 'name': 'bind-k8s',
105 'imageDetails': {'imagePath': 'example.com/bind:v1'},
106 'ports': [
107 {'containerPort': 53, 'name': 'domain-tcp', 'protocol': 'TCP'},
108@@ -181,7 +181,7 @@ class TestBindK8s(unittest.TestCase):
109 'version': 2,
110 'containers': [
111 {
112- 'name': 'bind',
113+ 'name': 'bind-k8s',
114 'imageDetails': {'imagePath': 'example.com/bind:v1'},
115 'ports': [
116 {'containerPort': 53, 'name': 'domain-tcp', 'protocol': 'TCP'},
117@@ -201,7 +201,7 @@ class TestBindK8s(unittest.TestCase):
118 'version': 2,
119 'containers': [
120 {
121- 'name': 'bind',
122+ 'name': 'bind-k8s',
123 'imageDetails': {'imagePath': 'example.com/bind:v1'},
124 'ports': [
125 {'containerPort': 53, 'name': 'domain-tcp', 'protocol': 'TCP'},

Subscribers

People subscribed via source and target branches

to all changes: