diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 5551f1b76b..683f463f3b 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.5.5 +version: 8.5.6 appVersion: 11.2.2 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 }} diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 6e660caad4..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.4 +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 10920f7bc7..d181bae7d5 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.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 @@ -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 | 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 }} 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