From 6d604f7c3b51f700abf7750f28f5e3f8a8f6a748 Mon Sep 17 00:00:00 2001 From: debojitkakoti Date: Tue, 14 Jul 2020 12:51:13 +0530 Subject: [PATCH 1/2] Add loadbalancerIP to service spec in kibana --- kibana/templates/service.yaml | 3 +++ kibana/tests/kibana_test.py | 13 +++++++++++++ kibana/values.yaml | 1 + 3 files changed, 17 insertions(+) diff --git a/kibana/templates/service.yaml b/kibana/templates/service.yaml index 71400a88d..dfb254c0c 100644 --- a/kibana/templates/service.yaml +++ b/kibana/templates/service.yaml @@ -13,6 +13,9 @@ metadata: {{- end }} spec: type: {{ .Values.service.type }} +{{- if .Values.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.service.loadBalancerIP }} +{{- end }} {{- with .Values.service.loadBalancerSourceRanges }} loadBalancerSourceRanges: {{ toYaml . | indent 4 }} diff --git a/kibana/tests/kibana_test.py b/kibana/tests/kibana_test.py index 1341c6146..94a29b712 100644 --- a/kibana/tests/kibana_test.py +++ b/kibana/tests/kibana_test.py @@ -51,6 +51,9 @@ def test_defaults(): # Make sure that the default 'loadBalancerSourceRanges' list is empty assert "loadBalancerSourceRanges" not in r["service"][name]["spec"] + # Make sure that the default 'loadBalancerIP' string is empty + assert "loadBalancerIP" not in r["service"][name]["spec"] + def test_overriding_the_elasticsearch_hosts(): config = """ @@ -615,3 +618,13 @@ def test_setting_fullnameOverride(): ] == "kibana" ) + +def test_adding_loadBalancerIP(): + config = """ + service: + loadBalancerIP: 12.5.11.79 + """ + + r = helm_template(config) + + assert r["service"][name]["spec"]["loadBalancerIP"] == "12.5.11.79" \ No newline at end of file diff --git a/kibana/values.yaml b/kibana/values.yaml index ba6746c90..2b8e4fcf5 100755 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -95,6 +95,7 @@ updateStrategy: service: type: ClusterIP + loadBalancerIP: "" port: 5601 nodePort: "" labels: {} From eebf5a9a048a8d99f3cdc068abcde79945c98708 Mon Sep 17 00:00:00 2001 From: debojitkakoti Date: Thu, 16 Jul 2020 11:32:21 +0530 Subject: [PATCH 2/2] Formatted kibana test --- kibana/tests/kibana_test.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kibana/tests/kibana_test.py b/kibana/tests/kibana_test.py index 94a29b712..38a9fb154 100644 --- a/kibana/tests/kibana_test.py +++ b/kibana/tests/kibana_test.py @@ -619,6 +619,7 @@ def test_setting_fullnameOverride(): == "kibana" ) + def test_adding_loadBalancerIP(): config = """ service: @@ -626,5 +627,5 @@ def test_adding_loadBalancerIP(): """ r = helm_template(config) - - assert r["service"][name]["spec"]["loadBalancerIP"] == "12.5.11.79" \ No newline at end of file + + assert r["service"][name]["spec"]["loadBalancerIP"] == "12.5.11.79"