Skip to content

Commit d3f35d1

Browse files
Merge pull request #3735 from KyriosGN0/probe
[tempo-distributed] add supports for readiness and liveness probe in memcached
2 parents 472ce8d + 059edeb commit d3f35d1

File tree

4 files changed

+35
-2
lines changed

4 files changed

+35
-2
lines changed

charts/tempo-distributed/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: tempo-distributed
33
description: Grafana Tempo in MicroService mode
44
type: application
5-
version: 1.41.1
5+
version: 1.41.2
66
appVersion: 2.7.2
77
engine: gotpl
88
home: https://grafana.com/docs/tempo/latest/

charts/tempo-distributed/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tempo-distributed
22

3-
![Version: 1.41.1](https://img.shields.io/badge/Version-1.41.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.2](https://img.shields.io/badge/AppVersion-2.7.2-informational?style=flat-square)
3+
![Version: 1.41.2](https://img.shields.io/badge/Version-1.41.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.2](https://img.shields.io/badge/AppVersion-2.7.2-informational?style=flat-square)
44

55
Grafana Tempo in MicroService mode
66

@@ -653,9 +653,11 @@ The memcached default args are removed and should be provided manually. The sett
653653
| memcached.image.repository | string | `"memcached"` | Memcached Docker image repository |
654654
| memcached.image.tag | string | `"1.6.33-alpine"` | Memcached Docker image tag |
655655
| memcached.initContainers | list | `[]` | Init containers for the memcached pod |
656+
| memcached.livenessProbe | object | `{"failureThreshold":6,"initialDelaySeconds":30,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":5}` | configuration for liveness probe for memcached statefulset |
656657
| memcached.maxUnavailable | int | `1` | Pod Disruption Budget maxUnavailable |
657658
| memcached.podAnnotations | object | `{}` | Annotations for memcached pods |
658659
| memcached.podLabels | object | `{}` | Labels for memcached pods |
660+
| memcached.readinessProbe | object | `{"failureThreshold":6,"initialDelaySeconds":5,"periodSeconds":5,"successThreshold":1,"tcpSocket":{"port":"client"},"timeoutSeconds":3}` | configuration for readiness probe for memcached statefulset |
659661
| memcached.replicas | int | `1` | |
660662
| memcached.resources | object | `{}` | Resource requests and limits for memcached |
661663
| memcached.service.annotations | object | `{}` | Annotations for memcached service |

charts/tempo-distributed/templates/memcached/statefulset-memcached.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,18 @@ spec:
7777
envFrom:
7878
{{- toYaml . | nindent 12 }}
7979
{{- end }}
80+
{{- with .Values.memcached.readinessProbe }}
81+
readinessProbe:
82+
{{- toYaml . | nindent 12 }}
83+
{{- end }}
84+
{{- with .Values.memcached.livenessProbe }}
85+
livenessProbe:
86+
exec:
87+
command:
88+
- pgrep
89+
- memcached
90+
{{- toYaml . | nindent 12 }}
91+
{{- end }}
8092
resources:
8193
{{- toYaml .Values.memcached.resources | nindent 12 }}
8294
{{- with .Values.tempo.securityContext }}

charts/tempo-distributed/values.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,6 +1712,25 @@ memcached:
17121712
service:
17131713
# -- Annotations for memcached service
17141714
annotations: {}
1715+
1716+
# -- configuration for readiness probe for memcached statefulset
1717+
readinessProbe:
1718+
tcpSocket:
1719+
port: client
1720+
initialDelaySeconds: 5
1721+
periodSeconds: 5
1722+
timeoutSeconds: 3
1723+
failureThreshold: 6
1724+
successThreshold: 1
1725+
1726+
# -- configuration for liveness probe for memcached statefulset
1727+
livenessProbe:
1728+
initialDelaySeconds: 30
1729+
periodSeconds: 10
1730+
timeoutSeconds: 5
1731+
failureThreshold: 6
1732+
successThreshold: 1
1733+
17151734
memcachedExporter:
17161735
# -- Specifies whether the Memcached Exporter should be enabled
17171736
enabled: false

0 commit comments

Comments
 (0)