feat: add prometheus credentials to helm chart

livekit · Feb 19, 2024 · 24ef91f · 24ef91f
1 parent 7c0ffb2
commit 24ef91f
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 6 deletions.
diff --git a/livekit-server/templates/_helpers.tpl b/livekit-server/templates/_helpers.tpl
@@ -71,3 +71,10 @@ Create the name of the service monitor to use
 {{- default "default" .Values.serviceMonitor.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create the name of the service monitor secret to use
+*/}}
+{{- define "livekit-server.serviceMonitorSecretName" -}}
+{{- print .Values.serviceMonitor.name "Secret" }}
+{{- end }}
diff --git a/livekit-server/templates/deployment.yaml b/livekit-server/templates/deployment.yaml
@@ -76,10 +76,10 @@ spec:
               hostPort: {{ .Values.livekit.rtc.tcp_port }}
               protocol: TCP
             {{- end }}
-            {{- if .Values.livekit.prometheus_port }}
+            {{- if and .Values.livekit.prometheus .Values.livekit.prometheus.port }}
             - name: metrics
-              containerPort: {{ .Values.livekit.prometheus_port }}
-              hostPort: {{ .Values.livekit.prometheus_port }}
+              containerPort: {{ .Values.livekit.prometheus.port }}
+              hostPort: {{ .Values.livekit.prometheus.port }}
               protocol: TCP
             {{- end }}
             {{- if .Values.livekit.turn.enabled }}

diff --git a/livekit-server/templates/secret.yaml b/livekit-server/templates/secret.yaml
@@ -8,3 +8,15 @@ metadata:
 data:
   {{  .Values.livekit.key_file }}: {{ toYaml .Values.storeKeysInSecret.keys | b64enc }}
 {{- end }}
+
+{{- if and .Values.livekit.prometheus .Values.livekit.prometheus.username .Values.livekit.prometheus.password }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "livekit-server.serviceMonitorSecretName" . }}
+  labels:
+    {{- include "livekit-server.labels" . | nindent 4 }}
+data:
+    username: {{ .Values.livekit.prometheus.username | b64enc }}
+    password: {{ .Values.livekit.prometheus.password | b64enc }}
+{{- end }}
diff --git a/livekit-server/templates/service.yaml b/livekit-server/templates/service.yaml
@@ -40,8 +40,8 @@ spec:
       protocol: UDP
       targetPort: rtc-udp
     {{- end }}
-    {{- if .Values.livekit.prometheus_port }}
-    - port: {{ .Values.livekit.prometheus_port }}
+    {{- if and .Values.livekit.prometheus .Values.livekit.prometheus.port }}
+    - port: {{ .Values.livekit.prometheus.port }}
       targetPort: metrics
       protocol: TCP
       name: metrics

diff --git a/livekit-server/templates/servicemonitor.yaml b/livekit-server/templates/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.serviceMonitor.create .Values.livekit.prometheus_port -}}
+{{- if and .Values.serviceMonitor.create .Values.livekit.prometheus.port -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -14,6 +14,15 @@ spec:
     - port: metrics
       path: /
       interval: {{ .Values.serviceMonitor.interval }}
+      {{- if and (not .Values.storeKeysInSecret.existingSecret) .Values.storeKeysInSecret.enabled }}
+      basicAuth:
+        password:
+          name: {{ include "livekit-server.serviceMonitorSecretName" . }}
+          key: password
+        username:
+          name: {{ include "livekit-server.serviceMonitorSecretName" . }}
+          key: username
+      {{- end}}
   selector:
     matchLabels:
       {{- include "livekit-server.selectorLabels" . | nindent 6 }}