Merge ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:readme-app-name into charm-k8s-ingress:master

Proposed by Tom Haddon
Status: Merged
Approved by: Jon Seager
Approved revision: fdc73b92822c54502006afbce2a988f25d05f06d
Merged at revision: 4db025ed9ceb6333e981816c6399c2b3315b0585
Proposed branch: ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:readme-app-name
Merge into: charm-k8s-ingress:master
Diff against target: 13 lines (+1/-1)
1 file modified
README.md (+1/-1)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-is (community) continuous-integration Approve
ingress-charmers Pending
Review via email: mp+400436@code.launchpad.net

Commit message

Use application name rather than model name in example ingress relation

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

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
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

PASSED: Continuous integration, rev:fdc73b92822c54502006afbce2a988f25d05f06d
https://jenkins.canonical.com/is/job/lp-charm-k8s-ingress-ci/16/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/48/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/61160/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-ingress-ci/16//rebuild

review: Approve (continuous-integration)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 4db025ed9ceb6333e981816c6399c2b3315b0585

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 25d9de4..d1dc427 100644
3--- a/README.md
4+++ b/README.md
5@@ -59,7 +59,7 @@ def _on_ingress_changed(self, event: ops.framework.EventBase) -> None:
6 """Handle the ingress relation changed event."""
7 if self.unit.is_leader():
8 event.relation.data[self.app]["service-hostname"] = self.config["external_hostname"]
9- event.relation.data[self.app]["service-name"] = self.model.name
10+ event.relation.data[self.app]["service-name"] = self.app.name
11 event.relation.data[self.app]["service-port"] = "80"
12 ```
13 All of the config items in `config.yaml` with the exception of `kube-config` can

Subscribers

People subscribed via source and target branches

to all changes: