Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-02-16 08:27:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/parse] Use custom probes if given (#12544)

Browse Source 
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>
This commit is contained in:
Orgad Shaneh
2022-09-20 13:17:31 +03:00
committed by GitHub
parent 79696e14d8
commit 7b5bb982dd
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bitnami/parse/templates/dashboard-deployment.yaml
View File

@@ -133,28 +133,28 @@ spec:
- name: http-dashboard
containerPort: {{ .Values.dashboard.containerPorts.http }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.dashboard.livenessProbe.enabled }}
{{- if .Values.dashboard.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customLivenessProbe "context" $) | nindent 12 }}
{{- else if .Values.dashboard.livenessProbe.enabled }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.dashboard.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /
port: http-dashboard
{{- else if .Values.dashboard.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if and .Values.dashboard.readinessProbe.enabled }}
{{- if .Values.dashboard.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customReadinessProbe "context" $) | nindent 12 }}
{{- else if .Values.dashboard.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.dashboard.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /
port: http-dashboard
{{- else if .Values.dashboard.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.dashboard.startupProbe.enabled }}
{{- if .Values.dashboard.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customStartupProbe "context" $) | nindent 12 }}
{{- else if .Values.dashboard.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.dashboard.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http-dashboard
{{- else if .Values.dashboard.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.dashboard.lifecycleHooks }}

18
bitnami/parse/templates/server-deployment.yaml
View File

@@ -153,7 +153,9 @@ spec:
- name: http-server
containerPort: {{ .Values.server.containerPorts.http }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if and .Values.server.livenessProbe.enabled }}
{{- if .Values.server.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.server.customLivenessProbe "context" $) | nindent 12 }}
{{- else if .Values.server.livenessProbe.enabled }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.server.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: {{ .Values.server.mountPath }}/users
@@ -161,10 +163,10 @@ spec:
httpHeaders:
- name: X-Parse-Application-Id
value: {{ .Values.server.appId }}
{{- else if .Values.server.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.server.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if and .Values.server.readinessProbe.enabled }}
{{- if .Values.server.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.server.customReadinessProbe "context" $) | nindent 12 }}
{{- else if .Values.server.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.server.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: {{ .Values.server.mountPath }}/users
@@ -172,15 +174,13 @@ spec:
httpHeaders:
- name: X-Parse-Application-Id
value: {{ .Values.server.appId }}
{{- else if .Values.server.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.server.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.server.startupProbe.enabled }}
{{- if .Values.server.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.server.customStartupProbe "context" $) | nindent 12 }}
{{- else if .Values.server.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.server.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http-server
{{- else if .Values.server.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.server.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.server.lifecycleHooks }}