move from serviceMonitor to podMomitor on cloudflared

damoun · Nov 24, 2023 · d5cba12 · d5cba12
1 parent 0d4cabb
commit d5cba12
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 48 deletions.
diff --git a/charts/cloudflared/Chart.yaml b/charts/cloudflared/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: cloudflared
 description: Cloudflared tunnel Helm Chart
 type: application
-version: 2.0.2
+version: 3.0.1
 appVersion: "2023.10.0"
 dependencies:
   - name: base

diff --git a/charts/cloudflared/templates/deployment.yaml b/charts/cloudflared/templates/deployment.yaml
@@ -27,6 +27,10 @@ spec:
           {{- end }}
           env: {{- toYaml .Values.env | nindent 12 }}
           envFrom: {{- toYaml .Values.envFrom | nindent 12 }}
+          ports:
+            - containerPort: 2000
+              name: metrics
+              protocol: TCP
           args:
             - tunnel
             - --no-autoupdate

diff --git a/...cloudflared/templates/servicemonitor.yaml → charts/cloudflared/templates/podmonitor.yaml b/...cloudflared/templates/servicemonitor.yaml → charts/cloudflared/templates/podmonitor.yaml
@@ -1,36 +1,36 @@
-{{- if .Values.serviceMonitor.enabled }}
+{{- if .Values.podMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
+kind: PodMonitor
 metadata:
   name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "base.labels.standard" $ | nindent 4 }}
-    {{- toYaml .Values.serviceMonitor.extraLabels | nindent 4 }}
+    {{- toYaml .Values.podMonitor.extraLabels | nindent 4 }}
   {{- with .Values.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  endpoints:
-  - port: http
-    interval: {{ .Values.serviceMonitor.interval }}
-    scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+  podMonitorEndpoints:
+  - port: metrics
+    interval: {{ .Values.podMonitor.interval }}
+    scrapeTimeout: {{ .Values.podMonitor.scrapeTimeout }}
     scheme: http
     path: /metrics
-{{- if .Values.serviceMonitor.metricRelabelings }}
+{{- if .Values.podMonitor.metricRelabelings }}
     metricRelabelings:
-{{ toYaml .Values.serviceMonitor.metricRelabelings | indent 4 }}
+{{ toYaml .Values.podMonitor.metricRelabelings | indent 4 }}
 {{- end }}
   jobLabel: {{ .Release.Name }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}
   selector:
     matchLabels: {{- include "base.labels.matchLabels" $ | nindent 6 }}
-{{- if .Values.serviceMonitor.targetLabels }}
+{{- if .Values.podMonitor.targetLabels }}
   targetLabels:
-{{- range .Values.serviceMonitor.targetLabels }}
+{{- range .Values.podMonitor.targetLabels }}
     - {{ . }}
 {{- end }}
 {{- end }}

diff --git a/charts/cloudflared/templates/svc.yaml b/charts/cloudflared/templates/svc.yaml
diff --git a/charts/cloudflared/values.yaml b/charts/cloudflared/values.yaml
@@ -39,9 +39,9 @@ readinessProbe:
   failureThreshold: 1
   successThreshold: 1
 
-serviceMonitor:
+podMonitor:
   enabled: false
-  extraLabels:
-    release: prometheus
+  extraLabels: {}
+#    release: prometheus
   interval: 30s
   scrapeTimeout: 30s