Merge ~mthaddon/charm-k8s-ingress/+git/charm-k8s-ingress:custom-on-relation into charm-k8s-ingress:master

[Tom Haddon]

Move the IngressCharmEvents class into the relation library

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

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

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

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

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

FAILED: Continuous integration, rev:e112b1f129ad918ec289a0b5588aaf88ce74b053
https://jenkins.canonical.com/is/job/lp-charm-k8s-ingress-ci/31/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/is/job/lp-charm-test/67/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/77419/

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

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

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

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

PASSED: Continuous integration, rev:93db9d67df97ed9db6eb07e54bbaf83588fee75f
https://jenkins.canonical.com/is/job/lp-charm-k8s-ingress-ci/32/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/68/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/77455/

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

review: Approve (continuous-integration)

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

Change successfully merged at revision ec2a890b14f6b8eb9b9da69060a2f6fc378e4fc1

diff --git a/lib/charms/ingress/v0/ingress.py b/lib/charms/ingress/v0/ingress.py
index f825fbb..2412e06 100644
--- a/lib/charms/ingress/v0/ingress.py
+++ b/lib/charms/ingress/v0/ingress.py
@@ -32,7 +32,8 @@ self.ingress.update_config({"service-hostname": self.config["external_hostname"]
 
 import logging
 
-from ops.framework import EventBase, Object
+from ops.charm import CharmEvents
+from ops.framework import EventBase, EventSource, Object
 from ops.model import BlockedStatus
 
 # The unique Charmhub library identifier, never change it
@@ -43,7 +44,7 @@ LIBAPI = 0
 
 # Increment this PATCH version before using `charmcraft push-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 6
+LIBPATCH = 7
 
 logger = logging.getLogger(__name__)
 
@@ -65,6 +66,12 @@ class IngressAvailableEvent(EventBase):
     pass
 
 
+class IngressCharmEvents(CharmEvents):
+    """Custom charm events."""
+
+    ingress_available = EventSource(IngressAvailableEvent)
+
+
 class IngressRequires(Object):
     """This class defines the functionality for the 'requires' side of the 'ingress' relation.
 
diff --git a/src/charm.py b/src/charm.py
index c7cf6be..17ee96d 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -9,11 +9,10 @@ from pathlib import Path
 import kubernetes
 
 from charms.ingress.v0.ingress import (
-    IngressAvailableEvent,
+    IngressCharmEvents,
     IngressProvides,
 )
-from ops.charm import CharmBase, CharmEvents
-from ops.framework import EventSource
+from ops.charm import CharmBase
 from ops.main import main
 from ops.model import ActiveStatus
 
@@ -40,12 +39,6 @@ def _fix_lp_1892255():
     )
 
 
-class IngressCharmEvents(CharmEvents):
-    """Custom charm events."""
-
-    ingress_available = EventSource(IngressAvailableEvent)
-
-
 class IngressCharm(CharmBase):
     """Charm the service."""