[grafana/tempo] support new deployment mode: scaling-monolithic

add query config for scaling monolithic like query frontend add toggle for deployment mode bump chart version Signed-off-by: Zhang, Xin <[email protected]> Signed-off-by: Zhang Xin <[email protected]>
bitnami · Dec 13, 2024 · ce0e7fe · ce0e7fe
1 parent 53a4725
commit ce0e7fe
Show file tree

Hide file tree

Showing 45 changed files with 1,532 additions and 4 deletions.
diff --git a/.vib/grafana-tempo/runtime-parameters.yaml b/.vib/grafana-tempo/runtime-parameters.yaml
@@ -1,4 +1,5 @@
 tempo:
+  deploymentMode: "microservices"
   dataDir: /bitnami/grafana-tempo/data
   traces:
     otlp:

diff --git a/bitnami/grafana-tempo/Chart.yaml b/bitnami/grafana-tempo/Chart.yaml
@@ -39,4 +39,4 @@ maintainers:
 name: grafana-tempo
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/grafana-tempo
-version: 3.8.0
+version: 3.9.0
diff --git a/bitnami/grafana-tempo/README.md b/bitnami/grafana-tempo/README.md
diff --git a/bitnami/grafana-tempo/templates/NOTES.txt b/bitnami/grafana-tempo/templates/NOTES.txt
@@ -28,17 +28,22 @@ In order to replicate the container startup execute this command:
 
 Installed components:
 
+  {{- if eq .Values.tempo.deploymentMode "microservices" }}
   * ingester
   * distributor
   * querier
   * query-frontend
   * compactor
+  {{- else if eq .Values.tempo.deploymentMode "scalingMonolithic" }}
+  * scaling-monolithic
+  {{- end }}
   {{- if .Values.vulture.enabled }}
   * vulture
   {{- end }}
 
 1. Get the query-frontend URL by running these commands:
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if contains "NodePort" .Values.queryFrontend.service.type }}
     export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "grafana-tempo.query-frontend.fullname" . }})
     export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
@@ -52,10 +57,26 @@ Installed components:
     echo "The Query Frontend is available at http://127.0.0.1:{{ .Values.queryFrontend.service.ports.http }}"
     kubectl port-forward svc/{{ template "grafana-tempo.query-frontend.fullname" . }} {{ .Values.queryFrontend.service.ports.http }}:{{ .Values.queryFrontend.service.ports.http }} &
 {{- end }}
+{{- else if eq .Values.tempo.deploymentMode "scalingMonolithic" }}
+{{- if contains "NodePort" .Values.scalingMonolithic.service.type }}
+    export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "grafana-tempo.scaling-monolithic.fullname" . }})
+    export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+    echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.scalingMonolithic.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ template "common.names.fullname" . }}
+    export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.names.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+    echo http://$SERVICE_IP:{{ .Values.scalingMonolithic.service.ports.http }}
+{{- else if contains "ClusterIP" .Values.scalingMonolithic.service.type }}
+    echo "The Query Frontend is available at http://127.0.0.1:{{ .Values.scalingMonolithic.service.ports.http }}"
+    kubectl port-forward svc/{{ template "grafana-tempo.scaling-monolithic.fullname" . }} {{ .Values.scalingMonolithic.service.ports.http }}:{{ .Values.scalingMonolithic.service.ports.http }} &
+{{- end }}
+{{- end }}
+
 {{- end }}
 
 {{- include "grafana-tempo.checkRollingTags" . }}
 {{- include "grafana-tempo.validateValues" . }}
