Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[tempo-distributed] Add support for tolerations in memcached #3344

Merged
merged 8 commits into from
Oct 16, 2024
Merged

[tempo-distributed] Add support for tolerations in memcached #3344

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2fb8ac1
Add support for tolerations in memcached
Sheikh-Abubaker Oct 4, 2024
a482fd6
Update README.md
Sheikh-Abubaker Oct 4, 2024
ac4cd30
Merge branch 'main' into toleration-pr
zanhsieh Oct 14, 2024
5ac3705
Resolve Conflicts
Sheikh-Abubaker Oct 14, 2024
fefacbe
Merge branch 'toleration-pr' of https://github.com/Sheikh-Abubaker/he…
Sheikh-Abubaker Oct 14, 2024
32fd44a
Merge branch 'main' into toleration-pr
zanhsieh Oct 14, 2024
43ec73f
Resolve Conflicts
Sheikh-Abubaker Oct 16, 2024
19e62a7
Merge branch 'toleration-pr' of https://github.com/Sheikh-Abubaker/he…
Sheikh-Abubaker Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/tempo-distributed/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: tempo-distributed
description: Grafana Tempo in MicroService mode
type: application
version: 1.18.3
version: 1.19.0
appVersion: 2.6.0
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
3 changes: 2 additions & 1 deletion charts/tempo-distributed/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tempo-distributed

![Version: 1.18.3](https://img.shields.io/badge/Version-1.18.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)
![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

Expand Down Expand Up @@ -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 |
Expand Down
2 changes: 2 additions & 0 deletions charts/tempo-distributed/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading