all: allow deactivation of probes

Author: ElysaSrc

templates/editoast/deployment.yaml

@@ -38,6 +38,7 @@ spec:
               containerPort: {{ .Values.services.editoast.service.port }}
               protocol: TCP
 
+          {{- if not .Values.services.editoast.livenessProbe.disabled }}
           livenessProbe:
             exec:
               command:
@@ -47,11 +48,14 @@ spec:
             initialDelaySeconds: {{ .Values.services.editoast.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.services.editoast.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.services.editoast.livenessProbe.timeoutSeconds }}
+          {{- end }}
 
+          {{- if not .Values.services.editoast.readinessProbe.disabled }}
           readinessProbe:
             httpGet:
               path: /health
               port: http
+          {{- end }}
 
           env:
             - name: EDITOAST_PORT

templates/gateway/deployment.yaml

@@ -50,14 +50,21 @@ spec:
             {{- with (.Values.services.gateway.volumeMounts | default list) }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
+          
+          {{- if not .Values.services.gateway.livenessProbe.disabled }}
           livenessProbe:
             httpGet:
               path: /health
               port: http
+          {{- end }}
+
+          {{- if not .Values.services.gateway.readinessProbe.disabled }}
           readinessProbe:
             httpGet:
               path: /health
               port: http
+          {{- end }}
+
           env:
             {{- with .Values.services.gateway.env }}
             {{- toYaml . | nindent 12 }}

templates/osrdyne/deployment.yaml

@@ -46,14 +46,21 @@ spec:
             {{- with (.Values.services.osrdyne.volumeMounts | default list) }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
+
+          {{- if not .Values.services.osrdyne.livenessProbe.disabled }}
           livenessProbe:
             httpGet:
               path: /health
               port: http
+          {{- end }}
+
+          {{- if not .Values.services.osrdyne.readinessProbe.disabled }}
           readinessProbe:
             httpGet:
               path: /health
               port: http
+          {{- end }}
+
           env:
             - name: OSRDYNE__AMQP_URI
               {{- $amqp := .Values.endpoints.amqp }}

templates/tile_server/deployment.yaml

@@ -38,18 +38,22 @@ spec:
               containerPort: {{ .Values.services.tileServer.service.port }}
               protocol: TCP
 
+          {{- if not .Values.services.osrdyne.tileServer.disabled }}
           livenessProbe:
             httpGet:
               path: /health
               port: http
             initialDelaySeconds: {{ .Values.services.tileServer.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.services.tileServer.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.services.tileServer.livenessProbe.timeoutSeconds }}
+          {{- end }}
 
+          {{- if not .Values.services.tileServer.readinessProbe.disabled }}
           readinessProbe:
             httpGet:
               path: /health
               port: http
+          {{- end }}
 
           env:
             - name: EDITOAST_PORT

values.yaml

@@ -39,9 +39,12 @@ services:
       port: 80
       targetPort: 80
     livenessProbe:
+      disabled: false
       initialDelaySeconds: 5
       periodSeconds: 60
       timeoutSeconds: 20
+    readinessProbe:
+      disabled: false
     config:
       pool_id: "core"
       api_address: "0.0.0.0:80"
@@ -92,9 +95,12 @@ services:
       port: 80
       targetPort: 80
     livenessProbe:
+      disabled: false
       initialDelaySeconds: 0
       periodSeconds: 10
       timeoutSeconds: 1
+    readinessProbe:
+      disabled: false
     hpa:
       enabled: false
       minReplicas: 1
@@ -138,6 +144,10 @@ services:
         - "10.0.0.0/8"
         - "172.16.0.0/12"
         - "192.168.0.0/16"
+    livenessProbe:
+      disabled: false
+    readinessProbe:
+      disabled: false
     annotations: {}
     labels: {}
     nodeSelector: {}
@@ -156,9 +166,12 @@ services:
       port: 80
       targetPort: 80
     livenessProbe:
+      disabled: false
       initialDelaySeconds: 0
       periodSeconds: 10
       timeoutSeconds: 1
+    readinessProbe:
+      disabled: false
     annotations: {}
     init:
       enabled: true