Pod and service monitors, remove hard-coded tls secret name rom ingresses (#9)

shcherbak · web-flow · commit a2625b661359 · 2024-09-30T19:28:45.000+03:00
* pod-and-service-monitors

* add podminitor

* separate tls secret name and host name

* add ingress secret name

* add ingress secret name

* ingress secret

* mas ingress

* add ingress secret name

* admin secret name

* add ingress secretname
diff --git a/charts/jitsi/Chart.yaml b/charts/jitsi/Chart.yaml
@@ -1,3 +1,3 @@
 ---
 name: jitsi
-version: 0.0.3
+version: 0.1.0
diff --git a/charts/jitsi/templates/ingress.yaml b/charts/jitsi/templates/ingress.yaml
@@ -9,7 +9,7 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - host: {{ .Values.serverName }}
+    - host: {{ .Values.ingress.serverName }}
       http:
         paths:
           - pathType: ImplementationSpecific
@@ -35,5 +35,7 @@ spec:
             path: /colibri-ws
   tls:
     - hosts:
-        - {{ .Values.serverName }}
-      secretName: tls
+        - {{ .Values.ingress.serverName }}
+      {{- if .Values.ingress.secretName }}
+      secretName: {{ .Values.ingress.secretName }}
+      {{- end }}
diff --git a/charts/jitsi/templates/jvb-deployment.yaml b/charts/jitsi/templates/jvb-deployment.yaml
@@ -55,7 +55,7 @@ spec:
             - name: TZ
               value: {{ .Values.timeZone }}
             - name: PUBLIC_URL
-              value: https://{{ .Values.serverName }}
+              value: https://{{ .Values.ingress.serverName }}
             {{- if .Values.jvb.extraEnvs }}
             {{- toYaml .Values.jvb.extraEnvs | nindent 12 }}
             {{- end }}
diff --git a/charts/jitsi/templates/web-deployment.yaml b/charts/jitsi/templates/web-deployment.yaml
@@ -43,7 +43,7 @@ spec:
             - name: JVB_TCP_HARVESTER_DISABLED
               value: "false"
             - name: PUBLIC_URL
-              value: https://{{ .Values.serverName }}
+              value: https://{{ .Values.ingress.serverName }}
             - name: ENABLE_LOBBY
               value: "0"
             - name: ENABLE_WELCOME_PAGE
diff --git a/charts/jitsi/values.yaml b/charts/jitsi/values.yaml
@@ -1,4 +1,7 @@
-serverName: ''
+ingress:
+  serverName: ''
+  secretName: ''
+
 timeZone: Europe/Amsterdam
 jicofo:
   replicas: 1
diff --git a/charts/redis/Chart.yaml b/charts/redis/Chart.yaml
@@ -1,3 +1,3 @@
 ---
 name: redis
-version: 0.0.6
+version: 0.1.0
diff --git a/charts/redis/templates/deployment.yaml b/charts/redis/templates/deployment.yaml
@@ -14,11 +14,6 @@ spec:
     metadata:
       labels:
         app: redis
-      {{- if .Values.exporter.enabled }}
-      annotations:
-        prometheus.io/scrape: "true"
-        prometheus.io/port: "9121"
-      {{- end }}
     spec:
       containers:
       - name: redis
diff --git a/charts/redis/templates/service.yaml b/charts/redis/templates/service.yaml
@@ -10,5 +10,10 @@ spec:
     - name: redis
       port: 6379
       targetPort: redis
+    {{- if .Values.exporter.enabled }}
+    - name: redis-exporter
+      port: 9121
+      targetPort: redis-exporter
+    {{- ens }}
   selector:
     app: redis
diff --git a/charts/redis/templates/servicemonitor.yaml b/charts/redis/templates/servicemonitor.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.exporter.enabled }}
+kind: ServiceMonitor
+apiVersion: monitoring.coreos.com/v1
+metadata:
+  name: redis-service
+  labels:
+    app: redis
+spec:
+  endpoints:
+  - interval: 60s
+    path: /metrics
+    port: http
+  jobLabel: redis-exporter
+  selector:
+    matchLabels:
+      app: redis
+---
+{{- end }}
diff --git a/charts/synapse/Chart.yaml b/charts/synapse/Chart.yaml
@@ -1,3 +1,3 @@
 ---
 name: synapse
