feat(helm): install optional PodMonitor and ServiceMonitor

Author: plaffitt

helm/kube-image-keeper/templates/controller-deployment.yaml

@@ -45,6 +45,9 @@ spec:
             - containerPort: 9443
               name: webhook-server
               protocol: TCP
+            - containerPort: 8080
+              name: metrics
+              protocol: TCP
           volumeMounts:
             - mountPath: /tmp/k8s-webhook-server/serving-certs
               name: cert

helm/kube-image-keeper/templates/metrics-service.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.metricsService.create }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "kube-image-keeper.fullname" . }}-metrics
+  labels:
+    {{- include "kube-image-keeper.labels" . | nindent 4 }}
+    {{- with .Values.metricsService.extraLabels }}
+    {{- . | toYaml | trim | nindent 4 }}
+    {{- end }}
+  {{- with .Values.metricsService.annotations }}
+  annotations:
+    {{- . | toYaml | trim | nindent 4 }}
+  {{- end }}
+spec:
+  type: ClusterIP
+  clusterIP: None
+  ports:
+  - name: metrics
+    port: {{ .Values.metricsService.port }}
+    targetPort: metrics
+  selector:
+    {{- include "kube-image-keeper.selectorLabels" . | nindent 4 }}
+{{- end }}

helm/kube-image-keeper/templates/podmonitor.yaml

@@ -0,0 +1,23 @@
+{{- if .Values.prometheusPodMonitor.create }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ include "kube-image-keeper.fullname" . }}
+  labels:
+    {{- include "kube-image-keeper.labels" . | nindent 4 }}
+    {{- with .Values.prometheusPodMonitor.extraLabels }}
+    {{- . | toYaml | trim | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "kube-image-keeper.selectorLabels" . | nindent 6 }}
+  podMetricsEndpoints:
+  - port: metrics
+    interval: {{ .Values.prometheusPodMonitor.scrapeInterval }}
+    scrapeTimeout: {{ .Values.prometheusPodMonitor.scrapeTimeout }}
+    {{- with .Values.prometheusPodMonitor.relabelings }}
+    relabelings:
+    {{- . | toYaml | nindent 4 }}
+    {{- end }}
+{{- end }}

helm/kube-image-keeper/templates/proxy-daemonset.yaml

@@ -36,6 +36,9 @@ spec:
               hostIP: {{ .Values.proxy.hostIp }}
               hostPort: {{ .Values.proxy.hostPort }}
               protocol: TCP
+            - containerPort: 8080
+              name: metrics
+              protocol: TCP
           command:
             - registry-proxy
             - -v={{ .Values.proxy.verbosity }}

helm/kube-image-keeper/templates/servicemonitor.yaml

@@ -0,0 +1,23 @@
+{{- if .Values.prometheusServiceMonitor.create }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "kube-image-keeper.fullname" . }}
+  labels:
+    {{- include "kube-image-keeper.labels" . | nindent 4 }}
+    {{- with .Values.prometheusServiceMonitor.extraLabels }}
+    {{- . | toYaml | trim | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "kube-image-keeper.selectorLabels" . | nindent 6 }}
+  endpoints:
+  - port: metrics
+    interval: {{ .Values.prometheusServiceMonitor.scrapeInterval }}
+    scrapeTimeout: {{ .Values.prometheusServiceMonitor.scrapeTimeout }}
+    {{- with .Values.prometheusServiceMonitor.relabelings }}
+    relabelings:
+    {{- . | toYaml | nindent 4 }}
+    {{- end }}
+{{- end }}

helm/kube-image-keeper/values.yaml

@@ -247,3 +247,37 @@ serviceAccount:
 psp:
   # -- If True, create the PodSecurityPolicy
   create: false
+
+metricsService:
+  # -- Should a metrics Service be installed, targets all kube-image-keeper pods (required for ServiceMonitor)
+  create: false
+  # -- TCP port to expose the Service on
+  port: 8080
+  # -- Annotations to add to the Service
+  annotations: {}
+  # -- Additional labels to add to the Service
+  extraLabels: {}
+
+prometheusServiceMonitor:
+  # -- Should a ServiceMonitor object be installed to scrape this exporter. For prometheus-operator (kube-prometheus) users.
+  create: false
+  # -- Target scrape interval set in the ServiceMonitor
+  scrapeInterval: 60s
+  # -- Target scrape timeout set in the ServiceMonitor
+  scrapeTimeout: 30s
+  # -- Additional labels to add to ServiceMonitor objects
+  extraLabels: {}
+  # -- Relabel config for the ServiceMonitor, see: https://coreos.com/operators/prometheus/docs/latest/api.html#relabelconfig
+  relabelings: []
+
+prometheusPodMonitor:
+  # -- Should a PodMonitor object be installed to scrape this exporter. For prometheus-operator (kube-prometheus) users.
+  create: false
+  # -- Target scrape interval set in the PodMonitor
+  scrapeInterval: 60s
+  # -- Target scrape timeout set in the PodMonitor
+  scrapeTimeout: 30s
+  # -- Additional labels to add to PodMonitor objects
+  extraLabels: {}
+  # -- Relabel config for the PodMonitor, see: https://coreos.com/operators/prometheus/docs/latest/api.html#relabelconfig
+  relabelings: []