Merge pull request #60 from Headorteil/main

PodMonitor: use port instead of targetPort
kube-vip · Jan 28, 2025 · 24a6dee · 24a6dee
2 parents 5a58b7d + 50d7a03
commit 24a6dee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/charts/kube-vip/templates/daemonset.yaml b/charts/kube-vip/templates/daemonset.yaml
@@ -27,6 +27,12 @@ spec:
           {{- end }}
           {{- end }}
           {{- end }}
+        {{- if and .Values.podMonitor.enabled (hasKey .Values.env "prometheus_server") (regexMatch "^:\\d+$" .Values.env.prometheus_server) }}
+        ports:
+        - containerPort: {{ trimPrefix ":" .Values.env.prometheus_server }}
+          name: monitoring
+          protocol: TCP
+        {{- end }}
         env:
           {{- if eq (include "kube-vip.toBool" .Values.env.cp_enable) "true" }}
           - name: vip_address

diff --git a/charts/kube-vip/templates/pod-monitor.yaml b/charts/kube-vip/templates/pod-monitor.yaml
@@ -17,5 +17,5 @@ spec:
     matchLabels:
       {{- include "kube-vip.selectorLabels" . | nindent 6 }}
   podMetricsEndpoints:
-  - targetPort: {{ trimPrefix ":" .Values.env.prometheus_server }}
+  - port: monitoring
 {{- end }}
diff --git a/charts/kube-vip/values.yaml b/charts/kube-vip/values.yaml
@@ -21,6 +21,7 @@ env:
   svc_enable: "true"
   svc_election: "false"
   vip_leaderelection: "false"
+  # prometheus_server: ":2112"
 
 extraArgs: {}
   # Specify additional arguments to kube-vip