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

[Tom Haddon]

Use current juju model as default namespace

[🤖 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)]

PASSED: Continuous integration, rev:fc9fdd373478a03b409319fdae158a7502d762dc
https://jenkins.canonical.com/is/job/lp-charm-k8s-ingress-ci/7/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/37/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/49407/

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

review: Approve (continuous-integration)

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

Change successfully merged at revision d3294df8d2b74b8fdf4a4cd332b599e65441b007

diff --git a/config.yaml b/config.yaml
index e9d5df8..c023767 100644
--- a/config.yaml
+++ b/config.yaml
@@ -15,7 +15,7 @@ options:
     type: string
   service-namespace:
     default: ""
-    description: The namespace of the service to create an ingress for.
+    description: The namespace of the service to create an ingress for. Will default to the namespace this charm is deployed into.
     type: string
   service-port:
     default: 0
diff --git a/src/charm.py b/src/charm.py
index 7639bdb..a6a666d 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -60,6 +60,11 @@ class CharmK8SIngressCharm(CharmBase):
         return "{}-ingress".format(self.config["service-name"])
 
     @property
+    def _namespace(self):
+        """Return the namespace to operate on."""
+        return self.config["service-namespace"] or self.model.name
+
+    @property
     def _service_name(self):
         """Return a service name for the use creating a k8s service."""
         # Avoid collision with service name created by Juju.
@@ -146,7 +151,7 @@ class CharmK8SIngressCharm(CharmBase):
         """Report on service IP(s)."""
         self.k8s_auth()
         api = _core_v1_api()
-        services = api.list_namespaced_service(namespace=self.config["service-namespace"])
+        services = api.list_namespaced_service(namespace=self._namespace)
         return [x.spec.cluster_ip for x in services.items if x.metadata.name == self._service_name]
 
     def _define_service(self):
@@ -154,36 +159,36 @@ class CharmK8SIngressCharm(CharmBase):
         self.k8s_auth()
         api = _core_v1_api()
         body = self._get_k8s_service()
-        services = api.list_namespaced_service(namespace=self.config["service-namespace"])
+        services = api.list_namespaced_service(namespace=self._namespace)
         if self._service_name in [x.metadata.name for x in services.items]:
             # Currently failing with port[1].name required but we're only
             # defining one port above...
             # api.patch_namespaced_service(
             #    name=service_name,
-            #    namespace=self.config["service-namespace"],
+            #    namespace=self._namespace,
             #    body=body,
             # )
             api.delete_namespaced_service(
                 name=self._service_name,
-                namespace=self.config["service-namespace"],
+                namespace=self._namespace,
             )
             api.create_namespaced_service(
-                namespace=self.config["service-namespace"],
+                namespace=self._namespace,
                 body=body,
             )
             logger.info(
                 "Service updated in namespace %s with name %s",
-                self.config["service-namespace"],
+                self._namespace,
                 self.config["service-name"],
             )
         else:
             api.create_namespaced_service(
-                namespace=self.config["service-namespace"],
+                namespace=self._namespace,
                 body=body,
             )
             logger.info(
                 "Service created in namespace %s with name %s",
-                self.config["service-namespace"],
+                self._namespace,
                 self.config["service-name"],
             )
 
@@ -192,26 +197,26 @@ class CharmK8SIngressCharm(CharmBase):
         self.k8s_auth()
         api = _networking_v1_beta1_api()
         body = self._get_k8s_ingress()
-        ingresses = api.list_namespaced_ingress(namespace=self.config["service-namespace"])
+        ingresses = api.list_namespaced_ingress(namespace=self._namespace)
         if self._ingress_name in [x.metadata.name for x in ingresses.items]:
             api.patch_namespaced_ingress(
                 name=self._ingress_name,
-                namespace=self.config["service-namespace"],
+                namespace=self._namespace,
                 body=body,
             )
             logger.info(
                 "Ingress updated in namespace %s with name %s",
-                self.config["service-namespace"],
+                self._namespace,
                 self.config["service-name"],
             )
         else:
             api.create_namespaced_ingress(
-                namespace=self.config["service-namespace"],
+                namespace=self._namespace,
                 body=body,
             )
             logger.info(
                 "Ingress created in namespace %s with name %s",
-                self.config["service-namespace"],
+                self._namespace,
                 self.config["service-name"],
             )
 
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index 2d335c7..22ca656 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -54,6 +54,13 @@ class TestCharm(unittest.TestCase):
         # Confirm status is as expected.
         self.assertEqual(self.harness.charm.unit.status, ActiveStatus())
 
+    def test_namespace(self):
+        """Test for the namespace property."""
+        self.assertEqual(self.harness.charm.config["service-namespace"], "")
+        self.assertEqual(self.harness.charm._namespace, self.harness.charm.model.name)
+        self.harness.update_config({"service-namespace": "mymodelname"})
+        self.assertEqual(self.harness.charm._namespace, "mymodelname")
+
     def test_get_k8s_ingress(self):
         """Test getting our definition of a k8s ingress."""
         self.harness.disable_hooks()