diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 6cd99b29a2..211db9d325 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -875,6 +875,7 @@ The memcached default args are removed and should be provided manually. The sett | tempo.readinessProbe.httpGet.port | string | `"http-metrics"` | | | tempo.readinessProbe.initialDelaySeconds | int | `30` | | | tempo.readinessProbe.timeoutSeconds | int | `1` | | +| tempo.revisionHistoryLimit | int | `10` | The number of old ReplicaSets to retain to allow rollback | | tempo.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsGroup":1000,"runAsNonRoot":true,"runAsUser":1000}` | SecurityContext holds container-level security attributes and common container settings | | tempo.service.ipFamilies | list | `["IPv4"]` | Configure the IP families for all tempo services See the Service spec for details: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#servicespec-v1-core | | tempo.service.ipFamilyPolicy | string | `"SingleStack"` | Configure the IP family policy for all tempo services. SingleStack, PreferDualStack or RequireDualStack | diff --git a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml index bbc1da74c6..65439a0a67 100644 --- a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml @@ -13,7 +13,7 @@ metadata: spec: minReadySeconds: 10 replicas: {{ .Values.compactor.replicas }} - revisionHistoryLimit: 10 + revisionHistoryLimit: {{ .Values.tempo.revisionHistoryLimit }} selector: matchLabels: {{- include "tempo.selectorLabels" $dict | nindent 6 }} diff --git a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml index c7495b3832..57fab9fcfc 100644 --- a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml @@ -15,7 +15,7 @@ spec: {{- if not .Values.distributor.autoscaling.enabled }} replicas: {{ .Values.distributor.replicas }} {{- end }} - revisionHistoryLimit: 10 + revisionHistoryLimit: {{ .Values.tempo.revisionHistoryLimit }} selector: matchLabels: {{- include "tempo.selectorLabels" $dict | nindent 6 }} diff --git a/charts/tempo-distributed/templates/enterprise-federation-frontend/deployment-federation-frontend.yaml b/charts/tempo-distributed/templates/enterprise-federation-frontend/deployment-federation-frontend.yaml index 20f2d8fa44..59a1b142fe 100644 --- a/charts/tempo-distributed/templates/enterprise-federation-frontend/deployment-federation-frontend.yaml +++ b/charts/tempo-distributed/templates/enterprise-federation-frontend/deployment-federation-frontend.yaml @@ -16,7 +16,7 @@ spec: {{- if not .Values.enterpriseFederationFrontend.autoscaling.enabled }} replicas: {{ .Values.enterpriseFederationFrontend.replicas }} {{- end }} - revisionHistoryLimit: 10 + revisionHistoryLimit: {{ .Values.tempo.revisionHistoryLimit }} selector: matchLabels: {{- include "tempo.selectorLabels" $dict | nindent 6 }} diff --git a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml index ea6cd5dd34..5918143341 100644 --- a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml +++ b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml @@ -12,7 +12,7 @@ spec: {{- if not .Values.gateway.autoscaling.enabled }} replicas: {{ .Values.gateway.replicas }} {{- end }} - revisionHistoryLimit: 10 + revisionHistoryLimit: {{ .Values.tempo.revisionHistoryLimit }} selector: matchLabels: {{- include "tempo.selectorLabels" $dict | nindent 6 }} diff --git a/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml index 55c7094ea1..b28d914be6 100644 --- a/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/deployment-metrics-generator.yaml @@ -14,7 +14,7 @@ metadata: spec: minReadySeconds: 10 replicas: {{ .Values.metricsGenerator.replicas }} - revisionHistoryLimit: 10 + revisionHistoryLimit: {{ .Values.tempo.revisionHistoryLimit }} selector: matchLabels: {{- include "tempo.selectorLabels" $dict | nindent 6 }} diff --git a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml index 573e3e5eee..36c176edc8 100644 --- a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml @@ -16,7 +16,7 @@ metadata: spec: minReadySeconds: 10 replicas: {{ .Values.metricsGenerator.replicas }} - revisionHistoryLimit: 10 + revisionHistoryLimit: {{ .Values.tempo.revisionHistoryLimit }} podManagementPolicy: Parallel updateStrategy: rollingUpdate: diff --git a/charts/tempo-distributed/templates/querier/deployment-querier.yaml b/charts/tempo-distributed/templates/querier/deployment-querier.yaml index 8412589860..1431b7fd2c 100644 --- a/charts/tempo-distributed/templates/querier/deployment-querier.yaml +++ b/charts/tempo-distributed/templates/querier/deployment-querier.yaml @@ -15,7 +15,7 @@ spec: {{- if not .Values.querier.autoscaling.enabled }} replicas: {{ .Values.querier.replicas }} {{- end }} - revisionHistoryLimit: 10 + revisionHistoryLimit: {{ .Values.tempo.revisionHistoryLimit }} selector: matchLabels: {{- include "tempo.selectorLabels" $dict | nindent 6 }} diff --git a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml index 01f05b21cf..d360e58bfc 100644 --- a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml @@ -15,7 +15,7 @@ spec: {{- if not .Values.queryFrontend.autoscaling.enabled }} replicas: {{ .Values.queryFrontend.replicas }} {{- end }} - revisionHistoryLimit: 10 + revisionHistoryLimit: {{ .Values.tempo.revisionHistoryLimit }} selector: matchLabels: {{- include "tempo.selectorLabels" $dict | nindent 6 }} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index 80f486d61a..12d12cd996 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -68,6 +68,8 @@ tempo: podLabels: {} # -- Common annotations for all pods podAnnotations: {} + # -- The number of old ReplicaSets to retain to allow rollback + revisionHistoryLimit: 10 # -- SecurityContext holds container-level security attributes and common container settings securityContext: runAsNonRoot: true