Merge ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:dummy-container into charm-k8s-ingress:master

[Tom Haddon]

Juju needs a dummy container per lp#1925350

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

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

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

Change successfully merged at revision 6477223711b73ee457213f8b9e5580703a01676c

diff --git a/README.md b/README.md
index c443f7c..9f2052b 100644
--- a/README.md
+++ b/README.md
@@ -19,17 +19,11 @@ below.
 
 To build the charm, run `charmcraft build`.
 
-You'll need version to be using Juju [version 2.9-rc8](https://discourse.charmhub.io/t/juju-2-9-rc8-release-notes/4394/) or later.
+You'll need version to be using Juju [version 2.9-rc11](https://discourse.charmhub.io/t/juju-2-9-rc11-release-notes/4501) or later.
 
-Once https://bugs.launchpad.net/juju/+bug/1920102 has been addressed, this
-charm will be able to use the credentials provided in cluster. However, for
-now, you will need to provide this charm with credentials to be able to talk
-to the K8s API directly. This is done via the `kube-config` config option,
-which should be set to the contents of your kubernetes client configuration.
-If you're using microk8s you can get this via `microk8s config`. As an example
-you could deploy this charm as follows:
+As an example, you could deploy this charm as follows:
 ```
-juju deploy ./nginx-ingress-integrator.charm ingress --config kube-config="$(microk8s config)"
+juju deploy ./nginx-ingress-integrator.charm ingress --resource placeholder-image=google/pause
 ```
 To create an ingress for your service, you'd then add a relation to a charm
 that supports the `ingress` relation. As an example:
diff --git a/config.yaml b/config.yaml
index 885c09b..edaed4c 100644
--- a/config.yaml
+++ b/config.yaml
@@ -11,10 +11,6 @@ options:
       annotation is unset. This value isn't available to be set via the relation
       as it's a deploy-time configuration item.
     type: string
-  kube-config:
-    default: ""
-    description: k8s config. If you're using microk8s, this should be the output of `microk8s config`.
-    type: string
   limit-rps:
     default: 0
     description: >
diff --git a/metadata.yaml b/metadata.yaml
index 09af63e..ec3b17e 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -9,6 +9,15 @@ bases:
   - name: ubuntu
     channel: 20.04/stable
 
+containers:
+  placeholder:
+    resource: placeholder-image
+
+resources:
+  placeholder-image:
+    type: oci-image
+    description: Docker image for placeholder - won't be used
+
 provides:
   ingress:
     interface: ingress
diff --git a/src/charm.py b/src/charm.py
index dcba16a..ff69cea 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -169,13 +169,7 @@ class NginxIngressCharm(CharmBase):
 
         _fix_lp_1892255()
 
-        # Work around for lp#1920102 - allow the user to pass in k8s config manually.
-        if self.config["kube-config"]:
-            with open('/kube-config', 'w') as kube_config:
-                kube_config.write(self.config["kube-config"])
-            kubernetes.config.load_kube_config(config_file='/kube-config')
-        else:
-            kubernetes.config.load_incluster_config()
+        kubernetes.config.load_incluster_config()
 
         self._authed = True