Merge ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:dict-init-readme into charm-k8s-ingress:master

Proposed by Tom Haddon
Status: Merged
Approved by: Jon Seager
Approved revision: bb38f93deb20c6833b5d6fa54f30d67b35693365
Merged at revision: 6ed20d277e82e4b33d2ee2be931a46a8499c4a69
Proposed branch: ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:dict-init-readme
Merge into: charm-k8s-ingress:master
Diff against target: 15 lines (+3/-1)
1 file modified
README.md (+3/-1)
Reviewer Review Type Date Requested Status
ingress-charmers Pending
Review via email: mp+401382@code.launchpad.net

Commit message

Update README to reflect IngressRequires also taking a dictionary

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
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 6ed20d277e82e4b33d2ee2be931a46a8499c4a69

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index e850ea9..1add01f 100644
3--- a/README.md
4+++ b/README.md
5@@ -45,7 +45,9 @@ implements the relation using the ingress library, as a trivial example:
6 from charms.nginx_ingress_integrator.v0.ingress import IngressRequires
7
8 # In __init__:
9-self.ingress = IngressRequires(self, self.config["external_hostname"], self.app.name, 80)
10+self.ingress = IngressRequires(self, {"service-hostname": self.config["external_hostname"],
11+ "service-name": self.app.name,
12+ "service-port": 80})
13
14 # In config-changed handler
15 self.ingress.update_config({"service_hostname": self.config["external_hostname"]})

Subscribers

People subscribed via source and target branches

to all changes: