Fixed default values and ingress. Reformatted test file.

logstash/templates/ingress.yaml

@@ -1,6 +1,5 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "logstash.fullname" . -}}
-{{- $ingressPath := .Values.ingress.path -}}
 apiVersion: {{ template "logstash.ingress.apiVersion" . }}
 kind: Ingress
 metadata:

logstash/tests/logstash_test.py

@@ -540,9 +540,9 @@ def test_adding_a_node_affinity():
         - myvalue
 """
     r = helm_template(config)
-    assert r["statefulset"][name]["spec"]["template"]["spec"][
-        "affinity"
-    ]["nodeAffinity"] == {
+    assert r["statefulset"][name]["spec"]["template"]["spec"]["affinity"][
+        "nodeAffinity"
+    ] == {
         "preferredDuringSchedulingIgnoredDuringExecution": [
             {
                 "weight": 100,
@@ -580,10 +580,9 @@ def test_adding_in_logstash_config():
 
     s = r["statefulset"][name]["spec"]["template"]["spec"]
 
-    assert {
-        "configMap": {"name": name + "-config"},
-        "name": "logstashconfig",
-    } in s["volumes"]
+    assert {"configMap": {"name": name + "-config"}, "name": "logstashconfig",} in s[
+        "volumes"
+    ]
     assert {
         "mountPath": "/usr/share/logstash/config/logstash.yml",
         "name": "logstashconfig",
@@ -877,6 +876,7 @@ def test_setting_fullnameOverride():
         == "logstash"
     )
 
+
 def test_adding_an_ingress():
     config = """
 ingress:
@@ -896,13 +896,7 @@ def test_adding_an_ingress():
         "host": "logstash.local",
         "http": {
             "paths": [
-                {
-                    "path": "/logs",
-                    "backend": {
-                        "serviceName": name,
-                        "servicePort": 8080
-                    }
-                }
+                {"path": "/logs", "backend": {"serviceName": name, "servicePort": 8080}}
             ]
-        }
+        },
     }

logstash/values.yaml

@@ -248,7 +248,7 @@ service: {}
 #      targetPort: 8080
 
 ingress:
-  enabled: true
+  enabled: false
 #  annotations: {}
 #  hosts:
 #    - host: logstash.local