From dadda2a8b1aa714cc38064064091522c73f3691d Mon Sep 17 00:00:00 2001 From: Thomas Decaux Date: Sun, 18 Oct 2020 15:42:15 +0200 Subject: [PATCH 1/3] [kibana] add service.httpPortName config in chart --- kibana/templates/service.yaml | 2 +- kibana/tests/kibana_test.py | 14 ++++++++++++++ kibana/values.yaml | 1 + 3 files changed, 16 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..2b6c0ed18 100644 --- a/kibana/tests/kibana_test.py +++ b/kibana/tests/kibana_test.py @@ -629,3 +629,17 @@ 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("") + + assert r["service"][name]["spec"]["ports"][0]["name"] == "http" + + 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 2b8e4fcf5..cf6980fed 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 From 94126c3e8ff71dcfd291689fbcb8ec021e53ec47 Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Tue, 1 Dec 2020 17:18:03 +0100 Subject: [PATCH 2/3] remove duplicate test assertion This assertion is already tested in `test_defaults` https://github.com/ebuildy/helm-charts/blob/dadda2a8b1aa714cc38064064091522c73f3691d/kibana/tests/kibana_test.py#L23 --- kibana/tests/kibana_test.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/kibana/tests/kibana_test.py b/kibana/tests/kibana_test.py index 2b6c0ed18..3769d794c 100644 --- a/kibana/tests/kibana_test.py +++ b/kibana/tests/kibana_test.py @@ -633,8 +633,6 @@ def test_adding_loadBalancerIP(): def test_service_port_name(): r = helm_template("") - assert r["service"][name]["spec"]["ports"][0]["name"] == "http" - config = """ service: httpPortName: istio From d40f19d0953057c49204eea6f980c4c5a8051de0 Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Tue, 1 Dec 2020 17:18:55 +0100 Subject: [PATCH 3/3] format python code using black --- kibana/tests/kibana_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/kibana/tests/kibana_test.py b/kibana/tests/kibana_test.py index 3769d794c..d58da0301 100644 --- a/kibana/tests/kibana_test.py +++ b/kibana/tests/kibana_test.py @@ -630,6 +630,7 @@ def test_adding_loadBalancerIP(): assert r["service"][name]["spec"]["loadBalancerIP"] == "12.5.11.79" + def test_service_port_name(): r = helm_template("")