Allow to configure kube-proxy endpoints (#17918)

Signed-off-by: Mickaël Canévet <mickael.canevet@camptocamp.com>

stable/prometheus-operator/Chart.yaml

@@ -10,7 +10,7 @@ name: prometheus-operator
 sources:
   - https://github.com/coreos/prometheus-operator
   - https://coreos.com/operators/prometheus
-version: 6.20.3
+version: 6.21.0
 appVersion: 0.32.0
 home: https://github.com/coreos/prometheus-operator
 keywords:

stable/prometheus-operator/README.md

@@ -454,6 +454,7 @@ For a full list of configurable values please refer to the [Grafana chart](https
 | `kubeEtcd.serviceMonitor.scheme` | Etcd servicemonitor scheme | `http` |
 | `kubeEtcd.serviceMonitor.serverName` | Etcd server name to validate certificate against when scraping | `""` |
 | `kubeProxy.enabled` | Deploy a `service` and `serviceMonitor` to scrape the Kubernetes proxy | `true` |
+| `kubeProxy.endpoints` | Endpoints where proxy runs. Provide this if running proxy outside the cluster | `[]` |
 | `kubeProxy.service.port` | Kubernetes proxy port for the service runs on | `10249` |
 | `kubeProxy.service.selector` | Kubernetes proxy service selector | `{"k8s-app" : "kube-proxy" }` |
 | `kubeProxy.service.targetPort` | Kubernetes proxy targetPort for the service runs on | `10249` |

stable/prometheus-operator/templates/exporters/kube-proxy/endpoints.yaml

@@ -0,0 +1,21 @@
+{{- if and .Values.kubeProxy.enabled .Values.kubeProxy.endpoints }}
+apiVersion: v1
+kind: Endpoints
+metadata:
+  name: {{ template "prometheus-operator.fullname" . }}-kube-proxy
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ template "prometheus-operator.name" . }}-kube-proxy
+    k8s-app: kube-proxy
+{{ include "prometheus-operator.labels" . | indent 4 }}
+  namespace: kube-system
+subsets:
+  - addresses:
+      {{- range .Values.kubeProxy.endpoints }}
+      - ip: {{ . }}
+      {{- end }}
+    ports:
+      - name: http-metrics
+        port: {{ .Values.kubeProxy.service.port }}
+        protocol: TCP
+{{- end }}

stable/prometheus-operator/templates/exporters/kube-proxy/service.yaml

@@ -16,7 +16,9 @@ spec:
       port: {{ .Values.kubeProxy.service.port }}
       protocol: TCP
       targetPort: {{ .Values.kubeProxy.service.targetPort }}
+{{- if .Values.kubeProxy.endpoints }}{{- else }}
   selector:
   {{ include "prometheus-operator.rangeskipempty" .Values.kubeProxy.service.selector | indent 4 }}
+{{- end }}
   type: ClusterIP
 {{- end -}}

stable/prometheus-operator/values.yaml

@@ -817,6 +817,13 @@ kubeScheduler:
 kubeProxy:
   enabled: true
 
+  ## If your kube proxy is not deployed as a pod, specify IPs it can be found on
+  ##
+  endpoints: []
+  # - 10.141.4.22
+  # - 10.141.4.23
+  # - 10.141.4.24
+
   service:
     port: 10249
     targetPort: 10249