Merge pull request #361 from Flagsmith/feat/custom-probes

feat: `exec` liveness probes

Author: rolodato

charts/flagsmith/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: flagsmith
 description: Flagsmith
 type: application
-version: 0.74.0
+version: 0.75.0
 appVersion: 2.174.0
 dependencies:
   - name: postgresql

charts/flagsmith/templates/deployment-api.yaml

@@ -132,11 +132,15 @@ spec:
         - containerPort: {{ .Values.service.api.port }}
         env: {{ include (print $.Template.BasePath "/_api_environment.yaml") . | nindent 8 }}
         livenessProbe:
-          failureThreshold: {{ .Values.api.livenessProbe.failureThreshold }}
+          {{- if .Values.api.livenessProbe.exec }}
+          exec: {{ .Values.api.livenessProbe.exec | toYaml | nindent 12 }}
+          {{- else if .Values.api.livenessProbe.path }}
           httpGet:
             path: {{ .Values.api.livenessProbe.path }}
             port: {{ .Values.service.api.port }}
             scheme: HTTP
+          {{- end }}
+          failureThreshold: {{ .Values.api.livenessProbe.failureThreshold }}
           initialDelaySeconds: {{ .Values.api.livenessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.api.livenessProbe.periodSeconds }}
           successThreshold: {{ .Values.api.livenessProbe.successThreshold }}

charts/flagsmith/templates/deployment-task-processor.yaml

@@ -85,11 +85,16 @@ spec:
         - containerPort: {{ .Values.service.taskProcessor.port }}
         env: {{ include (print $.Template.BasePath "/_task_processor_environment.yaml") . | nindent 8 }}
         livenessProbe:
-          failureThreshold: {{ .Values.taskProcessor.livenessProbe.failureThreshold }}
+          {{- $exec := .Values.taskProcessor.livenessProbe.exec | default .Values.api.livenessProbe.exec }}
+          {{- if $exec }}
+          exec: {{ $exec | toYaml | nindent 12 }}
+          {{- else }}
           httpGet:
             path: /health/liveness
             port: {{ .Values.service.taskProcessor.port }}
             scheme: HTTP
+          {{- end }}
+          failureThreshold: {{ .Values.taskProcessor.livenessProbe.failureThreshold }}
           initialDelaySeconds: {{ .Values.taskProcessor.livenessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.taskProcessor.livenessProbe.periodSeconds }}
           successThreshold: {{ .Values.taskProcessor.livenessProbe.successThreshold }}

charts/flagsmith/values.yaml

@@ -76,7 +76,11 @@ api:
     # runAsUser: 1000
     # runAsGroup: 1000
   livenessProbe:
+    # path is the API path to be used for health checks. Used if exec is not set.
     path: /health/liveness
+    # exec describes an ExecAction command which will run inside the API container.
+    # See https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#Probe
+    exec: {}
     failureThreshold: 5
     initialDelaySeconds: 5
     periodSeconds: 10
@@ -192,6 +196,10 @@ taskProcessor:
   queuePopSize: null
 
   livenessProbe:
+    # exec describes an ExecAction command which will run inside the API container.
+    # Defaults to api.livenessProbe.exec.
+    # See https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#Probe
+    exec: {}
     failureThreshold: 5
     initialDelaySeconds: 5
     periodSeconds: 10