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

[bitnami/rabbitmq-cluster-operator] Use custom probes if given (#12552)

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:07:12 +03:00
committed by GitHub
parent 46a6e771ea
commit b600e48ab5
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/rabbitmq-cluster-operator/Chart.yaml
View File

@@ -26,4 +26,4 @@ name: rabbitmq-cluster-operator
sources:
- https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq-cluster-operator
- https://github.com/rabbitmq/cluster-operator
version: 2.7.3
version: 2.7.4

18
bitnami/rabbitmq-cluster-operator/templates/cluster-operator/deployment.yaml
View File

@@ -118,29 +118,29 @@ spec:
resources: {{- toYaml .Values.clusterOperator.resources | nindent 12 }}
{{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.clusterOperator.livenessProbe.enabled }}
{{- if .Values.clusterOperator.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.clusterOperator.customLivenessProbe "context" $) | nindent 12 }}
{{- else if .Values.clusterOperator.livenessProbe.enabled }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.clusterOperator.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /metrics
port: http
{{- else if .Values.clusterOperator.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.clusterOperator.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.clusterOperator.readinessProbe.enabled }}
{{- if .Values.clusterOperator.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.clusterOperator.customReadinessProbe "context" $) | nindent 12 }}
{{- else if .Values.clusterOperator.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.clusterOperator.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /metrics
port: http
{{- else if .Values.clusterOperator.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.clusterOperator.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.clusterOperator.startupProbe.enabled }}
{{- if .Values.clusterOperator.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.clusterOperator.customStartupProbe "context" $) | nindent 12 }}
{{- else if .Values.clusterOperator.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.clusterOperator.startupProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /metrics
port: http
{{- else if .Values.clusterOperator.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.clusterOperator.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.clusterOperator.lifecycleHooks }}

18
bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/deployment.yaml
View File

@@ -117,29 +117,29 @@ spec:
containerPort: {{ .Values.msgTopologyOperator.containerPorts.metrics }}
protocol: TCP
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.msgTopologyOperator.livenessProbe.enabled }}
{{- if .Values.msgTopologyOperator.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.msgTopologyOperator.customLivenessProbe "context" $) | nindent 12 }}
{{- else if .Values.msgTopologyOperator.livenessProbe.enabled }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.msgTopologyOperator.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /metrics
port: http-metrics
{{- else if .Values.msgTopologyOperator.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.msgTopologyOperator.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.msgTopologyOperator.readinessProbe.enabled }}
{{- if .Values.msgTopologyOperator.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.msgTopologyOperator.customReadinessProbe "context" $) | nindent 12 }}
{{- else if .Values.msgTopologyOperator.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.msgTopologyOperator.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /metrics
port: http-metrics
{{- else if .Values.msgTopologyOperator.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.msgTopologyOperator.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.msgTopologyOperator.startupProbe.enabled }}
{{- if .Values.msgTopologyOperator.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.msgTopologyOperator.customStartupProbe "context" $) | nindent 12 }}
{{- else if .Values.msgTopologyOperator.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.msgTopologyOperator.startupProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /metrics
port: http-metrics
{{- else if .Values.msgTopologyOperator.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.msgTopologyOperator.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.msgTopologyOperator.lifecycleHooks }}