diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 7e827fa690..22dc746874 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.52.9 +version: 1.52.10 appVersion: 2.9.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 d36e017751..5aa32d727d 100644 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.52.9](https://img.shields.io/badge/Version-1.52.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square) +![Version: 1.52.10](https://img.shields.io/badge/Version-1.52.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -568,6 +568,7 @@ The memcached default args are removed and should be provided manually. The sett | gateway.topologySpreadConstraints | string | Defaults to allow skew no more than 1 node per AZ | topologySpread for gateway pods. Passed through `tpl` and, thus, to be configured as string | | gateway.verboseLogging | bool | `true` | Enable logging of 2xx and 3xx HTTP requests | | global.clusterDomain | string | `"cluster.local"` | configures cluster domain ("cluster.local" by default) | +| global.commonLabels | object | `{}` | Adding common labels to all K8S resources including pods | | global.dnsNamespace | string | `"kube-system"` | configures DNS service namespace | | global.dnsService | string | `"kube-dns"` | configures DNS service name | | global.extraArgs | list | `[]` | Common args to add to all pods directly managed by this chart. scope: admin-api, compactor, distributor, enterprise-federation-frontend, gateway, ingester, memcached, metrics-generator, querier, query-frontend, tokengen | @@ -575,6 +576,8 @@ The memcached default args are removed and should be provided manually. The sett | global.extraEnvFrom | list | `[]` | Common environment variables which come from a ConfigMap or Secret to add to all pods directly managed by this chart. scope: admin-api, compactor, distributor, enterprise-federation-frontend, gateway, ingester, memcached, metrics-generator, querier, query-frontend, tokengen | | global.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets for all images, excluding enterprise. Names of existing secrets with private container registry credentials. Ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod Example: pullSecrets: [ my-dockerconfigjson-secret ] | | global.image.registry | string | `"docker.io"` | Overrides the Docker registry globally for all images, excluding enterprise. | +| global.labels | object | `{}` | Adding labels to K8S resources (excluding pods) | +| global.podLabels | object | `{}` | Adding labels to all pods | | global.priorityClassName | string | `nil` | Overrides the priorityClassName for all pods | | global.storageClass | string | `nil` | Global storage class to be used for persisted components | | ingester.affinity | string | Soft node and soft zone anti-affinity | Affinity for ingester pods. Passed through `tpl` and, thus, to be configured as string | diff --git a/charts/tempo-distributed/templates/_helpers.tpl b/charts/tempo-distributed/templates/_helpers.tpl index 71e3dbe0e1..0fdf75ef5f 100644 --- a/charts/tempo-distributed/templates/_helpers.tpl +++ b/charts/tempo-distributed/templates/_helpers.tpl @@ -90,6 +90,12 @@ app.kubernetes.io/part-of: memberlist app.kubernetes.io/version: {{ .ctx.Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .ctx.Release.Service }} +{{- if .ctx.Values.global.commonLabels }} +{{- toYaml .ctx.Values.global.commonLabels | indent 0 }} +{{- end }} +{{- if .ctx.Values.global.labels }} +{{- toYaml .ctx.Values.global.labels | indent 0 }} +{{- end }} {{- end -}} {{/* @@ -267,6 +273,12 @@ app.kubernetes.io/component: {{ .component }} {{- if .memberlist }} app.kubernetes.io/part-of: memberlist {{- end -}} +{{- if .ctx.Values.global.commonLabels }} +{{- toYaml .ctx.Values.global.commonLabels | indent 0 }} +{{- end }} +{{- if .ctx.Values.global.podLabels }} +{{- toYaml .ctx.Values.global.podLabels | indent 0 }} +{{- end }} {{- end -}} {{/* diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml index f94eea0149..1a58c98246 100755 --- a/charts/tempo-distributed/values.yaml +++ b/charts/tempo-distributed/values.yaml @@ -8,6 +8,12 @@ global: # Example: # pullSecrets: [ my-dockerconfigjson-secret ] pullSecrets: [] + # -- Adding common labels to all K8S resources including pods + commonLabels: {} + # -- Adding labels to K8S resources (excluding pods) + labels: {} + # -- Adding labels to all pods + podLabels: {} # -- Overrides the priorityClassName for all pods priorityClassName: null # -- configures cluster domain ("cluster.local" by default)