-{{- include "common.warnings.resources" (dict "sections" (list "compactor" "distributor" "ingester" "metricsGenerator" "querier" "queryFrontend.query" "queryFrontend" "volumePermissions" "vulture") "context" $) }}
-{{- include "common.warnings.modifiedImages" (dict "images" (list .Values.tempo.image .Values.queryFrontend.query.image .Values.vulture.image .Values.volumePermissions.image) "context" $) }}
-{{- include "common.errors.insecureImages" (dict "images" (list .Values.tempo.image .Values.queryFrontend.query.image .Values.vulture.image .Values.volumePermissions.image) "context" $) }}
+{{- include "common.warnings.resources" (dict "sections" (list "compactor" "distributor" "ingester" "metricsGenerator" "querier" "queryFrontend.query" "queryFrontend" "scalingMonolithic.query" "scalingMonolithic" "volumePermissions" "vulture") "context" $) }}
+{{- include "common.warnings.modifiedImages" (dict "images" (list .Values.tempo.image .Values.queryFrontend.query.image .Values.scalingMonolithic.query.image  .Values.vulture.image .Values.volumePermissions.image) "context" $) }}
+{{- include "common.errors.insecureImages" (dict "images" (list .Values.tempo.image .Values.queryFrontend.query.image .Values.scalingMonolithic.query.image  .Values.vulture.image .Values.volumePermissions.image) "context" $) }}
diff --git a/bitnami/grafana-tempo/templates/_helpers.tpl b/bitnami/grafana-tempo/templates/_helpers.tpl
@@ -52,6 +52,13 @@ Return the proper Grafana Tempo query-frontend fullname
 {{- printf "%s-%s" (include "common.names.fullname" .) "query-frontend" -}}
 {{- end -}}
 
+{{/*
+Return the proper Grafana Tempo scaling-monolithic fullname
+*/}}
+{{- define "grafana-tempo.scaling-monolithic.fullname" -}}
+{{- printf "%s-%s" (include "common.names.fullname" .) "scaling-monolithic" -}}
+{{- end -}}
+
 {{/*
 Return the proper Grafana Tempo vulture fullname
 */}}

diff --git a/bitnami/grafana-tempo/templates/compactor/deployment.yaml b/bitnami/grafana-tempo/templates/compactor/deployment.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if .Values.compactor.enabled }}
 apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
@@ -177,3 +178,4 @@ spec:
         {{- include "common.tplvalues.render" (dict "value" .Values.compactor.extraVolumes "context" $) | nindent 8 }}
         {{- end }}
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/compactor/networkpolicy.yaml b/bitnami/grafana-tempo/templates/compactor/networkpolicy.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if and .Values.compactor.enabled .Values.compactor.networkPolicy.enabled }}
 kind: NetworkPolicy
 apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
@@ -122,3 +123,4 @@ spec:
     {{- include "common.tplvalues.render" ( dict "value" .Values.compactor.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/compactor/pdb.yaml b/bitnami/grafana-tempo/templates/compactor/pdb.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if and .Values.compactor.enabled .Values.compactor.pdb.create }}
 apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
@@ -26,3 +27,4 @@ spec:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/component: compactor
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/compactor/service.yaml b/bitnami/grafana-tempo/templates/compactor/service.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if .Values.compactor.enabled }}
 apiVersion: v1
 kind: Service
@@ -61,3 +62,4 @@ spec:
   selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/component: compactor
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/compactor/servicemonitor.yaml b/bitnami/grafana-tempo/templates/compactor/servicemonitor.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if and .Values.compactor.enabled .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -46,3 +47,4 @@ spec:
     matchNames:
       - {{ .Release.Namespace }}
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/distributor/deployment.yaml b/bitnami/grafana-tempo/templates/distributor/deployment.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
@@ -214,3 +215,4 @@ spec:
         {{- if .Values.distributor.extraVolumes }}
         {{- include "common.tplvalues.render" (dict "value" .Values.distributor.extraVolumes "context" $) | nindent 8 }}
         {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/distributor/networkpolicy.yaml b/bitnami/grafana-tempo/templates/distributor/networkpolicy.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if .Values.distributor.networkPolicy.enabled }}
 kind: NetworkPolicy
 apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
@@ -149,3 +150,4 @@ spec:
     {{- include "common.tplvalues.render" ( dict "value" .Values.distributor.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/distributor/pdb.yaml b/bitnami/grafana-tempo/templates/distributor/pdb.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if and .Values.distributor.pdb.create .Values.distributor.pdb.create }}
 apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
@@ -26,3 +27,4 @@ spec:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/component: distributor
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/distributor/service.yaml b/bitnami/grafana-tempo/templates/distributor/service.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -116,3 +117,4 @@ spec:
   {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.distributor.podLabels .Values.commonLabels ) "context" . ) }}
   selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/component: distributor
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/distributor/servicemonitor.yaml b/bitnami/grafana-tempo/templates/distributor/servicemonitor.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -46,3 +47,4 @@ spec:
     matchNames:
       - {{ .Release.Namespace }}
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/ingester/networkpolicy.yaml b/bitnami/grafana-tempo/templates/ingester/networkpolicy.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if .Values.ingester.networkPolicy.enabled }}
 kind: NetworkPolicy
 apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
