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

[bitnami/grafana-loki] Use custom probes if given (#12500)

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>
This commit is contained in:
Orgad Shaneh
2022-10-03 17:36:57 +03:00
committed by GitHub
parent b983e0f5c1
commit 691b938a30
12 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,4 +44,4 @@ name: grafana-loki
sources:
- https://github.com/bitnami/containers/tree/main/bitnami/grafana-loki
- https://github.com/grafana/loki/
version: 2.4.2
version: 2.4.3

18
bitnami/grafana-loki/templates/compactor/deployment.yaml
View File

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

18
bitnami/grafana-loki/templates/distributor/deployment.yaml
View File

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

18
bitnami/grafana-loki/templates/gateway/deployment.yaml
View File

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

18
bitnami/grafana-loki/templates/index-gateway/statefulset.yaml
View File

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

18
bitnami/grafana-loki/templates/ingester/statefulset.yaml
View File

@@ -142,26 +142,26 @@ spec:
resources: {{- toYaml .Values.ingester.resources | nindent 12 }}
{{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.ingester.livenessProbe.enabled }}
{{- if .Values.ingester.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.customLivenessProbe "context" $) | nindent 12 }}
{{- else if .Values.ingester.livenessProbe.enabled }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.ingester.livenessProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.ingester.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.ingester.readinessProbe.enabled }}
{{- if .Values.ingester.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.customReadinessProbe "context" $) | nindent 12 }}
{{- else if .Values.ingester.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.ingester.readinessProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.ingester.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.ingester.startupProbe.enabled }}
{{- if .Values.ingester.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.customStartupProbe "context" $) | nindent 12 }}
{{- else if .Values.ingester.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.ingester.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.ingester.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.ingester.lifecycleHooks }}

18
bitnami/grafana-loki/templates/promtail/daemonset.yaml
View File

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

18
bitnami/grafana-loki/templates/querier/statefulset.yaml
View File

@@ -147,26 +147,26 @@ spec:
resources: {{- toYaml .Values.querier.resources | nindent 12 }}
{{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.querier.livenessProbe.enabled }}
{{- if .Values.querier.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.querier.customLivenessProbe "context" $) | nindent 12 }}
{{- else if .Values.querier.livenessProbe.enabled }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.querier.livenessProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.querier.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.querier.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.querier.readinessProbe.enabled }}
{{- if .Values.querier.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.querier.customReadinessProbe "context" $) | nindent 12 }}
{{- else if .Values.querier.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.querier.readinessProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.querier.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.querier.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.querier.startupProbe.enabled }}
{{- if .Values.querier.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.querier.customStartupProbe "context" $) | nindent 12 }}
{{- else if .Values.querier.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.querier.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.querier.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.querier.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.querier.lifecycleHooks }}

18
bitnami/grafana-loki/templates/query-frontend/deployment.yaml
View File

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

18
bitnami/grafana-loki/templates/query-scheduler/deployment.yaml
View File

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

18
bitnami/grafana-loki/templates/ruler/statefulset.yaml
View File

@@ -145,26 +145,26 @@ spec:
resources: {{- toYaml .Values.ruler.resources | nindent 12 }}
{{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.ruler.livenessProbe.enabled }}
{{- if .Values.ruler.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ruler.customLivenessProbe "context" $) | nindent 12 }}
{{- else if .Values.ruler.livenessProbe.enabled }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.ruler.livenessProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.ruler.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ruler.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.ruler.readinessProbe.enabled }}
{{- if .Values.ruler.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ruler.customReadinessProbe "context" $) | nindent 12 }}
{{- else if .Values.ruler.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.ruler.readinessProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.ruler.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ruler.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.ruler.startupProbe.enabled }}
{{- if .Values.ruler.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ruler.customStartupProbe "context" $) | nindent 12 }}
{{- else if .Values.ruler.startupProbe.enabled }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.ruler.startupProbe "enabled") "context" $) | nindent 12 }}
tcpSocket:
port: http
{{- else if .Values.ruler.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ruler.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.ruler.lifecycleHooks }}

18
bitnami/grafana-loki/templates/table-manager/deployment.yaml
View File

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