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

[Barry Price]

Update OCI tag info, document behavioural change

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 9d3c065259abb74a26fb4398b3af503af5ee3294

diff --git a/README.md b/README.md
index 3e31d97..8a2b7e6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Bind Operator
 
-A Juju charm deploying Bind, configurable to use a git repository for its configuration files.
+A Juju charm deploying Bind, configurable to use a git repository for its
+configuration files.
 
 ## Overview
 
@@ -19,19 +20,22 @@ To deploy this charm in a juju k8s model:
 juju deploy bind-k8s
 ```
 The charm will deploy bind with its stock Ubuntu package configuration, which
-will forward all queries to root name servers.
+will forward all queries to root name servers. DNSSEC is enabled by default.
 
-DNSSEC is also enabled by default.
+The charm will also make one change from those defaults, to allow traffic from
+all local (RFC1918) networks.
+
+If the operator really wants the stock defaults, which only allow traffic from
+localhost, this feature can be disabled via:
+
+```
+$ juju config bind-k8s enable_rfc1918_recursion=false
+```
 
 Custom config can be deployed by setting the `custom_config_repo` option to
 point to a Git repository containing a valid set of configuration files with
 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-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:
 
@@ -54,6 +58,8 @@ $
 
 ## Known Issues
 
-This charm is unable to provide an ingress to route TCP and UDP traffic to the
-pods due to [LP#1889703](https://bugs.launchpad.net/juju/+bug/1889703). This is
-also being tracked as [a bug against the charm itself](https://bugs.launchpad.net/charm-k8s-bind/+bug/1889746).
+This charm is unable to provide an ingress service to route TCP and UDP traffic
+to the pods due to [LP#1889703](https://bugs.launchpad.net/juju/+bug/1889703).
+
+This is also being tracked as [a bug against the charm
+itself](https://bugs.launchpad.net/charm-k8s-bind/+bug/1889746).
diff --git a/config.yaml b/config.yaml
index fcad409..9b1de1d 100644
--- a/config.yaml
+++ b/config.yaml
@@ -5,7 +5,7 @@ options:
         The location of the image to use, e.g. "registry.example.com/bind:v1".
 
         This setting is required.
-    default: "bindcharmers/bind:edge"
+    default: "bindcharmers/bind:v1.0-20.04_edge"
   bind_image_username:
     type: string
     description: "Username to use for the configured image registry, if required"