[elasticsearch][kibana] Add flexible ingress

elasticsearch/templates/ingress.yaml

@@ -1,7 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "elasticsearch.uname" . -}}
-{{- $servicePort := .Values.httpPort -}}
-{{- $ingressPath := .Values.ingress.path -}}
+{{- $httpPort := .Values.httpPort -}}
 apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
@@ -17,22 +16,18 @@ metadata:
 spec:
 {{- if .Values.ingress.tls }}
   tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
+{{ toYaml .Values.ingress.tls | indent 4 }}
 {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
-    - host: {{ . }}
+    - host: {{ .host }}
       http:
         paths:
-          - path: {{ $ingressPath }}
+        {{- range .paths }}
+          - path: {{ .path }}
             backend:
               serviceName: {{ $fullName }}
-              servicePort: {{ $servicePort }}
+              servicePort: {{ .servicePort | default $httpPort }}
+        {{- end }}
   {{- end }}
 {{- end }}

elasticsearch/tests/elasticsearch_test.py

@@ -648,9 +648,19 @@ def test_adding_an_ingress_rule():
   enabled: true
   annotations:
     kubernetes.io/ingress.class: nginx
-  path: /
   hosts:
-    - elasticsearch.elastic.co
+    - host: elasticsearch.elastic.co
+      paths:
+        - path: /
+    - host: ''
+      paths:
+        - path: /
+        - path: /mypath
+          servicePort: 8888
+    - host: elasticsearch.hello.there
+      paths:
+        - path: /
+          servicePort: 9999
   tls:
   - secretName: elastic-co-wildcard
     hosts:
@@ -667,6 +677,18 @@ def test_adding_an_ingress_rule():
     assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
     assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == uname
     assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 9200
+    assert i["rules"][1]["host"] == None
+    assert i["rules"][1]["http"]["paths"][0]["path"] == "/"
+    assert i["rules"][1]["http"]["paths"][0]["backend"]["serviceName"] == uname
+    assert i["rules"][1]["http"]["paths"][0]["backend"]["servicePort"] == 9200
+    assert i["rules"][1]["http"]["paths"][1]["path"] == "/mypath"
+    assert i["rules"][1]["http"]["paths"][1]["backend"]["serviceName"] == uname
+    assert i["rules"][1]["http"]["paths"][1]["backend"]["servicePort"] == 8888
+    assert i["rules"][2]["host"] == "elasticsearch.hello.there"
+    assert i["rules"][2]["http"]["paths"][0]["path"] == "/"
+    assert i["rules"][2]["http"]["paths"][0]["backend"]["serviceName"] == uname
+    assert i["rules"][2]["http"]["paths"][0]["backend"]["servicePort"] == 9999
+
 
 
 def test_changing_the_protocol():

elasticsearch/values.yaml

@@ -243,9 +243,10 @@ ingress:
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
-  path: /
   hosts:
-    - chart-example.local
+    - host: chart-example.local
+      paths:
+        - path: /
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:

kibana/templates/ingress.yaml

@@ -1,7 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "kibana.fullname" . -}}
-{{- $servicePort := .Values.service.port -}}
-{{- $ingressPath := .Values.ingress.path -}}
+{{- $httpPort := .Values.httpPort -}}
 apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
@@ -18,12 +17,14 @@ spec:
 {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
-    - host: {{ . }}
+    - host: {{ .host }}
       http:
         paths:
-          - path: {{ $ingressPath }}
+        {{- range .paths }}
+          - path: {{ .path }}
             backend:
               serviceName: {{ $fullName }}
-              servicePort: {{ $servicePort }}
+              servicePort: {{ .servicePort | default $httpPort }}
+        {{- end }}
   {{- end }}
 {{- end }}

kibana/tests/kibana_test.py

@@ -210,9 +210,19 @@ def test_adding_an_ingress_rule():
   enabled: true
   annotations:
     kubernetes.io/ingress.class: nginx
-  path: /
   hosts:
-    - kibana.elastic.co
+    - host: kibana.elastic.co
+      paths:
+        - path: /
+        - path: /testpath
+          servicePort: 8888
+    - host: ''
+      paths:
+        - path: /
+    - host: kibana.hello.there
+      paths:
+        - path: /mypath
+          servicePort: 9999
   tls:
   - secretName: elastic-co-wildcard
     hosts:
@@ -229,6 +239,17 @@ def test_adding_an_ingress_rule():
     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"][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"][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"][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
 
 
 def test_adding_an_ingress_rule_wildcard():
@@ -237,9 +258,10 @@ def test_adding_an_ingress_rule_wildcard():
   enabled: true
   annotations:
     kubernetes.io/ingress.class: nginx
-  path: /
   hosts:
-    - kibana.elastic.co
+    - host: kibana.elastic.co
+      paths:
+        - path: /
   tls:
   - secretName: elastic-co-wildcard
     hosts:

kibana/values.yaml

@@ -120,9 +120,10 @@ ingress:
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
-  path: /
   hosts:
-    - chart-example.local
+    - host: chart-example.local
+      paths:
+        - path: /
   tls: []
   #  - secretName: chart-example-tls
   #    hosts: