Adjusting python tests to use the new ingress version

kibana/templates/ingress.yaml

@@ -38,7 +38,7 @@ spec:
           service:
             name: {{ $fullName }}
             port: 
-              number:{{ $httpPort }}
+              number: {{ $httpPort }}
   {{- else }}
   - host: {{ .host }}
     http:
@@ -54,4 +54,4 @@ spec:
       {{- end }}
   {{- end }}
  {{- end }}
-#{{- end }}
+ {{- end }}

kibana/tests/kibana_test.py

@@ -260,19 +260,19 @@ def test_adding_an_ingress_rule():
 
     assert i["rules"][0]["host"] == "kibana.elastic.co"
     assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == name
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 5601
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["name"] == name
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["port"]["number"] == 5601
     assert i["rules"][0]["http"]["paths"][1]["path"] == "/testpath"
-    assert i["rules"][0]["http"]["paths"][1]["backend"]["serviceName"] == name
-    assert i["rules"][0]["http"]["paths"][1]["backend"]["servicePort"] == 8888
+    assert i["rules"][0]["http"]["paths"][1]["backend"]["service"]["name"] == name
+    assert i["rules"][0]["http"]["paths"][1]["backend"]["service"]["port"]["number"] == 8888
     assert i["rules"][1]["host"] == None
     assert i["rules"][1]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][1]["http"]["paths"][0]["backend"]["serviceName"] == name
-    assert i["rules"][1]["http"]["paths"][0]["backend"]["servicePort"] == 5601
+    assert i["rules"][1]["http"]["paths"][0]["backend"]["service"]["name"] == name
+    assert i["rules"][1]["http"]["paths"][0]["backend"]["service"]["port"]["number"] == 5601
     assert i["rules"][2]["host"] == "kibana.hello.there"
     assert i["rules"][2]["http"]["paths"][0]["path"] == "/mypath"
-    assert i["rules"][2]["http"]["paths"][0]["backend"]["serviceName"] == name
-    assert i["rules"][2]["http"]["paths"][0]["backend"]["servicePort"] == 9999
+    assert i["rules"][2]["http"]["paths"][0]["backend"]["service"]["name"] == name
+    assert i["rules"][2]["http"]["paths"][0]["backend"]["service"]["port"]["number"] == 9999
 
 
 def test_adding_a_deprecated_ingress_rule():
@@ -298,8 +298,8 @@ def test_adding_a_deprecated_ingress_rule():
 
     assert i["rules"][0]["host"] == "kibana.elastic.co"
     assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == name
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 5601
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["name"] == name
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["port"]["number"] == 5601
 
 
 def test_adding_an_ingress_rule_wildcard():
@@ -326,8 +326,8 @@ def test_adding_an_ingress_rule_wildcard():
 
     assert i["rules"][0]["host"] == "kibana.elastic.co"
     assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == name
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 5601
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["name"] == name
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["port"]["number"] == 5601
 
 
 def test_adding_a_deprecated_ingress_rule_wildcard():
@@ -353,8 +353,8 @@ def test_adding_a_deprecated_ingress_rule_wildcard():
 
     assert i["rules"][0]["host"] == "kibana.elastic.co"
     assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == name
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 5601
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["name"] == name
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["port"]["number"] == 5601
 
 
 def test_override_the_default_update_strategy():

kibana/values.yaml

@@ -1,5 +1,5 @@
 ---
-elasticsearchHosts: "http://my-es-helm:9200"
+elasticsearchHosts: "http://elasticsearch-master:9200"
 
 replicas: 1
 
@@ -127,7 +127,7 @@ service:
   httpPortName: http
 
 ingress:
-  enabled: true
+  enabled: false
   className: ""
   pathtype: ImplementationSpecific
   annotations: {}

logstash/tests/logstash_test.py

@@ -932,20 +932,25 @@ def test_adding_an_ingress():
     - host: logstash.local
       paths:
         - path: /logs
-          servicePort: 8080
+          servicePort: 9600
 """
     r = helm_template(config)
     s = r["ingress"][name]
     assert s["metadata"]["name"] == name
-    assert len(s["spec"]["rules"]) == 1
-    assert s["spec"]["rules"][0] == {
-        "host": "logstash.local",
-        "http": {
-            "paths": [
-                {"path": "/logs", "backend": {"serviceName": name, "servicePort": 8080}}
-            ]
-        },
-    }
+    #assert len(s["spec"]["rules"]) == 1
+    #assert s["spec"]["rules"][0] == {
+    #    "host": "logstash.local",
+    #    "http": {
+    #        "paths": [
+    #            {"path": "/logs", "backend": {"service": ["name" == name , "port","number" == 8080 ]}}
+    #        ]
+    #    },
+    #}
+
+    assert s["spec"]["rules"][0]["host"] == "logstash.local"
+    assert s["spec"]["rules"][0]["http"]["paths"][0]["path"] == "/logs"
+    assert s["spec"]["rules"][0]["http"]["paths"][0]["backend"]["service"]["name"] == name
+    assert s["spec"]["rules"][0]["http"]["paths"][0]["backend"]["service"]["port"]["number"] == 9600
 
 
 def test_hostaliases():

logstash/values.yaml

@@ -269,7 +269,7 @@ service: {}
 #      targetPort: 8080
 
 ingress:
-  enabled: true
+  enabled: false
   className: ""
   pathtype: ImplementationSpecific
   hosts: