Merge ~hloeung/charm-k8s-content-cache:cleanup into charm-k8s-content-cache:master

[Haw Loeung]

Tidy up reducing levels of indentation

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

PASSED: Continuous integration, rev:64c672e323e220d74f056c1276bb6170e96e540d
https://jenkins.canonical.com/is/job/lp-charm-k8s-content-cache-ci/1/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/13/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/3579/

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

review: Approve (continuous-integration)

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

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

Change successfully merged at revision 44857c01e84c717a2da2dbf2ea636c02db8f77b3

diff --git a/.jujuignore b/.jujuignore
index 4365792..0ad1790 100644
--- a/.jujuignore
+++ b/.jujuignore
@@ -9,5 +9,7 @@
 Makefile
 build/
 docker/
+requirements.txt
+tox.ini
 tests/
 __pycache__/
diff --git a/src/charm.py b/src/charm.py
index e8decc4..c18a9fe 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -103,20 +103,15 @@ class ContentCacheCharm(CharmBase):
         config = self.model.config
 
         annotations = {}
+        rules_spec = {
+            'host': config['site'],
+            'http': {
+                'paths': [{'path': '/', 'backend': {'serviceName': self.app.name, 'servicePort': CONTAINER_PORT}}],
+            },
+        }
         ingress = {
             'name': '{}-ingress'.format(self.app.name),
-            'spec': {
-                'rules': [
-                    {
-                        'host': config['site'],
-                        'http': {
-                            'paths': [
-                                {'path': '/', 'backend': {'serviceName': self.app.name, 'servicePort': CONTAINER_PORT}}
-                            ],
-                        },
-                    }
-                ],
-            },
+            'spec': {'rules': [rules_spec]},
         }
 
         client_max_body_size = config.get('client_max_body_size')
@@ -146,37 +141,34 @@ class ContentCacheCharm(CharmBase):
 
         pod_config = self._make_pod_config()
 
-        pod_spec = {
-            'version': 3,  # otherwise resources are ignored
-            'containers': [
+        containers_spec = {
+            'name': self.app.name,
+            'envConfig': pod_config,
+            'imageDetails': image_details,
+            'imagePullPolicy': 'Always',
+            'kubernetes': {
+                'livenessProbe': {
+                    'httpGet': {'path': '/', 'port': CONTAINER_PORT},
+                    'initialDelaySeconds': 3,
+                    'periodSeconds': 3,
+                },
+                'readinessProbe': {
+                    'httpGet': {'path': '/', 'port': CONTAINER_PORT},
+                    'initialDelaySeconds': 3,
+                    'periodSeconds': 3,
+                },
+            },
+            'ports': [{'containerPort': CONTAINER_PORT, 'protocol': 'TCP'}],
+            'volumeConfig': [
                 {
-                    'name': self.app.name,
-                    'envConfig': pod_config,
-                    'imageDetails': image_details,
-                    'imagePullPolicy': 'Always',
-                    'kubernetes': {
-                        'livenessProbe': {
-                            'httpGet': {'path': '/', 'port': CONTAINER_PORT},
-                            'initialDelaySeconds': 3,
-                            'periodSeconds': 3,
-                        },
-                        'readinessProbe': {
-                            'httpGet': {'path': '/', 'port': CONTAINER_PORT},
-                            'initialDelaySeconds': 3,
-                            'periodSeconds': 3,
-                        },
-                    },
-                    'ports': [{'containerPort': CONTAINER_PORT, 'protocol': 'TCP'}],
-                    'volumeConfig': [
-                        {
-                            'name': 'cache-volume',
-                            'mountPath': CACHE_PATH,
-                            'emptyDir': {'sizeLimit': config['cache_max_size']},
-                        }
-                    ],
+                    'name': 'cache-volume',
+                    'mountPath': CACHE_PATH,
+                    'emptyDir': {'sizeLimit': config['cache_max_size']},
                 }
             ],
         }
+        # version 3, otherwise resources are ignored
+        pod_spec = {'version': 3, 'containers': [containers_spec]}
 
         return pod_spec