From 2fb8ac1758537706e067f8c9e1288b401b8b5ef6 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 5 Oct 2024 04:33:23 +0530 Subject: [PATCH 1/4] Add support for tolerations in memcached Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- charts/tempo-distributed/values.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 63250f02c2..9f57b1e752 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.18.2 +version: 1.19.0 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 eb6cb3b692..ee2253a4ef 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.18.2](https://img.shields.io/badge/Version-1.18.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.19.0](https://img.shields.io/badge/Version-1.19.0-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 diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 31d32c1eff..1fdb1992ee 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -1512,6 +1512,8 @@ memcached: replicas: 1 # -- Additional CLI args for memcached extraArgs: [] + # -- Toleration for memcached pods + tolerations: [] # -- Environment variables to add to memcached pods extraEnv: [] # -- Environment variables from secrets or configmaps to add to memcached pods From a482fd615ce9e327aed11660f5b9e22ba7739b7e Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 5 Oct 2024 04:39:31 +0530 Subject: [PATCH 2/4] Update README.md Signed-off-by: Sheikh-Abubaker --- charts/tempo-distributed/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index ee2253a4ef..d181bae7d5 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -584,6 +584,7 @@ The memcached default args are removed and should be provided manually. The sett | memcached.replicas | int | `1` | | | memcached.resources | object | `{}` | Resource requests and limits for memcached | | memcached.service.annotations | object | `{}` | Annotations for memcached service | +| memcached.tolerations | list | `[]` | Toleration for memcached pods | | memcached.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for memcached pods. Passed through `tpl` and, thus, to be configured as string | | memcachedExporter.enabled | bool | `false` | Specifies whether the Memcached Exporter should be enabled | | memcachedExporter.hostAliases | list | `[]` | hostAliases to add | From c24e59e44089da22a0c1540f2bb0c1ca47d273ac Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 10 Oct 2024 14:41:45 -0700 Subject: [PATCH 3/4] correct array formatting Signed-off-by: Nathan --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/_config.tpl | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 58e6238907..f50100b802 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.5.2 +version: 8.5.3 appVersion: 11.2.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/_config.tpl b/charts/grafana/templates/_config.tpl index b866217f2e..8897620063 100644 --- a/charts/grafana/templates/_config.tpl +++ b/charts/grafana/templates/_config.tpl @@ -13,6 +13,8 @@ grafana.ini: | {{- if not (kindIs "map" $elemVal) }} {{- if kindIs "invalid" $elemVal }} {{ $elem }} = + {{- else if kindIs "slice" $elemVal }} + {{ $elem }} = {{ toJson $elemVal }} {{- else if kindIs "string" $elemVal }} {{ $elem }} = {{ tpl $elemVal $ }} {{- else }} @@ -26,6 +28,8 @@ grafana.ini: | {{- range $elem, $elemVal := $value }} {{- if kindIs "invalid" $elemVal }} {{ $elem }} = + {{- else if kindIs "slice" $elemVal }} + {{ $elem }} = {{ toJson $elemVal }} {{- else if kindIs "string" $elemVal }} {{ $elem }} = {{ tpl $elemVal $ }} {{- else }} From dead644bb63c1354c395bb3ecf06c459e58c5392 Mon Sep 17 00:00:00 2001 From: Michael Tweten Date: Tue, 15 Oct 2024 18:09:24 -0500 Subject: [PATCH 4/4] Fixes minor regression in tempo-distributed compactor extraEnv Signed-off-by: Michael Tweten --- charts/tempo-distributed/Chart.yaml | 2 +- charts/tempo-distributed/README.md | 2 +- .../templates/compactor/deployment-compactor.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 6e660caad4..217153bd97 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.18.4 +version: 1.18.5 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 10920f7bc7..d2d50d0374 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.18.4](https://img.shields.io/badge/Version-1.18.4-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.18.5](https://img.shields.io/badge/Version-1.18.5-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 diff --git a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml index 1e5fc8c2da..37f5342204 100644 --- a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml @@ -70,7 +70,7 @@ spec: name: http-metrics - containerPort: {{ include "tempo.memberlistBindPort" . }} name: http-memberlist - {{- if or .Values.global.extraEnv .Values.compactor.env }} + {{- if or .Values.global.extraEnv .Values.compactor.extraEnv }} env: {{- with .Values.global.extraEnv }} {{ toYaml . | nindent 12 }}