Skip to content

Commit 4e3e313

Browse files
committed
Use ternary
Signed-off-by: Miguel Ruiz <[email protected]>
1 parent 28de38b commit 4e3e313

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

bitnami/rabbitmq/templates/statefulset.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -342,11 +342,7 @@ spec:
342342
{{- if or (.Values.loadDefinition.enabled) (not (contains "rabbitmq_management" .Values.plugins )) }}
343343
- rabbitmq-diagnostics -q ping
344344
{{- else }}
345-
{{- if .Values.usePasswordFiles }}
346-
- curl -f --user "{{ .Values.auth.username }}:$(< $RABBITMQ_PASSWORD_FILE)" 127.0.0.1:{{ .Values.containerPorts.manager }}/api/health/checks/virtual-hosts
347-
{{- else }}
348-
- curl -f --user {{ .Values.auth.username }}:$RABBITMQ_PASSWORD 127.0.0.1:{{ .Values.containerPorts.manager }}/api/health/checks/virtual-hosts
349-
{{- end }}
345+
- curl -f --user {{ .Values.auth.username }}:{{ ternary "$(< $RABBITMQ_PASSWORD_FILE)" "$RABBITMQ_PASSWORD" .Values.usePasswordFiles }} 127.0.0.1:{{ .Values.containerPorts.manager }}/api/health/checks/virtual-hosts
350346
{{- end }}
351347
{{- end }}
352348
{{- if .Values.customReadinessProbe }}
@@ -360,11 +356,7 @@ spec:
360356
{{- if or (.Values.loadDefinition.enabled) (not (contains "rabbitmq_management" .Values.plugins )) }}
361357
- rabbitmq-diagnostics -q check_running && rabbitmq-diagnostics -q check_local_alarms
362358
{{- else }}
363-
{{- if .Values.usePasswordFiles }}
364-
- curl -f --user "{{ .Values.auth.username }}:$(< $RABBITMQ_PASSWORD_FILE)" 127.0.0.1:{{ .Values.containerPorts.manager }}/api/health/checks/local-alarms
365-
{{- else }}
366-
- curl -f --user {{ .Values.auth.username }}:$RABBITMQ_PASSWORD 127.0.0.1:{{ .Values.containerPorts.manager }}/api/health/checks/local-alarms
367-
{{- end }}
359+
- curl -f --user {{ .Values.auth.username }}:{{ ternary "$(< $RABBITMQ_PASSWORD_FILE)" "$RABBITMQ_PASSWORD" .Values.usePasswordFiles }} 127.0.0.1:{{ .Values.containerPorts.manager }}/api/health/checks/local-alarms
368360
{{- end }}
369361
{{- end }}
370362
{{- if .Values.customStartupProbe }}

0 commit comments

Comments
 (0)