Tom Haddon has proposed merging ~mthaddon/charm-k8s-bind/+git/charm-k8s-bind:rename-charm into charm-k8s-bind:master.
Commit message: Rename charm for consistency with others Requested reviews: Bind Charmers (bind-charmers) For more details, see: https://code.launchpad.net/~mthaddon/charm-k8s-bind/+git/charm-k8s-bind/+merge/402883 -- Your team Bind Charmers is requested to review the proposed merge of ~mthaddon/charm-k8s-bind/+git/charm-k8s-bind:rename-charm into charm-k8s-bind:master.
diff --git a/.jujuignore b/.jujuignore index e8eb682..128851d 100644 --- a/.jujuignore +++ b/.jujuignore @@ -1,4 +1,5 @@ *~ +*.charm .coverage .gitignore __pycache__ diff --git a/Makefile b/Makefile index 6e99731..35b100d 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ lint: blacken # We actually use the build directory created by charmcraft, # but the .charm file makes a much more convenient sentinel. -unittest: bind.charm +unittest: bind-k8s.charm @tox -e unit test: lint unittest @@ -21,7 +21,7 @@ clean: @echo "Cleaning files" @git clean -fXd -bind.charm: src/*.py requirements.txt +bind-k8s.charm: src/*.py requirements.txt charmcraft build image-deps: diff --git a/README.md b/README.md index d53b3a5..3e31d97 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ details on using Juju with MicroK8s for easy local testing [see here](https://ju To deploy this charm in a juju k8s model: ``` -juju deploy cs:~bind-charmers/bind +juju deploy bind-k8s ``` The charm will deploy bind with its stock Ubuntu package configuration, which will forward all queries to root name servers. @@ -30,7 +30,7 @@ which to populate the `/etc/bind/` directory within the pod(s). Since bind won't allow recursion from external clients by default, to allow 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): ``` -juju config bind custom_config_repo=https://git.launchpad.net/~barryprice/junk/+git/etc-bind-stock-config-with-all-rfc1918-nets-allowed +juju config bind-k8s custom_config_repo=https://git.launchpad.net/~barryprice/junk/+git/etc-bind-stock-config-with-all-rfc1918-nets-allowed ``` Once the application is ready, you should be able to query the App's IP address (not the Unit addresses) directly from your local machine: @@ -44,8 +44,8 @@ bind-test myk8s-localhost myk8s/localhost 2.8.6 unsupported 16:44:30+07:0 App Version Status Scale Charm Store Rev OS Address Notes bind bind:edge active 1 bind jujucharms 2 kubernetes 10.152.183.246 -Unit Workload Agent Address Ports Message -bind/0* active idle 10.1.25.35 53/TCP,53/UDP Pod configured +Unit Workload Agent Address Ports Message +bind-k8s/0* active idle 10.1.25.35 53/TCP,53/UDP Pod configured $ dig +short example.com @10.152.183.246 93.184.216.34 diff --git a/metadata.yaml b/metadata.yaml index 7b1d7b2..6c09e29 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -1,4 +1,5 @@ -name: bind +name: bind-k8s +display-name: Bind summary: The original, complete open source DNS implementation. docs: https://discourse.charmhub.io/t/bind-documentation-overview/3973 description: | diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py index 85fe103..3938f12 100644 --- a/tests/unit/test_charm.py +++ b/tests/unit/test_charm.py @@ -117,7 +117,7 @@ class TestBindK8s(unittest.TestCase): 'version': 2, 'containers': [ { - 'name': 'bind', + 'name': 'bind-k8s', 'imageDetails': {'imagePath': 'example.com/bind:v1'}, 'ports': [ {'containerPort': 53, 'name': 'domain-tcp', 'protocol': 'TCP'}, @@ -137,7 +137,7 @@ class TestBindK8s(unittest.TestCase): 'version': 2, 'containers': [ { - 'name': 'bind', + 'name': 'bind-k8s', 'imageDetails': { 'imagePath': 'secure.example.com/bind:v1', 'username': 'test-user', @@ -161,7 +161,7 @@ class TestBindK8s(unittest.TestCase): 'version': 2, 'containers': [ { - 'name': 'bind', + 'name': 'bind-k8s', 'imageDetails': {'imagePath': 'example.com/bind:v1'}, 'ports': [ {'containerPort': 53, 'name': 'domain-tcp', 'protocol': 'TCP'}, @@ -181,7 +181,7 @@ class TestBindK8s(unittest.TestCase): 'version': 2, 'containers': [ { - 'name': 'bind', + 'name': 'bind-k8s', 'imageDetails': {'imagePath': 'example.com/bind:v1'}, 'ports': [ {'containerPort': 53, 'name': 'domain-tcp', 'protocol': 'TCP'}, @@ -201,7 +201,7 @@ class TestBindK8s(unittest.TestCase): 'version': 2, 'containers': [ { - 'name': 'bind', + 'name': 'bind-k8s', 'imageDetails': {'imagePath': 'example.com/bind:v1'}, 'ports': [ {'containerPort': 53, 'name': 'domain-tcp', 'protocol': 'TCP'},
-- Mailing list: https://launchpad.net/~bind-charmers Post to : [email protected] Unsubscribe : https://launchpad.net/~bind-charmers More help : https://help.launchpad.net/ListHelp
