Kibana: use endpoints section and lookups to set port

This PS moves kibana to use the endpoints section and lookups to
set the port it serves on.

Change-Id: I710428f92e80faf6ac5bb444f938447248e99217
This commit is contained in:
Steve Wilkerson 2018-03-05 10:19:44 -06:00
parent d681396412
commit 4f67560c5d
3 changed files with 5 additions and 3 deletions

View File

@ -58,7 +58,7 @@ spec:
- start - start
ports: ports:
- name: http - name: http
containerPort: 80 containerPort: {{ tuple "kibana" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
env: env:
- name: KIBANA_PORT - name: KIBANA_PORT
value: {{ tuple "kibana" "internal" "kibana" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} value: {{ tuple "kibana" "internal" "kibana" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
@ -97,7 +97,7 @@ spec:
- start - start
ports: ports:
- name: kibana - name: kibana
containerPort: {{ .Values.network.kibana.port }} containerPort: {{ tuple "kibana" "internal" "kibana" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
env: env:
- name: ELASTICSEARCH_URL - name: ELASTICSEARCH_URL
value: {{ tuple "elasticsearch" "default" "client" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} value: {{ tuple "elasticsearch" "default" "client" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}

View File

@ -23,7 +23,7 @@ metadata:
spec: spec:
ports: ports:
- name: http - name: http
port: 80 port: {{ tuple "kibana" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{ if .Values.network.kibana.node_port.enabled }} {{ if .Values.network.kibana.node_port.enabled }}
nodePort: {{ .Values.network.kibana.node_port.port }} nodePort: {{ .Values.network.kibana.node_port.port }}
{{ end }} {{ end }}

View File

@ -169,6 +169,8 @@ endpoints:
port: port:
kibana: kibana:
default: 5601 default: 5601
http:
default: 80
network: network:
kibana: kibana: