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

[Tom Haddon]

Initial working version of the charm

Initial working version of the charm

[🤖 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 058e690492c5a50d1dcf1a87f6c387f1fd65cc9c

diff --git a/.flake8 b/.flake8
index 8ef84fc..41512a8 100644
--- a/.flake8
+++ b/.flake8
@@ -1,5 +1,5 @@
 [flake8]
-max-line-length = 99
+max-line-length = 120
 select: E,W,F,C,N
 exclude:
   venv
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..58a7dc6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+*~
+*swp
+*.charm
+.tox
+.coverage
+__pycache__
+build
+venv
diff --git a/config.yaml b/config.yaml
index fc2a7af..5323e7e 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,11 +1,7 @@
 # Copyright 2021 Tom Haddon
 # See LICENSE file for licensing details.
-#
-# This is only an example, and you should edit to suit your needs.
-# If you don't need config, you can remove the file entirely.
-# 
-# options:
-#   thing:
-#     default: 🎁
-#     description: A thing used by the charm.
-#     type: string
+options:
+  thing:
+    default: 🎁
+    description: A thing used by the charm.
+    type: string
diff --git a/manifest.yaml b/manifest.yaml
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/manifest.yaml
@@ -0,0 +1 @@
+{}
diff --git a/metadata.yaml b/metadata.yaml
index 6d44a76..6b4c014 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,10 +1,23 @@
 # Copyright 2021 Tom Haddon
 # See LICENSE file for licensing details.
-name: charm-k8s-ingress
+name: k8s-ingress
 description: |
-  TODO: fill out the charm's description
+  An operator to configure a kubernetes ingress.
 summary: |
-  TODO: fill out the charm's summary
-series: [kubernetes]
+  An operator to configure a kubernetes ingress.
+min-juju-version: 2.9.0
+platforms:
+  - kubernetes
+systems:
+  - os: ubuntu
+    channel: 20.04/stable
 
+containers:
+  placeholder:
+    systems:
+      - resource: placeholder-image
 
+resources:
+  placeholder-image:
+    type: oci-image
+    description: A placeholder image, operator code won't do anything with it.
diff --git a/src/charm.py b/src/charm.py
index 84bf9c9..ced295f 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -14,6 +14,7 @@ import logging
 
 from ops.charm import CharmBase
 from ops.main import main
+from ops.model import ActiveStatus
 from ops.framework import StoredState
 
 logger = logging.getLogger(__name__)
@@ -27,7 +28,6 @@ class CharmK8SIngressCharm(CharmBase):
     def __init__(self, *args):
         super().__init__(*args)
         self.framework.observe(self.on.config_changed, self._on_config_changed)
-        self.framework.observe(self.on.fortune_action, self._on_fortune_action)
         self._stored.set_default(things=[])
 
     def _on_config_changed(self, _):
@@ -37,15 +37,7 @@ class CharmK8SIngressCharm(CharmBase):
         if current not in self._stored.things:
             logger.debug("found a new thing: %r", current)
             self._stored.things.append(current)
-
-    def _on_fortune_action(self, event):
-        # Note: you need to uncomment the example in the actions.yaml file for this to work (ensure
-        # to not just leave the example, but adapt to your needs for actions commands)
-        fail = event.params["fail"]
-        if fail:
-            event.fail(fail)
-        else:
-            event.set_results({"fortune": "A bug in the code is worth two in the documentation."})
+        self.unit.status = ActiveStatus()
 
 
 if __name__ == "__main__":