diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml index b06ddfcf50..b12a1c9757 100644 --- a/charts/tempo/Chart.yaml +++ b/charts/tempo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo description: Grafana Tempo Single Binary Mode type: application -version: 1.13.0 +version: 1.14.0 appVersion: 2.6.1 engine: gotpl home: https://grafana.net diff --git a/charts/tempo/README.md b/charts/tempo/README.md index b49ba60b87..51460b7de4 100644 --- a/charts/tempo/README.md +++ b/charts/tempo/README.md @@ -1,6 +1,6 @@ # tempo -![Version: 1.13.0](https://img.shields.io/badge/Version-1.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square) +![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square) Grafana Tempo Single Binary Mode @@ -31,6 +31,7 @@ Grafana Tempo Single Binary Mode | networkPolicy.ingress | bool | `true` | | | nodeSelector | object | `{}` | Node labels for pod assignment. See: https://kubernetes.io/docs/user-guide/node-selection/ | | persistence.accessModes[0] | string | `"ReadWriteOnce"` | | +| persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | persistence.enabled | bool | `false` | | | persistence.size | string | `"10Gi"` | | | podAnnotations | object | `{}` | Pod Annotations | diff --git a/charts/tempo/templates/statefulset.yaml b/charts/tempo/templates/statefulset.yaml index 79a6204e35..53c9605fad 100644 --- a/charts/tempo/templates/statefulset.yaml +++ b/charts/tempo/templates/statefulset.yaml @@ -14,6 +14,11 @@ spec: {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} {{- end }} + {{- if and (semverCompare ">= 1.23-0" .Capabilities.KubeVersion.Version) (.Values.persistence.enableStatefulSetAutoDeletePVC) (.Values.persistence.enabled) }} + persistentVolumeClaimRetentionPolicy: + whenDeleted: Delete + whenScaled: Delete + {{- end }} selector: matchLabels: {{- include "tempo.selectorLabels" . | nindent 6 }} diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml index 7aaf93920b..2b9ce226ef 100644 --- a/charts/tempo/values.yaml +++ b/charts/tempo/values.yaml @@ -276,6 +276,8 @@ serviceMonitor: persistence: enabled: false + # -- Enable StatefulSetAutoDeletePVC feature + enableStatefulSetAutoDeletePVC: false # storageClassName: local-path accessModes: - ReadWriteOnce