@@ -122,3 +123,4 @@ spec:
     {{- include "common.tplvalues.render" ( dict "value" .Values.ingester.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/ingester/pdb.yaml b/bitnami/grafana-tempo/templates/ingester/pdb.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if .Values.ingester.pdb.create }}
 apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
@@ -26,3 +27,4 @@ spec:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/component: ingester
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/ingester/service.yaml b/bitnami/grafana-tempo/templates/ingester/service.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -59,3 +60,4 @@ spec:
   {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingester.podLabels .Values.commonLabels ) "context" . ) }}
   selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/component: ingester
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/ingester/servicemonitor.yaml b/bitnami/grafana-tempo/templates/ingester/servicemonitor.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -46,3 +47,4 @@ spec:
     matchNames:
       - {{ .Release.Namespace }}
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/ingester/statefulset.yaml b/bitnami/grafana-tempo/templates/ingester/statefulset.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
 kind: StatefulSet
 metadata:
@@ -231,3 +232,4 @@ spec:
         {{- end }}
         {{- include "common.storage.class" (dict "persistence" .Values.ingester.persistence "global" .Values.global) | nindent 8 }}
   {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/metrics-generator/deployment.yaml b/bitnami/grafana-tempo/templates/metrics-generator/deployment.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
@@ -175,3 +176,4 @@ spec:
         {{- if .Values.metricsGenerator.extraVolumes }}
         {{- include "common.tplvalues.render" (dict "value" .Values.metricsGenerator.extraVolumes "context" $) | nindent 8 }}
         {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/metrics-generator/networkpolicy.yaml b/bitnami/grafana-tempo/templates/metrics-generator/networkpolicy.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if .Values.metricsGenerator.networkPolicy.enabled }}
 kind: NetworkPolicy
 apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
@@ -122,3 +123,4 @@ spec:
     {{- include "common.tplvalues.render" ( dict "value" .Values.metricsGenerator.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/metrics-generator/pdb.yaml b/bitnami/grafana-tempo/templates/metrics-generator/pdb.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if .Values.metricsGenerator.pdb.create }}
 apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
@@ -26,3 +27,4 @@ spec:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/component: metrics-generator
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/metrics-generator/service.yaml b/bitnami/grafana-tempo/templates/metrics-generator/service.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -51,3 +52,4 @@ spec:
   {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.metricsGenerator.podLabels .Values.commonLabels ) "context" . ) }}
   selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/component: metrics-generator
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/metrics-generator/servicemonitor.yaml b/bitnami/grafana-tempo/templates/metrics-generator/servicemonitor.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -46,3 +47,4 @@ spec:
     matchNames:
       - {{ .Release.Namespace }}
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/querier/deployment.yaml b/bitnami/grafana-tempo/templates/querier/deployment.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
@@ -175,3 +176,4 @@ spec:
         {{- if .Values.querier.extraVolumes }}
         {{- include "common.tplvalues.render" (dict "value" .Values.querier.extraVolumes "context" $) | nindent 8 }}
         {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/querier/networkpolicy.yaml b/bitnami/grafana-tempo/templates/querier/networkpolicy.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if .Values.querier.networkPolicy.enabled }}
 kind: NetworkPolicy
 apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
@@ -122,3 +123,4 @@ spec:
     {{- include "common.tplvalues.render" ( dict "value" .Values.querier.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/querier/pdb.yaml b/bitnami/grafana-tempo/templates/querier/pdb.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if .Values.querier.pdb.create }}
 apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
@@ -26,3 +27,4 @@ spec:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/component: querier
 {{- end }}
+{{- end }}
diff --git a/bitnami/grafana-tempo/templates/querier/service.yaml b/bitnami/grafana-tempo/templates/querier/service.yaml
@@ -3,6 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -59,3 +60,4 @@ spec:
   {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.querier.podLabels .Values.commonLabels ) "context" . ) }}
   selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/component: querier
+{{- end }}