Skip to content

Commit 04b3b0b

Browse files
authored
[tempo-distributed] add missing revisionHistoryLimit (#3845)
1 parent f4ea903 commit 04b3b0b

File tree

13 files changed

+31
-14
lines changed

13 files changed

+31
-14
lines changed

charts/tempo-distributed/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: tempo-distributed
33
description: Grafana Tempo in MicroService mode
44
type: application
5-
version: 1.47.3
5+
version: 1.47.4
66
appVersion: 2.8.2
77
engine: gotpl
88
home: https://grafana.com/docs/tempo/latest/

charts/tempo-distributed/README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tempo-distributed
22

3-
![Version: 1.47.3](https://img.shields.io/badge/Version-1.47.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square)
3+
![Version: 1.47.4](https://img.shields.io/badge/Version-1.47.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square)
44

55
Grafana Tempo in MicroService mode
66

@@ -305,6 +305,7 @@ The memcached default args are removed and should be provided manually. The sett
305305
| cache.caches[0].roles[1] | string | `"bloom"` | |
306306
| cache.caches[0].roles[2] | string | `"frontend-search"` | |
307307
| compactor.affinity | string | Hard node and soft zone anti-affinity | Affinity for compactor pods. Passed through `tpl` and, thus, to be configured as string |
308+
| compactor.annotations | object | `{}` | Annotations for compactor deployment |
308309
| compactor.autoscaling | object | `{"enabled":false,"hpa":{"behavior":{},"enabled":false,"targetCPUUtilizationPercentage":100,"targetMemoryUtilizationPercentage":null},"keda":{"enabled":false,"triggers":[]},"maxReplicas":3,"minReplicas":1}` | Autoscaling configurations |
309310
| compactor.autoscaling.enabled | bool | `false` | Enable autoscaling for the compactor |
310311
| compactor.autoscaling.hpa | object | `{"behavior":{},"enabled":false,"targetCPUUtilizationPercentage":100,"targetMemoryUtilizationPercentage":null}` | Autoscaling via HPA object |
@@ -355,6 +356,7 @@ The memcached default args are removed and should be provided manually. The sett
355356
| config | string | See values.yaml | Config file contents for Tempo distributed. Passed through the `tpl` function to allow templating |
356357
| configStorageType | string | `"ConfigMap"` | Defines what kind of object stores the configuration, a ConfigMap or a Secret. In order to move sensitive information (such as credentials) from the ConfigMap/Secret to a more secure location (e.g. vault), it is possible to use [environment variables in the configuration](https://grafana.com/docs/mimir/latest/operators-guide/configuring/reference-configuration-parameters/#use-environment-variables-in-the-configuration). Such environment variables can be then stored in a separate Secret and injected via the global.extraEnvFrom value. For details about environment injection from a Secret please see [Secrets](https://kubernetes.io/docs/concepts/configuration/secret/#use-case-as-container-environment-variables). |
357358
| distributor.affinity | string | Hard node and soft zone anti-affinity | Affinity for distributor pods. Passed through `tpl` and, thus, to be configured as string |
359+
| distributor.annotations | object | `{}` | Annotations for distributor deployment |
358360
| distributor.appProtocol | object | `{"grpc":null}` | Adds the appProtocol field to the distributor service. This allows distributor to work with istio protocol selection. |
359361
| distributor.appProtocol.grpc | string | `nil` | Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" |
360362
| distributor.autoscaling.behavior | object | `{}` | Autoscaling behavior configuration for the distributor |
@@ -412,6 +414,7 @@ The memcached default args are removed and should be provided manually. The sett
412414
| enterprise.image.repository | string | `"grafana/enterprise-traces"` | Grafana Enterprise Traces container image repository. Note: for Grafana Tempo use the value 'image.repository' |
413415
| enterprise.image.tag | string | `"v2.8.1"` | Grafana Enterprise Traces container image tag. Note: for Grafana Tempo use the value 'image.tag' |
414416
| enterpriseFederationFrontend.affinity | string | Hard node and soft zone anti-affinity | Affinity for federation-frontend pods. Passed through `tpl` and, thus, to be configured as string |
417+
| enterpriseFederationFrontend.annotations | object | `{}` | Annotations for the federation-frontend Deployment |
415418
| enterpriseFederationFrontend.autoscaling.enabled | bool | `false` | Enable autoscaling for the federation-frontend |
416419
| enterpriseFederationFrontend.autoscaling.maxReplicas | int | `3` | Maximum autoscaling replicas for the federation-frontend |
417420
| enterpriseFederationFrontend.autoscaling.minReplicas | int | `1` | Minimum autoscaling replicas for the federation-frontend |
@@ -811,6 +814,7 @@ The memcached default args are removed and should be provided manually. The sett
811814
| provisioner.securityContext | object | `{"runAsGroup":10001,"runAsNonRoot":true,"runAsUser":10001}` | Run containers as nonroot user (uid=10001)` |
812815
| provisioner.tolerations | list | `[]` | Tolerations for tokengen Pods |
813816
| querier.affinity | string | Hard node and soft zone anti-affinity | Affinity for querier pods. Passed through `tpl` and, thus, to be configured as string |
817+
| querier.annotations | object | `{}` | Annotations for querier deployment |
814818
| querier.appProtocol | object | `{"grpc":null}` | Adds the appProtocol field to the querier service. This allows querier to work with istio protocol selection. |
815819
| querier.appProtocol.grpc | string | `nil` | Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" |
816820
| querier.autoscaling.behavior | object | `{}` | Autoscaling behavior configuration for the querier |
@@ -849,6 +853,7 @@ The memcached default args are removed and should be provided manually. The sett
849853
| querier.tolerations | list | `[]` | Tolerations for querier pods |
850854
| querier.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for querier pods. Passed through `tpl` and, thus, to be configured as string |
851855
| queryFrontend.affinity | string | Hard node and soft zone anti-affinity | Affinity for query-frontend pods. Passed through `tpl` and, thus, to be configured as string |
856+
| queryFrontend.annotations | object | `{}` | Annotations for the query-frontend Deployment |
852857
| queryFrontend.appProtocol | object | `{"grpc":null}` | Adds the appProtocol field to the queryFrontend service. This allows queryFrontend to work with istio protocol selection. |
853858
| queryFrontend.appProtocol.grpc | string | `nil` | Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" |
854859
| queryFrontend.autoscaling.behavior | object | `{}` | Autoscaling behavior configuration for the query-frontend |

charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ metadata:
1111
namespace: {{ .Release.Namespace | quote }}
1212
spec:
1313
replicas: {{ .Values.adminApi.replicas }}
14+
revisionHistoryLimit: {{ .Values.tempo.revisionHistoryLimit }}
1415
selector:
1516
matchLabels:
1617
{{- include "tempo.selectorLabels" $dict | nindent 6 }}

charts/tempo-distributed/templates/compactor/service-compactor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
ports:
1515
- name: http-metrics
1616
port: 3200
17-
targetPort: 3200
17+
targetPort: http-metrics
1818
protocol: TCP
1919
selector:
2020
{{- include "tempo.selectorLabels" (dict "ctx" . "component" "compactor") | nindent 4 }}

charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
ports:
1616
- name: http-metrics
1717
port: 3200
18-
targetPort: 3200
18+
targetPort: http-metrics
1919
{{- if .Values.enterpriseFederationFrontend.service.loadBalancerIP }}
2020
loadBalancerIP: {{ .Values.enterpriseFederationFrontend.service.loadBalancerIP }}
2121
{{- end }}

charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ metadata:
1111
namespace: {{ .Release.Namespace | quote }}
1212
spec:
1313
replicas: {{ .Values.enterpriseGateway.replicas }}
14+
revisionHistoryLimit: {{ .Values.tempo.revisionHistoryLimit }}
1415
selector:
1516
matchLabels:
1617
{{- include "tempo.selectorLabels" $dict | nindent 6 }}

charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ spec:
1818
- name: http-metrics
1919
port: 3200
2020
protocol: TCP
21-
targetPort: 3200
21+
targetPort: http-metrics
2222
- name: grpc
2323
port: 9095
2424
protocol: TCP
25-
targetPort: 9095
25+
targetPort: grpc
2626
{{- if .Values.ingester.appProtocol.grpc }}
2727
appProtocol: {{ .Values.ingester.appProtocol.grpc }}
2828
{{- end }}

charts/tempo-distributed/templates/ingester/service-ingester.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ spec:
2323
- name: http-metrics
2424
port: 3200
2525
protocol: TCP
26-
targetPort: 3200
26+
targetPort: http-metrics
2727
- name: grpc
2828
port: 9095
2929
protocol: TCP
30-
targetPort: 9095
30+
targetPort: grpc
3131
{{- if .Values.ingester.appProtocol.grpc }}
3232
appProtocol: {{ .Values.ingester.appProtocol.grpc }}
3333
{{- end }}

charts/tempo-distributed/templates/memcached/service-memcached.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
ports:
1717
- name: memcached-client
1818
port: 11211
19-
targetPort: 11211
19+
targetPort: client
2020
- name: http-metrics
2121
port: 9150
2222
targetPort: http-metrics

charts/tempo-distributed/templates/querier/service-querier.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
- name: http-metrics
1717
port: 3200
1818
protocol: TCP
19-
targetPort: 3200
19+
targetPort: http-metrics
2020
- name: grpc
2121
port: 9095
2222
protocol: TCP

0 commit comments

Comments
 (0)