openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Prometheus: use endpoints section and lookups to set port"

Browse Source
This commit is contained in:
Zuul 2018-03-09 01:24:30 +00:00 committed by Gerrit Code Review
commit 0b7555436f
3 changed files with 3 additions and 4 deletions

2
prometheus/templates/service.yaml

@ -31,7 +31,7 @@ metadata:
spec:
ports:
- name: prom-metrics
port: {{ .Values.network.prometheus.port }}
port: {{ tuple "monitoring" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{ if .Values.network.prometheus.node_port.enabled }}
nodePort: {{ .Values.network.prometheus.node_port.port }}
{{ end }}

4
prometheus/templates/statefulset.yaml

@ -121,11 +121,11 @@ spec:
{{ tuple $envAll $envAll.Values.pod.resources.prometheus | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
ports:
- name: prom-metrics
containerPort: {{ .Values.network.prometheus.port }}
containerPort: {{ tuple "monitoring" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
readinessProbe:
httpGet:
path: /status
port: {{ .Values.network.prometheus.port }}
port: {{ tuple "monitoring" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
initialDelaySeconds: 30
timeoutSeconds: 30
volumeMounts:

1
prometheus/values.yaml

@ -160,7 +160,6 @@ network:
node_port:
enabled: false
port: 30900
port: 9090
storage:
enabled: true