Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

[kibana] add service.httpPortName config in chart #843

Merged
merged 4 commits into from
Dec 1, 2020
Merged

[kibana] add service.httpPortName config in chart #843

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dadda2a
[kibana] add service.httpPortName config in chart
ebuildy Oct 18, 2020
65e4c6e
Merge remote-tracking branch 'origin/master' into kibana/port
jmlrt Dec 1, 2020
94126c3
remove duplicate test assertion
jmlrt Dec 1, 2020
d40f19d
format python code using black
jmlrt Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kibana/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
14 changes: 14 additions & 0 deletions kibana/tests/kibana_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,3 +629,17 @@ def test_adding_loadBalancerIP():
r = helm_template(config)

assert r["service"][name]["spec"]["loadBalancerIP"] == "12.5.11.79"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Black formatter requires 2 empty lines between each function.

Can you run black kibana/tests/kibana_test.py to fix it?

def test_service_port_name():
r = helm_template("")

assert r["service"][name]["spec"]["ports"][0]["name"] == "http"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you move this assertion to https://github.com/elastic/helm-charts/blob/master/kibana/tests/kibana_test.py#L12?


config = """
service:
httpPortName: istio
"""

r = helm_template(config)

assert r["service"][name]["spec"]["ports"][0]["name"] == "istio"
1 change: 1 addition & 0 deletions kibana/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down