Merge pull request #1343 from ctolon22/master

Added Helm Chart support for self monitor

Author: k8s-ci-robot

charts/kube-state-metrics/Chart.yaml

@@ -6,7 +6,7 @@ keywords:
 - monitoring
 - prometheus
 - kubernetes
-version: 2.11.0
+version: 2.12.0
 appVersion: 1.9.7
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:

charts/kube-state-metrics/templates/deployment.yaml

@@ -161,6 +161,10 @@ spec:
 {{ if .Values.kubeconfig.enabled }}
         - --kubeconfig=/opt/k8s/.kube/config
 {{ end }}
+{{ if .Values.selfMonitor.telemetryHost }}
+        - --telemetry-host={{ .Values.selfMonitor.telemetryHost }}
+{{ end }}
+        - --telemetry-port=8081
 {{- if .Values.kubeconfig.enabled }}
         volumeMounts:
         - name: kubeconfig

charts/kube-state-metrics/templates/service.yaml

@@ -28,6 +28,12 @@ spec:
     nodePort: {{ .Values.service.nodePort }}
   {{- end }}
     targetPort: 8080
+  {{ if .Values.selfMonitor.enabled }}
+  - name: "metrics"
+    protocol: TCP
+    port: {{ .Values.selfMonitor.telemetryPort | default 8081 }}
+    targetPort: 8081
+  {{ end }}
 {{- if .Values.service.loadBalancerIP }}
   loadBalancerIP: "{{ .Values.service.loadBalancerIP }}"
 {{- end }}

charts/kube-state-metrics/templates/servicemonitor.yaml

@@ -22,4 +22,10 @@ spec:
       {{- if .Values.prometheus.monitor.honorLabels }}
       honorLabels: true
       {{- end }}
+    {{ if .Values.selfMonitor.enabled }}
+    - port: metrics
+      {{- if .Values.prometheus.monitor.honorLabels }}
+      honorLabels: true
+      {{- end }}
+    {{ end }}
 {{- end }}

charts/kube-state-metrics/values.yaml

@@ -170,3 +170,10 @@ resources: {}
 ## For example: kubeTargetVersionOverride: 1.14.9
 ##
 kubeTargetVersionOverride: ""
+
+# Enable self metrics configuration for service and Service Monitor
+# Default values for telemetry configuration can be overriden
+selfMonitor:
+  enabled: false
+  # telemetryHost: 0.0.0.0
+  # telemetryPort: 8081