From 14ae299a4fcf3371c40ddec7b65aded58a3d193c Mon Sep 17 00:00:00 2001
From: Thomas Decaux <ebuildy@gmail.com>
Date: Tue, 1 Dec 2020 18:11:46 +0100
Subject: [PATCH] [kibana] add service.httpPortName config in chart (#843)

Co-authored-by: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
---
 kibana/templates/service.yaml |  2 +-
 kibana/tests/kibana_test.py   | 13 +++++++++++++
 kibana/values.yaml            |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/kibana/templates/service.yaml b/kibana/templates/service.yaml
index dfb254c0c..fbced7344 100644
--- a/kibana/templates/service.yaml
+++ b/kibana/templates/service.yaml
@@ -26,7 +26,7 @@ spec:
       nodePort: {{ .Values.service.nodePort }}
 {{- end }}
       protocol: TCP
-      name: http
+      name: {{ .Values.service.httpPortName | default "http" }}
       targetPort: {{ .Values.httpPort }}
   selector:
     app: {{ .Chart.Name }}
diff --git a/kibana/tests/kibana_test.py b/kibana/tests/kibana_test.py
index 38a9fb154..d58da0301 100644
--- a/kibana/tests/kibana_test.py
+++ b/kibana/tests/kibana_test.py
@@ -629,3 +629,16 @@ def test_adding_loadBalancerIP():
     r = helm_template(config)
 
     assert r["service"][name]["spec"]["loadBalancerIP"] == "12.5.11.79"
+
+
+def test_service_port_name():
+    r = helm_template("")
+
+    config = """
+    service:
+      httpPortName: istio
+    """
+
+    r = helm_template(config)
+
+    assert r["service"][name]["spec"]["ports"][0]["name"] == "istio"
diff --git a/kibana/values.yaml b/kibana/values.yaml
index 53ba34e8b..d6bed2736 100755
--- a/kibana/values.yaml
+++ b/kibana/values.yaml
@@ -107,6 +107,7 @@ service:
     # service.beta.kubernetes.io/cce-load-balancer-internal-vpc: "true"
   loadBalancerSourceRanges: []
     # 0.0.0.0/0
+  httpPortName: http
 
 ingress:
   enabled: false