Merge pull request #87 from InseeFrLab/shinyproxy-variabilize-probes

[Shinyproxy] variabilize probes

Author: ihiverlet

charts/shinyproxy/Chart.yaml

@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.2.0
+version: 2.2.1
 
 dependencies:
 - name: library-chart
-  version: 1.5.23
+  version: 1.7.11
   repository: https://inseefrlab.github.io/helm-charts-interactive-services

charts/shinyproxy/templates/deployment.yaml

@@ -35,18 +35,23 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
+          {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
               path: /actuator/health/liveness
               port: 9090
-            periodSeconds: 20
-            initialDelaySeconds: 2
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
               path: /actuator/health/readiness
               port: 9090
-            periodSeconds: 20
-            initialDelaySeconds: 2
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            initialDelaySeconds:  {{ .Values.readinessProbe.initialDelaySeconds }}
+          {{- end }}
           resources:
             {{- toYaml .Values.proxyDeploy.resources | nindent 12 }}
       volumes:

charts/shinyproxy/values.yaml

@@ -95,3 +95,13 @@ monitor:
   interval: 10s
   micrometer:
     prefix: ""
+
+livenessProbe:
+  enabled: true
+  periodSeconds: 20
+  initialDelaySeconds: 2
+  failureThreshold: 3
+readinessProbe:
+  enabled: true
+  initialDelaySeconds: 2
+  periodSeconds: 20