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

[bitnami/grafana-operator] Use custom probes if given (#12501)

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-22 11:41:50 +03:00
committed by GitHub
parent 353c06e8d9
commit fb2eee42e2
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/grafana-operator/Chart.yaml
View File

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

18
bitnami/grafana-operator/templates/deployment.yaml
View File

@@ -161,29 +161,29 @@ spec:
- containerPort: {{ .Values.operator.containerPorts.metrics }} - containerPort: {{ .Values.operator.containerPorts.metrics }}
name: metrics name: metrics
protocol: TCP protocol: TCP
{{- if .Values.operator.livenessProbe.enabled }} {{- if .Values.operator.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.operator.customLivenessProbe "context" $) | nindent 12 }}
{{- else if .Values.operator.livenessProbe.enabled }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.operator.livenessProbe "enabled") "context" $) | nindent 12 }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.operator.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet: httpGet:
path: /healthz path: /healthz
port: 8081 port: 8081
{{- else if .Values.operator.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.operator.customLivenessProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.operator.readinessProbe.enabled }} {{- if .Values.operator.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.operator.customReadinessProbe "context" $) | nindent 12 }}
{{- else if .Values.operator.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.operator.readinessProbe "enabled") "context" $) | nindent 12 }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.operator.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet: httpGet:
path: /metrics path: /metrics
port: metrics port: metrics
{{- else if .Values.operator.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.operator.customReadinessProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.operator.startupProbe.enabled }} {{- if .Values.operator.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.operator.customStartupProbe "context" $) | nindent 12 }}
{{- else if .Values.operator.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.operator.startupProbe "enabled") "context" $) | nindent 12 }} startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.operator.startupProbe "enabled") "context" $) | nindent 12 }}
httpGet: httpGet:
path: /metrics path: /metrics
port: metrics port: metrics
{{- else if .Values.operator.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.operator.customStartupProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.operator.extraVolumeMounts }} {{- if .Values.operator.extraVolumeMounts }}
volumeMounts: {{- include "common.tplvalues.render" (dict "value" .Values.operator.extraVolumeMounts "context" $) | nindent 12 }} volumeMounts: {{- include "common.tplvalues.render" (dict "value" .Values.operator.extraVolumeMounts "context" $) | nindent 12 }}