diff --git a/charts/grafana/README.md b/charts/grafana/README.md index 2c9609e122..4ab1a01c38 100644 --- a/charts/grafana/README.md +++ b/charts/grafana/README.md @@ -165,7 +165,7 @@ need to instead set `global.imageRegistry`. | `lifecycleHooks` | Lifecycle hooks for podStart and preStop [Example](https://kubernetes.io/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/#define-poststart-and-prestop-handlers) | `{}` | | `sidecar.image.registry` | Sidecar image registry | `quay.io` | | `sidecar.image.repository` | Sidecar image repository | `kiwigrid/k8s-sidecar` | -| `sidecar.image.tag` | Sidecar image tag | `1.26.0` | +| `sidecar.image.tag` | Sidecar image tag | `1.28.0` | | `sidecar.image.sha` | Sidecar image sha (optional) | `""` | | `sidecar.imagePullPolicy` | Sidecar image pull policy | `IfNotPresent` | | `sidecar.resources` | Sidecar resources | `{}` | diff --git a/charts/grafana/templates/deployment.yaml b/charts/grafana/templates/deployment.yaml index 46c016faa3..d309a7e5ff 100644 --- a/charts/grafana/templates/deployment.yaml +++ b/charts/grafana/templates/deployment.yaml @@ -14,7 +14,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and (not .Values.autoscaling.enabled) (.Values.replicas) }} + {{- if (not .Values.autoscaling.enabled) }} replicas: {{ .Values.replicas }} {{- end }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 51e94e01ff..1d05a6fc19 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -861,7 +861,7 @@ sidecar: # -- The Docker registry registry: quay.io repository: kiwigrid/k8s-sidecar - tag: 1.27.4 + tag: 1.28.0 sha: "" imagePullPolicy: IfNotPresent resources: {} diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 63250f02c2..6e660caad4 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.18.2 +version: 1.18.4 appVersion: 2.6.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 eb6cb3b692..10920f7bc7 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.18.2](https://img.shields.io/badge/Version-1.18.2-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.18.4](https://img.shields.io/badge/Version-1.18.4-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 diff --git a/charts/tempo-distributed/templates/compactor/service-compactor.yaml b/charts/tempo-distributed/templates/compactor/service-compactor.yaml index d280df9322..dcbacc273b 100644 --- a/charts/tempo-distributed/templates/compactor/service-compactor.yaml +++ b/charts/tempo-distributed/templates/compactor/service-compactor.yaml @@ -6,7 +6,7 @@ metadata: {{- include "tempo.labels" (dict "ctx" . "component" "compactor") | nindent 4 }} {{- with .Values.compactor.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml b/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml index d15797cac2..a226788b55 100644 --- a/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml +++ b/charts/tempo-distributed/templates/distributor/service-distributor-discovery.yaml @@ -12,7 +12,7 @@ metadata: prometheus.io/service-monitor: "false" {{- with .Values.distributor.serviceDiscovery.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/distributor/service-distributor.yaml b/charts/tempo-distributed/templates/distributor/service-distributor.yaml index efd7574110..a7174f2a00 100644 --- a/charts/tempo-distributed/templates/distributor/service-distributor.yaml +++ b/charts/tempo-distributed/templates/distributor/service-distributor.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} {{- with .Values.distributor.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: {{ .Values.distributor.service.type }} diff --git a/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml b/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml index 8eb08042d9..8d1db22ce1 100644 --- a/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml +++ b/charts/tempo-distributed/templates/enterprise-federation-frontend/service-federation-frontend.yaml @@ -8,7 +8,7 @@ metadata: {{- include "tempo.labels" (dict "ctx" . "component" "enterprise-federation-frontend") | nindent 4 }} {{- with .Values.enterpriseFederationFrontend.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: {{ .Values.enterpriseFederationFrontend.service.type }} diff --git a/charts/tempo-distributed/templates/gateway/service-gateway.yaml b/charts/tempo-distributed/templates/gateway/service-gateway.yaml index 6270cf7578..97efb6fd19 100644 --- a/charts/tempo-distributed/templates/gateway/service-gateway.yaml +++ b/charts/tempo-distributed/templates/gateway/service-gateway.yaml @@ -11,7 +11,7 @@ metadata: {{- end }} {{- with .Values.gateway.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: {{ .Values.gateway.service.type }} diff --git a/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml b/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml index 6c26ccf23a..2835cd866e 100644 --- a/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml +++ b/charts/tempo-distributed/templates/ingester/service-ingester-discovery.yaml @@ -9,7 +9,7 @@ metadata: prometheus.io/service-monitor: "false" {{- with .Values.ingester.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/ingester/service-ingester.yaml b/charts/tempo-distributed/templates/ingester/service-ingester.yaml index 61e2fa7ab5..988c891028 100644 --- a/charts/tempo-distributed/templates/ingester/service-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/service-ingester.yaml @@ -8,7 +8,7 @@ metadata: {{- include "tempo.labels" $dict | nindent 4 }} {{- with .Values.ingester.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: ports: diff --git a/charts/tempo-distributed/templates/memcached/service-memcached.yaml b/charts/tempo-distributed/templates/memcached/service-memcached.yaml index 21e1455f02..64806afc63 100644 --- a/charts/tempo-distributed/templates/memcached/service-memcached.yaml +++ b/charts/tempo-distributed/templates/memcached/service-memcached.yaml @@ -8,7 +8,7 @@ metadata: {{- include "tempo.labels" (dict "ctx" . "component" "memcached") | nindent 4 }} {{- with .Values.memcached.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: ports: diff --git a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator-discovery.yaml b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator-discovery.yaml index 48eb8468ba..8fb96f85cb 100644 --- a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator-discovery.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator-discovery.yaml @@ -10,7 +10,7 @@ metadata: prometheus.io/service-monitor: "false" {{- with .Values.metricsGenerator.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml index c2550fd96f..f0ca27a68e 100644 --- a/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/service-metrics-generator.yaml @@ -9,7 +9,7 @@ metadata: {{- include "tempo.labels" $dict | nindent 4 }} {{- with .Values.metricsGenerator.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: ports: 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 5f1737ddc7..f057fba246 100644 --- a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml +++ b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml @@ -73,9 +73,14 @@ spec: - name: {{ .name | quote }} containerPort: {{ .port }} {{- end }} - {{- with .Values.metricsGenerator.extraEnv }} + {{- if or .Values.global.extraEnv .Values.metricsGenerator.extraEnv }} env: - {{- toYaml . | nindent 12 }} + {{- with .Values.global.extraEnv }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.metricsGenerator.extraEnv }} + {{- toYaml . | nindent 12 }} + {{- end }} {{- end }} {{- with .Values.metricsGenerator.extraEnvFrom }} envFrom: diff --git a/charts/tempo-distributed/templates/querier/service-querier.yaml b/charts/tempo-distributed/templates/querier/service-querier.yaml index cea6816c03..b13348b0f8 100644 --- a/charts/tempo-distributed/templates/querier/service-querier.yaml +++ b/charts/tempo-distributed/templates/querier/service-querier.yaml @@ -7,7 +7,7 @@ metadata: {{- include "tempo.labels" (dict "ctx" . "component" "querier") | nindent 4 }} {{- with .Values.querier.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: ports: diff --git a/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml b/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml index ba91e8f8a4..48d2c28f4c 100644 --- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml +++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend-discovery.yaml @@ -10,7 +10,7 @@ metadata: {{- end }} {{- with .Values.queryFrontend.serviceDiscovery.annotations }} annotations: - {{ toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: ClusterIP diff --git a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml index 153ca95b41..d737e7e52c 100644 --- a/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/service-query-frontend.yaml @@ -10,7 +10,7 @@ metadata: {{- end }} {{- with .Values.queryFrontend.service.annotations }} annotations: - {{- toYaml . | nindent 4 }} + {{- tpl (toYaml . | nindent 4) $ }} {{- end }} spec: type: {{ .Values.queryFrontend.service.type }}