Skip to content

Commit c7881c4

Browse files
committed
Merged PR 876: make readiness/liveness configurable with helm values
make readiness/liveness configurable with helm values solved: #133002
1 parent cbaa513 commit c7881c4

File tree

2 files changed

+46
-14
lines changed

2 files changed

+46
-14
lines changed

charts/ingestion/templates/ingestion-deploy.yaml

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,38 @@ spec:
4141
- name: &ingestion-container_name fabrikam-ingestion
4242
image: {{ .Values.dockerregistry }}{{ .Values.dockerregistrynamespace }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
4343
imagePullPolicy: {{ .Values.image.pullPolicy }}
44-
livenessProbe:
45-
httpGet:
46-
path: /actuator/health
47-
port: 80
48-
initialDelaySeconds: 120
49-
periodSeconds: 30
50-
successThreshold: 1
51-
failureThreshold: 5
5244
readinessProbe:
5345
httpGet:
54-
path: /api/probe
55-
port: 80
56-
initialDelaySeconds: 120
57-
periodSeconds: 30
58-
successThreshold: 1
59-
failureThreshold: 5
46+
path: {{ required "readinessProbe.httpGet.path is required" .Values.readinessProbe.httpGet.path }}
47+
port: {{ required "readinessProbe.httpGet.port is required" .Values.readinessProbe.httpGet.port }}
48+
{{- if .Values.readinessProbe.initialDelaySeconds }}
49+
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
50+
{{- end }}
51+
{{- if .Values.readinessProbe.periodSeconds }}
52+
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
53+
{{- end }}
54+
{{- if .Values.readinessProbe.timeoutSeconds }}
55+
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
56+
{{- end }}
57+
{{- if .Values.readinessProbe.failureThreshold }}
58+
failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
59+
{{- end }}
60+
livenessProbe:
61+
httpGet:
62+
path: {{ required "livenessProbe.httpGet.path is required" .Values.livenessProbe.httpGet.path }}
63+
port: {{ required "livenessProbe.httpGet.port is required" .Values.livenessProbe.httpGet.port }}
64+
{{- if .Values.livenessProbe.initialDelaySeconds }}
65+
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
66+
{{- end }}
67+
{{- if .Values.livenessProbe.periodSeconds }}
68+
periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
69+
{{- end }}
70+
{{- if .Values.livenessProbe.timeoutSeconds }}
71+
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
72+
{{- end }}
73+
{{- if .Values.livenessProbe.failureThreshold }}
74+
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
75+
{{- end }}
6076
resources:
6177
requests:
6278
cpu: {{ required "A valid .Values.resources.requests.cpu entry required!" .Values.resources.requests.cpu }}

charts/ingestion/values.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@ image:
77
tag:
88
pullPolicy: IfNotPresent
99
reason: unknown
10+
livenessProbe:
11+
httpGet:
12+
path: /actuator/health
13+
port: 80
14+
initialDelaySeconds: 120
15+
periodSeconds: 30
16+
successThreshold: 1
17+
failureThreshold: 5
18+
readinessProbe:
19+
httpGet:
20+
path: /api/probe
21+
port: 80
22+
initialDelaySeconds: 120
23+
periodSeconds: 30
24+
successThreshold: 1
25+
failureThreshold: 5
1026
telemetry:
1127
level: "error"
1228
tags:

0 commit comments

Comments
 (0)