From 25805f6e8fe04d20148e41d152702355c5e7c679 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Mon, 16 Dec 2024 12:05:39 +0330 Subject: [PATCH 1/5] Condition was never met Signed-off-by: xogoodnow --- .../tempo-distributed/templates/ingester/pdb.yaml | 14 -------------- charts/tempo-distributed/values.yaml | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 charts/tempo-distributed/templates/ingester/pdb.yaml diff --git a/charts/tempo-distributed/templates/ingester/pdb.yaml b/charts/tempo-distributed/templates/ingester/pdb.yaml deleted file mode 100644 index 01c9db0dd0..0000000000 --- a/charts/tempo-distributed/templates/ingester/pdb.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if .Values.podDisruptionBudget -}} -apiVersion: {{ include "tempo.pdb.apiVersion" . }} -kind: PodDisruptionBudget -metadata: - name: {{ include "tempo.resourceName" (dict "ctx" . "component" "ingester") }} - namespace: {{ .Release.Namespace }} - labels: - {{- include "tempo.labels" (dict "ctx" . "component" "ingester") | nindent 4 }} -spec: - selector: - matchLabels: - app: {{ include "tempo.resourceName" (dict "ctx" . "component" "ingester") }} -{{ toYaml .Values.podDisruptionBudget | indent 2 }} -{{- end }} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 68e2157433..b91a8348bd 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -194,7 +194,7 @@ ingester: {{- include "tempo.selectorLabels" (dict "ctx" . "component" "ingester") | nindent 12 }} topologyKey: topology.kubernetes.io/zone # -- Override Pod Disruption Budget maxUnavailable with a static value - # maxUnavailable: 1 + maxUnavailable: 1 # -- Node selector for ingester pods nodeSelector: {} # -- Tolerations for ingester pods From dfed271a09f2930c83b4028ae5a4b58446e28dc2 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Mon, 16 Dec 2024 12:07:42 +0330 Subject: [PATCH 2/5] 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..accdd717f8 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 @@ -539,6 +539,7 @@ The memcached default args are removed and should be provided manually. The sett | ingester.image.repository | string | `nil` | Docker image repository for the ingester image. Overrides `tempo.image.repository` | | ingester.image.tag | string | `nil` | Docker image tag for the ingester image. Overrides `tempo.image.tag` | | ingester.initContainers | list | `[]` | | +| ingester.maxUnavailable | int | `1` | Override Pod Disruption Budget maxUnavailable with a static value | | ingester.nodeSelector | object | `{}` | Node selector for ingester pods | | ingester.persistence.annotations | object | `{}` | Annotations for ingester's persist volume claim | | ingester.persistence.enabled | bool | `false` | Enable creating PVCs which is required when using boltdb-shipper | From 2c137a5915f49f90193e62505926e26ac9c2e6dd Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Mon, 16 Dec 2024 18:00:10 +0330 Subject: [PATCH 3/5] 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 accdd717f8..5af0af7e2b 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 From 6bf66fab968359cfa8c179fc6986ae3a5b0818e9 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Mon, 16 Dec 2024 18:13:42 +0330 Subject: [PATCH 4/5] Bumbped chart 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 67d51d9cb3..c754766853 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 From 16cc1626dd1bbdad7f4bc4aa9ffffd8ae363af00 Mon Sep 17 00:00:00 2001 From: xogoodnow Date: Sat, 25 Jan 2025 17:14:00 +0330 Subject: [PATCH 5/5] Updated docs 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 aeadbb0a74..8fc74e85d6 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.31.0 +version: 1.31.1 appVersion: 2.7.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 9c5e5625ac..2f1c115f0b 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.31.0](https://img.shields.io/badge/Version-1.31.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square) +![Version: 1.31.1](https://img.shields.io/badge/Version-1.31.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square) Grafana Tempo in MicroService mode