coturn: refactor resource labels, expose ServiceMonitor for metrics endpoint

changelog.d/0-release-notes/coturn-labels

@@ -0,0 +1,6 @@
+For users of the (currently alpha) coturn Helm chart, **manual action is
+required** when upgrading to this version. The labels applied to the Kubernetes
+manifests in this chart have changed, in order to match the conventions used
+in the wire-server charts. However, this may mean that upgrading with Helm can
+fail, due to changes to the `StatefulSet` included in this chart -- in this
+case, the `StatefulSet` must be deleted before the chart is upgraded.

changelog.d/2-features/coturn-metrics

@@ -0,0 +1,2 @@
+The coturn chart now has support for exposing its metric endpoint with a
+ServiceMonitor, which can be ingested by third-party metrics collection tools.

changelog.d/5-internal/coturn-labels

@@ -0,0 +1,2 @@
+The labels applied to resources in the coturn chart have been changed to
+reflect the conventions in the wire-server charts.

charts/coturn/templates/configmap-coturn-conf-template.yaml

@@ -1,9 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "coturn.fullname" . }}
-  labels:
-    {{- include "coturn.selectorLabels" . | nindent 4 }}
+  name: coturn
 
 data:
   coturn.conf.template: |

charts/coturn/templates/secret.yaml

@@ -8,9 +8,10 @@ kind: Secret
 metadata:
   name: coturn
   labels:
+    app: coturn
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 type: Opaque
 stringData:
   zrest_secret.txt: |

charts/coturn/templates/service-account.yaml

@@ -2,16 +2,22 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "coturn.fullname" . }}
+  name: coturn
   labels:
-    {{- include "coturn.labels" . | nindent 4 }}
+    app: coturn
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "coturn.fullname" . }}
+  name: coturn
   labels:
-    {{- include "coturn.labels" . | nindent 4 }}
+    app: coturn
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 rules:
   - apiGroups: [""]
     resources: [nodes]
@@ -20,14 +26,17 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "coturn.fullname" . }}
+  name: coturn
   labels:
-    {{- include "coturn.labels" . | nindent 4 }}
+    app: coturn
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 roleRef:
   kind: ClusterRole
   apiGroup: rbac.authorization.k8s.io
-  name: {{ include "coturn.fullname" . }}
+  name: coturn
 subjects:
   - kind: ServiceAccount
-    name: {{ include "coturn.fullname" . }}
+    name: coturn
     namespace: {{ .Release.Namespace }}

charts/coturn/templates/service.yaml

@@ -2,9 +2,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "coturn.fullname" . }}
+  name: coturn
   labels:
-    {{- include "coturn.labels" . | nindent 4 }}
+    app: coturn
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 spec:
   # Needs to be headless
   # See: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/
@@ -22,5 +25,9 @@ spec:
       port: {{ .Values.coturnTurnTlsListenPort }}
       targetPort: coturn-tls
     {{- end }}
+    - name: status-http
+      port: {{ .Values.coturnMetricsListenPort }}
+      targetPort: status-http
   selector:
-    {{- include "coturn.selectorLabels" . | nindent 4 }}
+    app: coturn
+    release: {{ .Release.Name }}

charts/coturn/templates/servicemonitor.yaml

@@ -0,0 +1,19 @@
+{{- if .Values.metrics.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: coturn
+  labels:
+    app: coturn
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  endpoints:
+    - port: status-http
+      path: /metrics
+  selector:
+    matchLabels:
+      app: coturn
+      release: {{ .Release.Name }}
+{{- end }}

charts/coturn/templates/statefulset.yaml

@@ -1,9 +1,12 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ include "coturn.fullname" . }}
+  name: coturn
   labels:
-    {{- include "coturn.labels" . | nindent 4 }}
+    app: coturn
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -12,10 +15,10 @@ spec:
   # affect upgrades.
   podManagementPolicy: Parallel
 
-  serviceName: {{ include "coturn.fullname" . }}
+  serviceName: coturn
   selector:
     matchLabels:
-      {{- include "coturn.selectorLabels" . | nindent 6 }}
+      app: coturn
   template:
     metadata:
     {{- with .Values.podAnnotations }}
@@ -24,7 +27,8 @@ spec:
     {{- end }}
 
       labels:
-        {{- include "coturn.selectorLabels" . | nindent 8 }}
+        app: coturn
+        release: {{ .Release.Name }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -33,15 +37,15 @@ spec:
       shareProcessNamespace: true
       {{- end }}
       hostNetwork: true
-      serviceAccountName: {{ include "coturn.fullname" . }}
+      serviceAccountName: coturn
       volumes:
         - name: external-ip
           emptyDir: {}
         - name: coturn-config
           emptyDir: {}
         - name: coturn-config-template
           configMap:
-            name: {{ include "coturn.fullname" . }}
+            name: coturn
         - name: secrets
           secret:
             secretName: coturn

charts/coturn/values.yaml

@@ -36,6 +36,10 @@ tls:
     pullPolicy: IfNotPresent
     tag: 1aa6cbbf2ce3a5182ec47e3579bbcb8f47e22fdc
 
+metrics:
+  serviceMonitor:
+    enabled: false
+
 # This chart optionally supports waiting for traffic to drain from coturn
 # before pods are terminated. Warning: coturn does not have any way to steer
 # incoming client traffic away from itself on its own, so this functionality