kube-state-metrics: use endpoints section and lookups to set port

This PS moves kube-state-metrics to use the endpoints section and
lookups to set the ports it serves on.

Change-Id: Icb4757a59852e508148ca9f1e682c722e40042c9
This commit is contained in:
Steve Wilkerson 2018-03-05 10:39:28 -06:00
parent d6e9fa2c5a
commit 1929cdcbef
5 changed files with 13 additions and 11 deletions

View File

@ -108,5 +108,5 @@ spec:
{{ tuple $envAll $envAll.Values.pod.resources.kube_state_metrics | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.kube_state_metrics | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
ports: ports:
- name: metrics - name: metrics
containerPort: {{ .Values.network.kube_state_metrics.port }} containerPort: {{ tuple "kube_state_metrics" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{- end }} {{- end }}

View File

@ -35,7 +35,7 @@ spec:
clusterIP: None clusterIP: None
ports: ports:
- name: http-metrics - name: http-metrics
port: 10252 port: {{ tuple "kube_controller_manager" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
targetPort: 10252 targetPort: {{ tuple "kube_controller_manager" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
protocol: TCP protocol: TCP
{{- end }} {{- end }}

View File

@ -31,8 +31,8 @@ metadata:
spec: spec:
ports: ports:
- name: http - name: http
port: {{ .Values.network.kube_state_metrics.port }} port: {{ tuple "kube_state_metrics" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
targetPort: 8080 targetPort: {{ tuple "kube_state_metrics" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
selector: selector:
{{ tuple $envAll "kube-state-metrics" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} {{ tuple $envAll "kube-state-metrics" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- end }} {{- end }}

View File

@ -35,7 +35,7 @@ spec:
clusterIP: None clusterIP: None
ports: ports:
- name: http-metrics - name: http-metrics
port: 10251 port: {{ tuple "kube_scheduler" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
targetPort: 10251 targetPort: {{ tuple "kube_scheduler" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
protocol: TCP protocol: TCP
{{- end }} {{- end }}

View File

@ -120,11 +120,17 @@ endpoints:
default: 'http' default: 'http'
path: path:
default: /metrics default: /metrics
port:
metrics:
default: 10251
kube_controller_manager: kube_controller_manager:
scheme: scheme:
default: 'http' default: 'http'
path: path:
default: /metrics default: /metrics
port:
metrics:
default: 10252
monitoring: monitoring:
prometheus: prometheus:
@ -136,10 +142,6 @@ monitoring:
kube_controller_manager: kube_controller_manager:
scrape: true scrape: true
network:
kube_state_metrics:
port: 8080
manifests: manifests:
configmap_bin: true configmap_bin: true
deployment: true deployment: true