openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Nagios: Configure ports with endpoint port lookups"

Browse Source
This commit is contained in:
Zuul 2018-04-03 22:32:16 +00:00 committed by Gerrit Code Review
commit e72b2cfa21
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nagios/templates/deployment.yaml
View File

@ -87,7 +87,7 @@ spec:
{{ tuple $envAll $envAll.Values.pod.resources.nagios | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.nagios | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
ports: ports:
- name: metrics - name: metrics
containerPort: {{ .Values.network.nagios.port }} containerPort: {{ tuple "nagios" "internal" "nagios" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
env: env:
- name: PROMETHEUS_SERVICE - name: PROMETHEUS_SERVICE
value: {{ tuple "monitoring" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }} value: {{ tuple "monitoring" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}

4
nagios/templates/service.yaml
View File

@ -23,8 +23,8 @@ metadata:
name: {{ tuple "nagios" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} name: {{ tuple "nagios" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
spec: spec:
ports: ports:
- name: nagios-metrics - name: metrics
port: {{ .Values.network.nagios.port }} port: {{ tuple "nagios" "internal" "nagios" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{ if .Values.network.nagios.node_port.enabled }} {{ if .Values.network.nagios.node_port.enabled }}
nodePort: {{ .Values.network.nagios.node_port.port }} nodePort: {{ .Values.network.nagios.node_port.port }}
{{ end }} {{ end }}

1
nagios/values.yaml
View File

@ -99,7 +99,6 @@ network:
node_port: node_port:
enabled: false enabled: false
port: 30925 port: 30925
port: 25
pod: pod:
lifecycle: lifecycle: