Merge ~davigar15/charm-k8s-ingress:fix-bug-1952105 into charm-k8s-ingress:master

[David]

Fix bug #1952105: Remove placeholder container

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

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

[Tom Haddon (mthaddon)]

Can update the README which currently says you'll need 2.9.0 or greater to say 2.9.18 or greater?

review: Needs Fixing

e5337fe... by David on 2021-11-24

Update minimum Juju version in README.md

[Tom Haddon (mthaddon)]

I've been chatting with the Juju developers about this in https://chat.charmhub.io/charmhub/channels/juju and they say that `assumes` support hasn't landed yet, and currently juju won't enforce it at deploy/upgrade time. This means that this charm could be deployed on a machine model.

I don't think we should remove this container until `assumes` support allows us to enforce which substrates this charm can be deployed on.

[Tom Haddon (mthaddon)]

I've filed https://bugs.launchpad.net/juju/+bug/1952399. I don't think we should merge this MP until that's been addressed (and it'll likely need an update to use the correct "assumes" invocation at that time).

[Tom Haddon (mthaddon)]

Will move this to a PR on Github, marking this as rejected.

Unmerged commits

e5337fe... by David on 2021-11-24

Update minimum Juju version in README.md

b0eeff2... by David on 2021-11-24

Fix bug #1952105: Remove placeholder container

diff --git a/README.md b/README.md
index 8ccd748..b479e1f 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ enable it with `juju expose kubernetes-worker`.
 
 ## Usage
 
-You'll need version to be using Juju [version 2.9.0](https://discourse.charmhub.io/t/juju-2-9-0-release-notes/4525) or later, and Kubernetes version 1.19 or later.
+You'll need version to be using Juju [version 2.9.18](https://discourse.charmhub.io/t/roadmap-releases/5064) or later, and Kubernetes version 1.19 or later.
 
 As an example, you could deploy this charm as follows (we're using the name
 "ingress" in this model for brevity):
diff --git a/metadata.yaml b/metadata.yaml
index ff29738..cd1ef60 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -7,15 +7,6 @@ summary: |
   An operator to configure a kubernetes ingress.
 docs: https://discourse.charmhub.io/t/nginx-ingress-integrator-docs-index/4511
 
-containers:
-  placeholder:
-    resource: placeholder-image
-
-resources:
-  placeholder-image:
-    type: oci-image
-    description: Docker image for placeholder - won't be used
-
 provides:
   ingress:
     interface: ingress