diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 83c85151fb..ae62ce6bfb 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: 0.15.2 +version: 0.16.0 appVersion: 1.3.1 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 0db33c205d..d1bf09d436 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 0.15.2](https://img.shields.io/badge/Version-0.15.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.1](https://img.shields.io/badge/AppVersion-1.3.1-informational?style=flat-square) +![Version: 0.16.0](https://img.shields.io/badge/Version-0.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.1](https://img.shields.io/badge/AppVersion-1.3.1-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -78,6 +78,7 @@ The memcached default args are removed and should be provided manually. The sett | compactor.image.tag | string | `nil` | Docker image tag for the compactor image. Overrides `tempo.image.tag` | | compactor.nodeSelector | object | `{}` | Node selector for compactor pods | | compactor.podAnnotations | object | `{}` | Annotations for compactor pods | +| compactor.podLabels | object | `{}` | Labels for compactor pods | | compactor.priorityClassName | string | `nil` | The name of the PriorityClass for compactor pods | | compactor.resources | object | `{}` | Resource requests and limits for the compactor | | compactor.terminationGracePeriodSeconds | int | `30` | Grace period to allow the compactor to shutdown before it is killed | @@ -94,6 +95,7 @@ The memcached default args are removed and should be provided manually. The sett | distributor.image.tag | string | `nil` | Docker image tag for the ingester image. Overrides `tempo.image.tag` | | distributor.nodeSelector | object | `{}` | Node selector for distributor pods | | distributor.podAnnotations | object | `{}` | Annotations for distributor pods | +| distributor.podLabels | object | `{}` | Labels for distributor pods | | distributor.priorityClassName | string | `nil` | The name of the PriorityClass for distributor pods | | distributor.replicas | int | `1` | Number of replicas for the distributor | | distributor.resources | object | `{}` | Resource requests and limits for the distributor | @@ -129,6 +131,7 @@ The memcached default args are removed and should be provided manually. The sett | gateway.nginxConfig.serverSnippet | string | `""` | Allows appending custom configuration to the server block | | gateway.nodeSelector | object | `{}` | Node selector for gateway pods | | gateway.podAnnotations | object | `{}` | Annotations for gateway pods | +| gateway.podLabels | object | `{}` | Labels for gateway pods | | gateway.priorityClassName | string | `nil` | The name of the PriorityClass for gateway pods | | gateway.readinessProbe.httpGet.path | string | `"/"` | | | gateway.readinessProbe.httpGet.port | string | `"http"` | | @@ -165,6 +168,7 @@ The memcached default args are removed and should be provided manually. The sett | ingester.persistence.size | string | `"10Gi"` | Size of persistent disk | | ingester.persistence.storageClass | string | `nil` | Storage class to be used. If defined, storageClassName: . If set to "-", storageClassName: "", which disables dynamic provisioning. If empty or set to null, no storageClassName spec is set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack). | | ingester.podAnnotations | object | `{}` | Annotations for ingester pods | +| ingester.podLabels | object | `{}` | Labels for ingester pods | | ingester.priorityClassName | string | `nil` | The name of the PriorityClass for ingester pods | | ingester.replicas | int | `1` | Number of replicas for the ingester | | ingester.resources | object | `{}` | Resource requests and limits for the ingester | @@ -176,6 +180,7 @@ The memcached default args are removed and should be provided manually. The sett | memcached.extraEnv | list | `[]` | Environment variables to add to memcached pods | | memcached.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to memcached pods | | memcached.host | string | `"memcached"` | | +| memcached.podLabels | object | `{}` | Labels for memcached pods | | memcached.pullPolicy | string | `"IfNotPresent"` | Memcached Docker image pull policy | | memcached.replicas | int | `1` | | | memcached.repository | string | `"memcached"` | Memcached Docker image repository | @@ -200,6 +205,7 @@ The memcached default args are removed and should be provided manually. The sett | querier.image.tag | string | `nil` | Docker image tag for the querier image. Overrides `tempo.image.tag` | | querier.nodeSelector | object | `{}` | Node selector for querier pods | | querier.podAnnotations | object | `{}` | Annotations for querier pods | +| querier.podLabels | object | `{}` | Labels for querier pods | | querier.priorityClassName | string | `nil` | The name of the PriorityClass for querier pods | | querier.replicas | int | `1` | Number of replicas for the querier | | querier.resources | object | `{}` | Resource requests and limits for the querier | @@ -216,6 +222,7 @@ The memcached default args are removed and should be provided manually. The sett | queryFrontend.image.tag | string | `nil` | Docker image tag for the query-frontend image. Overrides `tempo.image.tag` | | queryFrontend.nodeSelector | object | `{}` | Node selector for query-frontend pods | | queryFrontend.podAnnotations | object | `{}` | Annotations for query-frontend pods | +| queryFrontend.podLabels | object | `{}` | Labels for queryFrontend pods | | queryFrontend.priorityClassName | string | `nil` | The name of the PriorityClass for query-frontend pods | | queryFrontend.query.config | string | `"backend: 127.0.0.1:3100\n"` | | | queryFrontend.query.enabled | bool | `true` | Required for grafana version <7.5 for compatibility with jaeger-ui. Doesn't work on ARM arch | @@ -259,6 +266,7 @@ The memcached default args are removed and should be provided manually. The sett | tempo.image.registry | string | `"docker.io"` | The Docker registry | | tempo.image.repository | string | `"grafana/tempo"` | Docker image repository | | tempo.image.tag | string | `nil` | Overrides the image tag whose default is the chart's appVersion | +| tempo.podLabels | object | `{}` | Global labels for all tempo pods | | traces.jaeger.grpc | bool | `false` | Enable Tempo to ingest Jaeger GRPC traces | | traces.jaeger.thriftBinary | bool | `false` | Enable Tempo to ingest Jaeger Thrift Binary traces | | traces.jaeger.thriftCompact | bool | `false` | Enable Tempo to ingest Jaeger Thrift Compact traces | diff --git a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml index 5fa59dedd5..db66ca1e13 100644 --- a/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/deployment-compactor.yaml @@ -25,6 +25,12 @@ spec: labels: {{- include "tempo.compactorLabels" . | nindent 8 }} {{- include "tempo.gossipRing.selectorLabels" . | nindent 8 }} + {{- with .Values.tempo.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.compactor.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configmap-tempo.yaml") . | sha256sum }} {{- with .Values.compactor.podAnnotations }} diff --git a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml index ccad302b01..54f212a5b2 100644 --- a/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/deployment-distributor.yaml @@ -21,6 +21,12 @@ spec: labels: {{- include "tempo.distributorLabels" . | nindent 8 }} {{- include "tempo.gossipRing.selectorLabels" . | nindent 8 }} + {{- with .Values.tempo.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.distributor.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configmap-tempo.yaml") . | sha256sum }} {{- with .Values.distributor.podAnnotations }} diff --git a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml index e518a2b5b1..56f3b088b9 100644 --- a/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml +++ b/charts/tempo-distributed/templates/gateway/deployment-gateway.yaml @@ -21,6 +21,12 @@ spec: {{- end }} labels: {{- include "tempo.gatewaySelectorLabels" . | nindent 8 }} + {{- with .Values.tempo.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.gateway.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} spec: serviceAccountName: {{ include "tempo.serviceAccountName" . }} terminationGracePeriodSeconds: {{ .Values.gateway.terminationGracePeriodSeconds }} diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index 389d0461a8..1cee321085 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -22,6 +22,12 @@ spec: labels: {{- include "tempo.ingesterLabels" . | nindent 8 }} {{- include "tempo.gossipRing.selectorLabels" . | nindent 8 }} + {{- with .Values.tempo.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.ingester.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configmap-tempo.yaml") . | sha256sum }} {{- with .Values.ingester.podAnnotations }} diff --git a/charts/tempo-distributed/templates/memcached/statefulset-memcached.yaml b/charts/tempo-distributed/templates/memcached/statefulset-memcached.yaml index 8076ea8309..9853eff30e 100644 --- a/charts/tempo-distributed/templates/memcached/statefulset-memcached.yaml +++ b/charts/tempo-distributed/templates/memcached/statefulset-memcached.yaml @@ -20,6 +20,12 @@ spec: metadata: labels: {{- include "tempo.memcachedLabels" . | nindent 8 }} + {{- with .Values.tempo.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.memcached.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} spec: serviceAccountName: {{ include "tempo.serviceAccountName" . }} containers: diff --git a/charts/tempo-distributed/templates/querier/deployment-querier.yaml b/charts/tempo-distributed/templates/querier/deployment-querier.yaml index c3231194f9..8bbd0c1c90 100644 --- a/charts/tempo-distributed/templates/querier/deployment-querier.yaml +++ b/charts/tempo-distributed/templates/querier/deployment-querier.yaml @@ -25,6 +25,12 @@ spec: labels: {{- include "tempo.querierLabels" . | nindent 8 }} {{- include "tempo.gossipRing.selectorLabels" . | nindent 8 }} + {{- with .Values.tempo.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.querier.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configmap-tempo.yaml") . | sha256sum }} {{- with .Values.querier.podAnnotations }} 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 33a83b8d15..88638af3c3 100644 --- a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml @@ -25,6 +25,12 @@ spec: labels: {{- include "tempo.queryFrontendLabels" . | nindent 8 }} {{- include "tempo.gossipRing.selectorLabels" . | nindent 8 }} + {{- with .Values.tempo.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.queryFrontend.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configmap-tempo.yaml") . | sha256sum }} {{- with .Values.queryFrontend.podAnnotations }} diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index dbc626c1c8..88f2746588 100644 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -27,6 +27,8 @@ tempo: port: http initialDelaySeconds: 30 timeoutSeconds: 1 + # -- Global labels for all tempo pods + podLabels: {} serviceAccount: # -- Specifies whether a ServiceAccount should be created @@ -52,6 +54,8 @@ ingester: tag: null # -- The name of the PriorityClass for ingester pods priorityClassName: null + # -- Labels for ingester pods + podLabels: {} # -- Annotations for ingester pods podAnnotations: {} # -- Additional CLI args for the ingester @@ -123,6 +127,8 @@ distributor: loadBalancerSourceRanges: [] # -- The name of the PriorityClass for distributor pods priorityClassName: null + # -- Labels for distributor pods + podLabels: {} # -- Annotations for distributor pods podAnnotations: {} # -- Additional CLI args for the distributor @@ -170,6 +176,8 @@ compactor: tag: null # -- The name of the PriorityClass for compactor pods priorityClassName: null + # -- Labels for compactor pods + podLabels: {} # -- Annotations for compactor pods podAnnotations: {} # -- Additional CLI args for the compactor @@ -208,6 +216,8 @@ querier: tag: null # -- The name of the PriorityClass for querier pods priorityClassName: null + # -- Labels for querier pods + podLabels: {} # -- Annotations for querier pods podAnnotations: {} # -- Additional CLI args for the querier @@ -291,6 +301,8 @@ queryFrontend: type: ClusterIP # -- The name of the PriorityClass for query-frontend pods priorityClassName: null + # -- Labels for queryFrontend pods + podLabels: {} # -- Annotations for query-frontend pods podAnnotations: {} # -- Additional CLI args for the query-frontend @@ -521,6 +533,8 @@ memcached: extraEnv: [] # -- Environment variables from secrets or configmaps to add to memcached pods extraEnvFrom: [] + # -- Labels for memcached pods + podLabels: {} # -- Resource requests and limits for memcached resources: {} # -- Affinity for memcached pods. Passed through `tpl` and, thus, to be configured as string @@ -594,6 +608,8 @@ gateway: pullPolicy: IfNotPresent # -- The name of the PriorityClass for gateway pods priorityClassName: null + # -- Labels for gateway pods + podLabels: {} # -- Annotations for gateway pods podAnnotations: {} # -- Additional CLI args for the gateway