-version: 0.4.5
+version: 0.5.0
diff --git a/charts/synapse/templates/_helpers.tpl b/charts/synapse/templates/_helpers.tpl
@@ -34,6 +34,7 @@ component: matrix-authentication
 Workers annotations
 */}}
 {{- define "synapse-workers.annotations" -}}
+scrapeMetrics9092: "true"
 prometheus.io/port: "9092"
 prometheus.io/scrape: "true"
 prometheus.io/path: "/_synapse/metrics"
@@ -71,6 +72,9 @@ containers:
     - containerPort: 8008
       name: http
       protocol: TCP
+    - containerPort: 9092
+      name: metrics
+      protocol: TCP
   volumeMounts:
   - name: synapse-{{ .name }}-config
     mountPath: /data
diff --git a/charts/synapse/templates/admin-ingress.yaml b/charts/synapse/templates/admin-ingress.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.admin.ingress.enabled }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -10,10 +11,12 @@ spec:
   ingressClassName: nginx
   tls:
     - hosts:
-        - {{ .Values.admin.serverName }}
+        - {{ .Values.admin.ingress.serverName }}
+      {{- if .Values.admin.ingress.secretName }}
       secretName: tls
+      {{- end }}
   rules:
-    - host: {{ .Values.admin.serverName }}
+    - host: {{ .Values.admin.ingress.serverName }}
       http:
         paths:
           - path: /
@@ -23,3 +26,4 @@ spec:
                 name: admin
                 port:
                   number: 80
+{{- end }}
diff --git a/charts/synapse/templates/envoy-deployment.yaml b/charts/synapse/templates/envoy-deployment.yaml
@@ -18,11 +18,6 @@ spec:
       labels:
         {{- include "synapse-client-reader-envoy.selectorLabels" . | nindent 8 }}
       annotations:
-        {{- if .Values.envoyProxy.metrics }}
-        prometheus.io/port: "9901"
-        prometheus.io/scrape: "true"
-        prometheus.io/path: "/stats/prometheus"
-        {{- end }}
         checksum/config: {{ .Files.Get "scripts/envoy.yaml" | sha256sum }}
       {{- with .Values.envoyProxy.podAnnotations }}
         {{- toYaml . | nindent 8 }}
diff --git a/charts/synapse/templates/envoy-servicemonitor.yaml b/charts/synapse/templates/envoy-servicemonitor.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.envoyProxy.metrics }}
+kind: ServiceMonitor
+apiVersion: monitoring.coreos.com/v1
+metadata:
+  name: envoy-service
+  labels:
+    {{- include "synapse-client-reader-envoy.selectorLabels" . | nindent 4 }}
+spec:
+  endpoints:
+  - interval: 60s
+    path: /stats/prometheus
+    port: http-admin
+  jobLabel: envoy-service
+  selector:
+    matchLabels:
+      {{- include "synapse-client-reader-envoy.selectorLabels" . | nindent 6 }}
+---
+{{- end }}
diff --git a/charts/synapse/templates/matrix-authentication-ingress.yaml b/charts/synapse/templates/matrix-authentication-ingress.yaml
@@ -13,7 +13,9 @@ spec:
   tls:
     - hosts:
         - {{ .Values.matrixAuthentication.ingress.host }}
-      secretName: tls
+      {{- if .Values.matrixAuthentication.ingress.secretName }}
+      secretName: {{ .Values.matrixAuthentication.ingress.secretName }}
+      {{- end }}
   rules:
   - host: {{ .Values.matrixAuthentication.ingress.host }}
     http:
diff --git a/charts/synapse/templates/sliding-sync-proxy-ingress.yaml b/charts/synapse/templates/sliding-sync-proxy-ingress.yaml
@@ -19,7 +19,9 @@ spec:
   tls:
     - hosts:
         - {{ .Values.slidingSyncProxy.ingress.host }}
