Skip to content

Commit 7b5bb98

Browse files
orgadsorgads
authored
[bitnami/parse] Use custom probes if given (#12544)
Without this change, in order to use a custom probe, the user has to specify the probe parameters, and also must specify for the original probe "enabled: false". Issue: #12354 Signed-off-by: Orgad Shaneh <orgad.shaneh@audiocodes.com> Signed-off-by: Orgad Shaneh <orgad.shaneh@audiocodes.com>
1 parent 79696e1 commit 7b5bb98

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎bitnami/parse/templates/dashboard-deployment.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,28 +133,28 @@ spec:
133133
- name: http-dashboard
134134
containerPort: {{ .Values.dashboard.containerPorts.http }}
135135
{{- if not .Values.diagnosticMode.enabled }}
136-
{{- if .Values.dashboard.livenessProbe.enabled }}
136+
{{- if .Values.dashboard.customLivenessProbe }}
137+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customLivenessProbe "context" $) | nindent 12 }}
138+
{{- else if .Values.dashboard.livenessProbe.enabled }}
137139
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.dashboard.livenessProbe "enabled") "context" $) | nindent 12 }}
138140
httpGet:
139141
path: /
140142
port: http-dashboard
141-
{{- else if .Values.dashboard.customLivenessProbe }}
142-
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customLivenessProbe "context" $) | nindent 12 }}
143143
{{- end }}
144-
{{- if and .Values.dashboard.readinessProbe.enabled }}
144+
{{- if .Values.dashboard.customReadinessProbe }}
145+
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customReadinessProbe "context" $) | nindent 12 }}
146+
{{- else if .Values.dashboard.readinessProbe.enabled }}
145147
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.dashboard.readinessProbe "enabled") "context" $) | nindent 12 }}
146148
httpGet:
147149
path: /
148150
port: http-dashboard
149-
{{- else if .Values.dashboard.customReadinessProbe }}
150-
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customReadinessProbe "context" $) | nindent 12 }}
151151
{{- end }}
152-
{{- if .Values.dashboard.startupProbe.enabled }}
152+
{{- if .Values.dashboard.customStartupProbe }}
153+
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customStartupProbe "context" $) | nindent 12 }}
154+
{{- else if .Values.dashboard.startupProbe.enabled }}
153155
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.dashboard.startupProbe "enabled") "context" $) | nindent 12 }}
154156
tcpSocket:
155157
port: http-dashboard
156-
{{- else if .Values.dashboard.customStartupProbe }}
157-
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customStartupProbe "context" $) | nindent 12 }}
158158
{{- end }}
159159
{{- end }}
160160
{{- if .Values.dashboard.lifecycleHooks }}

‎bitnami/parse/templates/server-deployment.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,34 +153,34 @@ spec:
153153
- name: http-server
154154
containerPort: {{ .Values.server.containerPorts.http }}
155155
{{- if not .Values.diagnosticMode.enabled }}
156-
{{- if and .Values.server.livenessProbe.enabled }}
156+
{{- if .Values.server.customLivenessProbe }}
157+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.server.customLivenessProbe "context" $) | nindent 12 }}
158+
{{- else if .Values.server.livenessProbe.enabled }}
157159
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.server.livenessProbe "enabled") "context" $) | nindent 12 }}
158160
httpGet:
159161
path: {{ .Values.server.mountPath }}/users
160162
port: http-server
161163
httpHeaders:
162164
- name: X-Parse-Application-Id
163165
value: {{ .Values.server.appId }}
164-
{{- else if .Values.server.customLivenessProbe }}
165-
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.server.customLivenessProbe "context" $) | nindent 12 }}
166166
{{- end }}
167-
{{- if and .Values.server.readinessProbe.enabled }}
167+
{{- if .Values.server.customReadinessProbe }}
168+
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.server.customReadinessProbe "context" $) | nindent 12 }}
169+
{{- else if .Values.server.readinessProbe.enabled }}
168170
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.server.readinessProbe "enabled") "context" $) | nindent 12 }}
169171
httpGet:
170172
path: {{ .Values.server.mountPath }}/users
171173
port: http-server
172174
httpHeaders:
173175
- name: X-Parse-Application-Id
174176
value: {{ .Values.server.appId }}
175-
{{- else if .Values.server.customReadinessProbe }}
176-
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.server.customReadinessProbe "context" $) | nindent 12 }}
177177
{{- end }}
178-
{{- if .Values.server.startupProbe.enabled }}
178+
{{- if .Values.server.customStartupProbe }}
179+
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.server.customStartupProbe "context" $) | nindent 12 }}
180+
{{- else if .Values.server.startupProbe.enabled }}
179181
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.server.startupProbe "enabled") "context" $) | nindent 12 }}
180182
tcpSocket:
181183
port: http-server
182-
{{- else if .Values.server.customStartupProbe }}
183-
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.server.customStartupProbe "context" $) | nindent 12 }}
184184
{{- end }}
185185
{{- end }}
186186
{{- if .Values.server.lifecycleHooks }}

0 commit comments

Comments
 (0)