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

[Tom Haddon]

Use patch_namespaced_service to deal with updates to a service we've already defined

Use patch_namespaced_service to deal with updates to a service we've already defined

[🤖 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:79dc2579eb153389ff28f2a6796da67d5113619b
https://jenkins.canonical.com/is/job/lp-charm-k8s-ingress-ci/18/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/50/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/61477/

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

review: Approve (continuous-integration)

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

Change successfully merged at revision 79873e183a801ed2a9e235fbc965d7cbe81943e0

diff --git a/src/charm.py b/src/charm.py
index 0903459..7a8d5dc 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -268,19 +268,9 @@ class CharmK8SIngressCharm(CharmBase):
         body = self._get_k8s_service()
         services = api.list_namespaced_service(namespace=self._namespace)
         if self._k8s_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._namespace,
-            #    body=body,
-            # )
-            api.delete_namespaced_service(
+            api.patch_namespaced_service(
                 name=self._k8s_service_name,
                 namespace=self._namespace,
-            )
-            api.create_namespaced_service(
-                namespace=self._namespace,
                 body=body,
             )
             logger.info(
@@ -341,5 +331,5 @@ class CharmK8SIngressCharm(CharmBase):
         self.unit.status = ActiveStatus(msg)
 
 
-if __name__ == "__main__":
+if __name__ == "__main__":  # pragma: no cover
     main(CharmK8SIngressCharm)