-      secretName: tls
+      {{- if .Values.slidingSyncProxy.ingress.secretName }}
+      secretName: {{ .Values.slidingSyncProxy.ingress.secretName }}
+      {{- end }}
   rules:
   - host: {{ .Values.slidingSyncProxy.ingress.host }}
     http:
diff --git a/charts/synapse/templates/synapse-ingress.yaml b/charts/synapse/templates/synapse-ingress.yaml
@@ -19,7 +19,9 @@ spec:
   tls:
     - hosts:
         - {{ .Values.synapse.serverName }}
-      secretName: tls
+      {{- if .Values.ingress.secretName }}
+      secretName: {{ .Values.ingress.secretName }}
+      {{- end }}
   rules:
   - host: {{ .Values.synapse.serverName }}
     http:
diff --git a/charts/synapse/templates/synapse-podmonitor.yaml b/charts/synapse/templates/synapse-podmonitor.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.synapse.podMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: synapse-metrics
+spec:
+  selector:
+    matchLabels:
+      scrapeMetrics9092: 'true'
+  podMetricsEndpoints:
+  - port: metrics
+    path: "/_synapse/metrics"
+---
+{{- end }}
diff --git a/charts/synapse/templates/well-known-ingress.yaml b/charts/synapse/templates/well-known-ingress.yaml
@@ -10,7 +10,9 @@ spec:
   tls:
     - hosts:
         - {{ .Values.synapse.serverName }}
-      secretName: tls
+      {{- if .Values.ingress.secretName }}
+      secretName: {{ .Values.ingress.secretName }}
+      {{- end }}
   rules:
   - host: {{ .Values.synapse.serverName }}
     http:
diff --git a/charts/synapse/values.yaml b/charts/synapse/values.yaml
@@ -137,6 +137,9 @@ synapse:
     host: redis
     port: 6379
 
+  podMonitor:
+    enabled: false
+
 rc_message:
   per_second: 100
   burst_count: 300
@@ -176,6 +179,7 @@ experimentalFeatures:
     account_management_url: NOT-CONFIGURED
 
 ingress:
+  secretName: ''
   masterRoutes:
     - "/_matrix/"
     - "/_synapse/"
@@ -297,7 +301,10 @@ ingress:
     # "/_matrix/client/(r0|v3|unstable)/user_directory/search$"
 
 admin:
-  serverName: NOT-CONFIGURED
+  ingress:
+    enabled: true
+    secretName: ''
+    serverName: NOT-CONFIGURED
   image:
     repository: "awesometechnologies/synapse-admin"
     tag: "0.10.1"
@@ -343,6 +350,7 @@ slidingSyncProxy:
   ingress:
     enabled: true
     host: NOT-CONFIGURED
+    secretName: ''
   env:
     SYNCV3_DB: NOT-CONFIGURED
     SYNCV3_SERVER: NOT-CONFIGURED
@@ -438,6 +446,7 @@ matrixAuthentication:
   ingress:
     enabled: true
     host: NOT-CONFIGURED
+    secretName: ''
   config:
     clients: []
     database:
diff --git a/charts/webhook/Chart.yaml b/charts/webhook/Chart.yaml
@@ -1,3 +1,3 @@
 ---
 name: webhook
-version: 0.0.8
+version: 0.1.0
diff --git a/charts/webhook/templates/ingress.yaml b/charts/webhook/templates/ingress.yaml
@@ -13,7 +13,9 @@ spec:
   tls:
     - hosts:
         - {{ .Values.ingress.host }}
-      secretName: {{ .Values.ingress.host }}
+      {{- if .Values.ingress.secretName }}
+      secretName: {{ .Values.ingress.secretName }}
+      {{- end }}
   rules:
   - host: {{ .Values.ingress.host }}
     http:
diff --git a/charts/webhook/values.yaml b/charts/webhook/values.yaml
@@ -15,4 +15,5 @@ matrix:
   token: ""
 ingress:
   host: ""
+  secretName: ""
   ingressClassName: nginx
