openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Remove unneeded context in prometheus service annotation"

Browse Source
This commit is contained in:
Zuul 2018-01-13 00:26:56 +00:00 committed by Gerrit Code Review
commit ac53413b47
7 changed files with 6 additions and 7 deletions
helm-toolkit/templates/snippets
_prometheus_service_annotations.tpl
prometheus-kube-state-metrics/templates
service-controller-manager.yamlservice-kube-metrics.yamlservice-scheduler.yaml
prometheus-node-exporter/templates
service.yaml
prometheus-openstack-exporter/templates
service.yaml
prometheus/templates
service.yaml

1
helm-toolkit/templates/snippets/_prometheus_service_annotations.tpl

@ -25,7 +25,6 @@ limitations under the License.
{{- define "helm-toolkit.snippets.prometheus_service_annotations" -}}
{{- $endpoint := index . 0 -}}
{{- $context := index . 1 -}}
prometheus.io/scrape: {{ $endpoint.scrape | quote }}
prometheus.io/scheme: {{ $endpoint.scheme.default | quote }}
prometheus.io/path: {{ $endpoint.path.default | quote }}

2
prometheus-kube-state-metrics/templates/service-controller-manager.yaml

@ -25,7 +25,7 @@ metadata:
labels:
{{ tuple $envAll "controller-manager" "metrics" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations:
{{ tuple $endpoint $envAll | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
{{ tuple $endpoint | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
spec:
selector:
component: kube-controller-manager

2
prometheus-kube-state-metrics/templates/service-kube-metrics.yaml

@ -25,7 +25,7 @@ metadata:
labels:
{{ tuple $envAll "kube-state-metrics" "metrics" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations:
{{ tuple $endpoint $envAll | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
{{ tuple $endpoint | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
spec:
ports:
- name: http

2
prometheus-kube-state-metrics/templates/service-scheduler.yaml

@ -25,7 +25,7 @@ metadata:
labels:
{{ tuple $envAll "kube-scheduler" "metrics" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations:
{{ tuple $endpoint $envAll | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
{{ tuple $endpoint | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
spec:
selector:
component: kube-scheduler

2
prometheus-node-exporter/templates/service.yaml

@ -25,7 +25,7 @@ metadata:
labels:
{{ tuple $envAll "node_exporter" "metrics" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations:
{{ tuple $endpoint $envAll | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
{{ tuple $endpoint | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
spec:
type: ClusterIP
clusterIP: None

2
prometheus-openstack-exporter/templates/service.yaml

@ -25,7 +25,7 @@ metadata:
labels:
{{ tuple $envAll "openstack-exporter" "metrics" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations:
{{ tuple $endpoint $envAll | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
{{ tuple $endpoint | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
spec:
ports:
- name: http

2
prometheus/templates/service.yaml

@ -25,7 +25,7 @@ metadata:
labels:
{{ tuple $envAll "prometheus" "metrics" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations:
{{ tuple $endpoint $envAll | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
{{ tuple $endpoint | include "helm-toolkit.snippets.prometheus_service_annotations" | indent 4 }}
spec:
ports:
- name: prom-metrics