Update liveness checks and debug ports

Closes #111
owncloud · May 2, 2023 · 81eccf1 · 81eccf1
1 parent 5a5ece1
commit 81eccf1
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 65 deletions.
diff --git a/charts/ocis/templates/audit/deployment.yaml b/charts/ocis/templates/audit/deployment.yaml
@@ -43,6 +43,11 @@ spec:
             # - name: AUDIT_TRACING_COLLECTOR
             #   value: {{ .Values.tracing.collector | quote }}
 
+            - name: AUDIT_DEBUG_PPROF
+              value: {{ .Values.debug.profiling | quote }}
+            - name: AUDIT_DEBUG_ADDR
+              value: 0.0.0.0:9229
+
             - name: AUDIT_EVENTS_ENDPOINT
             {{- if not .Values.messagingSystem.external.enabled }}
               value: {{ .appNameNats }}:9233

diff --git a/charts/ocis/templates/audit/service.yaml b/charts/ocis/templates/audit/service.yaml
@@ -0,0 +1,17 @@
+{{- include "ocis.appNames" (dict "scope" . "appName" "appNameAudit" "appNameSuffix" "") -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .appName }}
+  namespace: {{ template "ocis.namespace" . }}
+  labels:
+    app: {{ .appName }}
+    ocis-metrics: enabled
+    {{- include "ocis.labels" . | nindent 4 }}
+spec:
+  selector:
+    app: {{ .appName }}
+  ports:
+    - name: metrics-debug
+      port: 9229
+      protocol: TCP
diff --git a/charts/ocis/templates/idm/deployment.yaml b/charts/ocis/templates/idm/deployment.yaml
@@ -60,13 +60,13 @@ spec:
             - name: IDM_TRACING_COLLECTOR
               value: {{ .Values.tracing.collector | quote }}
 
-            # - name: IDM_DEBUG_PPROF
-            #   value: {{ .Values.debug.profiling | quote }}
+            - name: IDM_DEBUG_PPROF
+              value: {{ .Values.debug.profiling | quote }}
 
             - name: IDM_LDAPS_ADDR
               value: 0.0.0.0:9235
-            # - name: IDM_DEBUG_ADDR
-            #   value: 0.0.0.0:9239
+            - name: IDM_DEBUG_ADDR
+              value: 0.0.0.0:9239
 
             - name: IDM_CREATE_DEMO_USERS
               value: {{ .Values.features.demoUsers | quote }}
@@ -106,27 +106,15 @@ spec:
             - name: IDM_LDAPS_KEY
               value: /etc/ocis/ldap-cert/ldap.key
 
-          livenessProbe:
-            # TODO: IDM does not currently provide a debug port, re-enable this once that is implemented
-            # httpGet:
-            #   path: /healthz
-            #   port: metrics-debug
-            # until then we're just doing a TCP check on the main port
-            tcpSocket:
-              port: ldaps
-            timeoutSeconds: 10
-            initialDelaySeconds: 60
-            periodSeconds: 20
-            failureThreshold: 3
+          {{- include "ocis.livenessProbe" . | nindent 10 }}
 
           resources: {{ toYaml .resources | nindent 12 }}
 
           ports:
             - name: ldaps
               containerPort: 9235
-            # TODO: IDM does not currently provide a debug port, re-enable this once that is implemented
-            # - name: metrics-debug
-            #   containerPort: 9239
+            - name: metrics-debug
+              containerPort: 9239
 
           volumeMounts:
             - name: ocis-config-tmp

diff --git a/charts/ocis/templates/idm/service.yaml b/charts/ocis/templates/idm/service.yaml
@@ -16,8 +16,7 @@ spec:
     - name: ldaps
       port: 9235
       protocol: TCP
-    # TODO: IDM does not currently provide a debug port, re-enable this once that is implemented
-    # - name: metrics-debug
-    #   port: 9239
-    #   protocol: TCP
+    - name: metrics-debug
+      port: 9239
+      protocol: TCP
 {{- end }}
diff --git a/charts/ocis/templates/nats/deployment.yaml b/charts/ocis/templates/nats/deployment.yaml
@@ -50,39 +50,26 @@ spec:
             # - name: NATS_TRACING_COLLECTOR
             #   value: {{ .Values.tracing.collector | quote }}
 
-            # - name: NATS_DEBUG_PPROF
-            #   value: {{ .Values.debug.profiling | quote }}
+            - name: NATS_DEBUG_PPROF
+              value: {{ .Values.debug.profiling | quote }}
 
             - name: NATS_NATS_HOST
               value: "0.0.0.0"
             - name: NATS_NATS_PORT
               value: "9233"
 
