From 27731e6b5bcf56f3cdc80a95468a9ce05eca6229 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Sun, 15 Dec 2024 13:08:35 +0330 Subject: [PATCH 1/3] Added global storage class Signed-off-by: xogoodnow --- .../templates/ingester/statefulset-ingester.yaml | 6 +++--- .../metrics-generator/statefulset-metrics-generator.yaml | 6 +++--- charts/tempo-distributed/values.yaml | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index 2671a23994..54c545f80b 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -1,5 +1,7 @@ {{- $dict := dict "ctx" . "component" "ingester" "memberlist" true -}} {{- $zonesMap := include "ingester.zoneAwareReplicationMap" $dict | fromYaml -}} +{{- $storageClass := .Values.ingester.persistence.storageClass | default .Values.global.storageClass }} +{{- if eq $storageClass "-" }}{{- $storageClass = "" }}{{- end }} {{- range $zoneName, $rolloutZone := $zonesMap -}} {{- with $ -}} {{- $_ := set $dict "rolloutZoneName" $zoneName -}} @@ -193,9 +195,7 @@ spec: spec: accessModes: - ReadWriteOnce - {{- with .Values.ingester.persistence.storageClass }} - storageClassName: {{ if (eq "-" .) }}""{{ else }}{{ . }}{{ end }} - {{- end }} + storageClassName: {{ if $storageClass }}{{ $storageClass }}{{ else }}{{- "" }}{{ end }} resources: requests: storage: {{ .Values.ingester.persistence.size | quote }} diff --git a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml index f057fba246..5abf851381 100644 --- a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml @@ -1,5 +1,7 @@ {{- if and (.Values.metricsGenerator.enabled) (eq .Values.metricsGenerator.kind "StatefulSet") }} {{ $dict := dict "ctx" . "component" "metrics-generator" "memberlist" true }} +{{- $storageClass := .Values.metricsGenerator.persistence.storageClass | default .Values.global.storageClass }} +{{- if eq $storageClass "-" }}{{- $storageClass = "" }}{{- end }} apiVersion: apps/v1 kind: StatefulSet metadata: @@ -156,9 +158,7 @@ spec: spec: accessModes: - ReadWriteOnce - {{- with .Values.metricsGenerator.persistence.storageClass }} - storageClassName: {{ if (eq "-" .) }}""{{ else }}{{ . }}{{ end }} - {{- end }} + storageClassName: {{ if $storageClass }}{{ $storageClass }}{{ else }}{{- "" }}{{ end }} resources: requests: storage: {{ .Values.metricsGenerator.persistence.size | quote }} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 68e2157433..6fec8e24e4 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -19,6 +19,8 @@ global: # -- Common environment variables to add to all pods directly managed by this chart. # scope: admin-api, compactor, distributor, enterprise-federation-frontend, gateway, ingester, memcached, metrics-generator, querier, query-frontend, tokengen extraEnv: [] + # -- Global storage class to be used for persisted components + storageClass: null fullnameOverride: '' # fullnameOverride: tempo From 92c467531c8e37bad3d599151aff5b1eb9a7b38b Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Sun, 15 Dec 2024 13:12:28 +0330 Subject: [PATCH 2/3] Bumped version Signed-off-by: xogoodnow --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 848f3a26f0..a0dd8f0187 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.26.1 +version: 1.26.2 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 39974f02d7..c44b07b2fa 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.26.1](https://img.shields.io/badge/Version-1.26.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.26.2](https://img.shields.io/badge/Version-1.26.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -510,6 +510,7 @@ The memcached default args are removed and should be provided manually. The sett | global.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets for all images, excluding enterprise. Names of existing secrets with private container registry credentials. Ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod Example: pullSecrets: [ my-dockerconfigjson-secret ] | | global.image.registry | string | `"docker.io"` | Overrides the Docker registry globally for all images, excluding enterprise. | | global.priorityClassName | string | `nil` | Overrides the priorityClassName for all pods | +| global.storageClass | string | `nil` | Global storage class to be used for persisted components | | global_overrides | object | `{"per_tenant_override_config":"/runtime-config/overrides.yaml"}` | The standard overrides configuration section. This can include a `defaults` object for applying to all tenants (not to be confused with the `global` property of the same name, which overrides `max_byte_per_trace` for all tenants). For an example on how to enable the metrics generator using the `global_overrides` object, see the 'Activate metrics generator' section below. Refer to [Standard overrides](https://grafana.com/docs/tempo/latest/configuration/#standard-overrides) for more details. | | ingester.affinity | string | Soft node and soft zone anti-affinity | Affinity for ingester pods. Passed through `tpl` and, thus, to be configured as string | | ingester.annotations | object | `{}` | Annotations for the ingester StatefulSet | From 4c4b5d7b8bde9c0d851dc34753cf0e8fb05ae02f Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Mon, 16 Dec 2024 17:58:17 +0330 Subject: [PATCH 3/3] Bumbped version Signed-off-by: xogoodnow --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index a0dd8f0187..bc14f9b5db 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.26.2 +version: 1.26.3 appVersion: 2.6.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index e9e1672920..d2ba4fe6ed 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.26.2](https://img.shields.io/badge/Version-1.26.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 1.26.3](https://img.shields.io/badge/Version-1.26.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Grafana Tempo in MicroService mode