Commit 30488328 authored by Shinya Maeda's avatar Shinya Maeda
Browse files

Merge branch 'aconrey/liveness-probe-enable-flag' into 'master' 

Add 'enabled' flag for readiness and liveness probes in helm chart

See merge request https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/merge_requests/334



Merged-by: default avatarShinya Maeda <shinya@gitlab.com>
Approved-by: default avatarThong Kuah <tkuah@gitlab.com>
Approved-by: default avatarShinya Maeda <shinya@gitlab.com>
Co-authored-by: default avatarAlex Conrey <aconrey@grailbio.com>
parents 0708f802 fc5d7146

assets/auto-deploy-app/README.md

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
| ingress.modSecurity.secRuleEngine | Configuration for [ModSecurity's rule engine](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual-(v2.x)#SecRuleEngine) | `DetectionOnly` |

| ingress.modSecurity.secRules | Configuration for custom [ModSecurity's rules](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual-(v2.x)#secrule) | `nil` |

| ingress.annotations           | Ingress annotations | See [`_ingress-annotations.yaml`](./templates/_ingress-annotations.yaml) |

| livenessProbe.enabled         | If true, enables liveness probe. | `/`                                |

| livenessProbe.path            | Path to access on the HTTP server on periodic probe of container liveness. | `/`                                |

| livenessProbe.scheme          | Scheme to access the HTTP server (HTTP or HTTPS). | `HTTP`                                |

| livenessProbe.httpHeaders       | List of additional custom headers to send on the server | `[]`                                |
@@ -85,6 +86,7 @@ 
| livenessProbe.timeoutSeconds  | # of seconds after which the liveness probe times out. | `15`                               |

| livenessProbe.probeType       | Type of [liveness probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes) to use. | `httpGet`

| livenessProbe.command         | Commands for use with probe type 'exec'. | `{}`

| readinessProbe.enabled         | If true, enables readiness probe. | `/`                                |

| readinessProbe.path           | Path to access on the HTTP server on periodic probe of container readiness. | `/`                                |

| readinessProbe.scheme         | Scheme to access the HTTP server (HTTP or HTTPS). | `HTTP`                                |

| readinessProbe.httpHeaders      | List of additional custom headers to send on the server | `[]`                                |

assets/auto-deploy-app/templates/deployment.yaml

+4 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ spec: 
          {{- end }}

{{- end }}

{{- end }}

{{- if .Values.livenessProbe.enabled }}

        livenessProbe:

{{- if eq .Values.livenessProbe.probeType "httpGet" }}

          httpGet:
@@ -184,6 +185,8 @@ spec: 
{{- end }}

          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}

          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}

{{- end }}

{{- if .Values.readinessProbe.enabled }}

        readinessProbe:

{{- if eq .Values.readinessProbe.probeType "httpGet" }}

          httpGet:
@@ -207,6 +210,7 @@ spec: 
{{- end }}

          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}

          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}

{{- end }}

{{- if .Values.startupProbe.enabled }}

        startupProbe:

{{- if eq .Values.startupProbe.probeType "httpGet" }}

assets/auto-deploy-app/values.yaml

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ ingress: 
prometheus:

  metrics: false

livenessProbe:

  enabled: true

  path: "/"

  initialDelaySeconds: 15

  timeoutSeconds: 15
@@ -111,6 +112,7 @@ livenessProbe: 
  probeType: "httpGet"

  httpHeaders: []

readinessProbe:

  enabled: true

  path: "/"

  initialDelaySeconds: 5

  timeoutSeconds: 3