-            # - name: NATS_DEBUG_ADDR
-            #   value: 0.0.0.0:9234
+            - name: NATS_DEBUG_ADDR
+              value: 0.0.0.0:9234
 
-          livenessProbe:
-            # TODO: NATS does not currently provide a debug port, re-enable this once that is implemented
-            # See: https://github.com/owncloud/ocis-charts/issues/111
-            # httpGet:
-            #   path: /healthz
-            #   port: metrics-debug
-            # until then we're just doing a TCP check on the main port
-            tcpSocket:
-              port: 9233
-            timeoutSeconds: 10
-            initialDelaySeconds: 60
-            periodSeconds: 20
-            failureThreshold: 3
+          {{- include "ocis.livenessProbe" . | nindent 10 }}
 
           resources: {{ toYaml .resources | nindent 12 }}
 
           ports:
             - name: nats
               containerPort: 9233
-            # TODO: NATS does not currently provide a debug port, re-enable this once that is implemented
-            # - name: metrics-debug
-            #   containerPort: 9234
+            - name: metrics-debug
+              containerPort: 9234
 
           volumeMounts:
             - name: nats-data

diff --git a/charts/ocis/templates/nats/service.yaml b/charts/ocis/templates/nats/service.yaml
@@ -16,8 +16,7 @@ spec:
     - name: nats
       port: 9233
       protocol: TCP
-    # TODO: NATS does not currently provide a debug port, re-enable this once that is implemented
-    # - name: metrics-debug
-    #   port: 9234
-    #   protocol: TCP
+    - name: metrics-debug
+      port: 9234
+      protocol: TCP
 {{- end }}
diff --git a/charts/ocis/templates/notifications/deployment.yaml b/charts/ocis/templates/notifications/deployment.yaml
@@ -41,11 +41,11 @@ spec:
             # - name: NOTIFICATIONS_TRACING_COLLECTOR
             #   value: {{ .Values.tracing.collector | quote }}
 
-            # - name: NOTIFICATIONS_DEBUG_PPROF
-            #   value: {{ .Values.debug.profiling | quote }}
+            - name: NOTIFICATIONS_DEBUG_PPROF
+              value: {{ .Values.debug.profiling | quote }}
 
-            # - name: NOTIFICATIONS_DEBUG_ADDR
-            #   value: 0.0.0.0:9174
+            - name: NOTIFICATIONS_DEBUG_ADDR
+              value: 0.0.0.0:9174
 
             - name: NOTIFICATIONS_SMTP_HOST
               value: {{ .Values.features.emailNotifications.smtp.host | quote }}
@@ -104,22 +104,12 @@ spec:
                   name: {{ .Values.secretRefs.machineAuthApiKeySecretRef }}
                   key: machine-auth-api-key
 
-          # TODO: This service does not currently provide a debug port, re-enable this once that is implemented
-          # See: https://github.com/owncloud/ocis-charts/issues/111
-          # livenessProbe:
-          #   httpGet:
-          #     path: /healthz
-          #     port: metrics-debug
-          #   timeoutSeconds: 10
-          #   initialDelaySeconds: 60
-          #   periodSeconds: 20
-          #   failureThreshold: 3
+          {{- include "ocis.livenessProbe" . | nindent 10 }}
 
           resources: {{ toYaml .resources | nindent 12 }}
-          # TODO: This service does not currently provide a debug port, re-enable this once that is implemented
-          # ports:
-          #   - name: metrics-debug
-          #     containerPort: 9174
+          ports:
+            - name: metrics-debug
+              containerPort: 9174
 
           volumeMounts:
             - name: ocis-config-tmp

diff --git a/charts/ocis/templates/notifications/service.yaml b/charts/ocis/templates/notifications/service.yaml
@@ -0,0 +1,19 @@
+{{- if .Values.features.emailNotifications.enabled }}
+{{- include "ocis.appNames" (dict "scope" . "appName" "appNameNotifications" "appNameSuffix" "") -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .appName }}
+  namespace: {{ template "ocis.namespace" . }}
+  labels:
+    app: {{ .appName }}
+    ocis-metrics: enabled
+    {{- include "ocis.labels" . | nindent 4 }}
+spec:
+  selector:
+    app: {{ .appName }}
+  ports:
+    - name: metrics-debug
+      port: 9174
+      protocol: TCP
+{{- end }}