Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
1 change: 1 addition & 0 deletions .vib/grafana-tempo/runtime-parameters.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
tempo:
deploymentMode: "microservices"
dataDir: /bitnami/grafana-tempo/data
traces:
otlp:
Expand Down
9 changes: 7 additions & 2 deletions bitnami/grafana-tempo/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# Changelog

## 3.8.6 (2025-02-14)
## 3.9.0 (2025-02-16)

* [bitnami/grafana-tempo] Release 3.8.6 ([#31936](https://github.com/bitnami/charts/pull/31936))
* [bitnami/grafana-tempo] support new deployment mode: scaling-monolithic ([#31028](https://github.com/bitnami/charts/pull/31028))

## <small>3.8.6 (2025-02-14)</small>

* [bitnami/*] Use CDN url for the Bitnami Application Icons (#31881) ([d9bb11a](https://github.com/bitnami/charts/commit/d9bb11a9076b9bfdcc70ea022c25ef50e9713657)), closes [#31881](https://github.com/bitnami/charts/issues/31881)
* [bitnami/grafana-tempo] Release 3.8.6 (#31936) ([3032c3c](https://github.com/bitnami/charts/commit/3032c3c4b84eb75e2b6e1e0370ef4635d5976aa8)), closes [#31936](https://github.com/bitnami/charts/issues/31936)

## <small>3.8.5 (2025-02-04)</small>

Expand Down
2 changes: 1 addition & 1 deletion bitnami/grafana-tempo/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ maintainers:
name: grafana-tempo
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/grafana-tempo
version: 3.8.6
version: 3.9.0
174 changes: 174 additions & 0 deletions bitnami/grafana-tempo/README.md

Large diffs are not rendered by default.

39 changes: 30 additions & 9 deletions bitnami/grafana-tempo/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ The chart has been deployed in diagnostic mode. All probes have been disabled an

Get the list of pods by executing:

kubectl get pods --namespace {{ .Release.Namespace }} -l app.kubernetes.io/instance={{ .Release.Name }}
kubectl get pods --namespace {{ include "common.names.namespace" . }} -l app.kubernetes.io/instance={{ .Release.Name }}

Access the pod you want to debug by executing

kubectl exec --namespace {{ .Release.Namespace }} -ti <NAME OF THE POD> -- bash
kubectl exec --namespace {{ include "common.names.namespace" . }} -ti <NAME OF THE POD> -- bash

In order to replicate the container startup execute this command:

Expand All @@ -28,34 +28,55 @@ 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}")
export NODE_PORT=$(kubectl get --namespace {{ include "common.names.namespace" . }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "grafana-tempo.query-frontend.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ include "common.names.namespace" . }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.queryFrontend.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}')
You can watch the status of by running 'kubectl get --namespace {{ include "common.names.namespace" . }} svc -w {{ template "common.names.fullname" . }}
export SERVICE_IP=$(kubectl get svc --namespace {{ include "common.names.namespace" . }} {{ template "common.names.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
echo http://$SERVICE_IP:{{ .Values.queryFrontend.service.ports.http }}
{{- else if contains "ClusterIP" .Values.queryFrontend.service.type }}
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 {{ include "common.names.namespace" . }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "grafana-tempo.scaling-monolithic.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ include "common.names.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 {{ include "common.names.namespace" . }} svc -w {{ template "common.names.fullname" . }}
export SERVICE_IP=$(kubectl get svc --namespace {{ include "common.names.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" . }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd include a validation to ensure tempo.deploymentMode is set to the expected values.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

{{- 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" $) }}
16 changes: 16 additions & 0 deletions bitnami/grafana-tempo/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/}}
Expand Down Expand Up @@ -183,6 +190,7 @@ Compile all warnings into a single message.
*/}}
{{- define "grafana-tempo.validateValues" -}}
{{- $messages := list -}}
{{- $messages := append $messages (include "grafana-tempo.validateValues.deploymentMode" .) -}}
{{- $messages := append $messages (include "grafana-tempo.validateValues.vulture" .) -}}
{{- $messages := append $messages (include "grafana-tempo.validateValues.memcached" .) -}}
{{- $messages := without $messages "" -}}
Expand All @@ -193,6 +201,14 @@ Compile all warnings into a single message.
{{- end -}}
{{- end -}}

{{/* Validate values of Grafana Tempo - DeploymentMode */}}
{{- define "grafana-tempo.validateValues.deploymentMode" -}}
{{- if and (ne .Values.tempo.deploymentMode "microservices") (ne .Values.tempo.deploymentMode "scalingMonolithic") }}
grafana-tempo: DeploymentMode
Allowed deploymentMode values are 'microservices' and 'scalingMonolithic'. Found: {{ .Values.tempo.deploymentMode }}
{{- end }}
{{- end -}}

{{/* Validate values of Grafana Tempo - Memcached */}}
{{- define "grafana-tempo.validateValues.vulture" -}}
{{- if not (and .Values.vulture.enabled .Values.tempo.traces.jaeger.grpc) -}}
Expand Down
4 changes: 2 additions & 2 deletions bitnami/grafana-tempo/templates/compactor/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if .Values.compactor.enabled }}
{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.compactor.enabled }}
apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
name: {{ template "grafana-tempo.compactor.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: compactor
{{- if .Values.commonAnnotations }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if and .Values.compactor.enabled .Values.compactor.networkPolicy.enabled }}
{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.compactor.enabled .Values.compactor.networkPolicy.enabled }}
kind: NetworkPolicy
apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
metadata:
Expand Down
2 changes: 1 addition & 1 deletion bitnami/grafana-tempo/templates/compactor/pdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if and .Values.compactor.enabled .Values.compactor.pdb.create }}
{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.compactor.enabled .Values.compactor.pdb.create }}
apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
kind: PodDisruptionBudget
metadata:
Expand Down
4 changes: 2 additions & 2 deletions bitnami/grafana-tempo/templates/compactor/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if .Values.compactor.enabled }}
{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.compactor.enabled }}
apiVersion: v1
kind: Service
metadata:
name: {{ template "grafana-tempo.compactor.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: compactor
{{- if or .Values.commonAnnotations .Values.compactor.service.annotations }}
Expand Down
4 changes: 2 additions & 2 deletions bitnami/grafana-tempo/templates/compactor/servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if and .Values.compactor.enabled .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.compactor.enabled .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
Expand Down Expand Up @@ -44,5 +44,5 @@ spec:
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
- {{ include "common.names.namespace" . }}
{{- end }}
4 changes: 3 additions & 1 deletion bitnami/grafana-tempo/templates/distributor/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ 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:
name: {{ template "grafana-tempo.distributor.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: distributor
{{- if .Values.commonAnnotations }}
Expand Down Expand Up @@ -214,3 +215,4 @@ spec:
{{- if .Values.distributor.extraVolumes }}
{{- include "common.tplvalues.render" (dict "value" .Values.distributor.extraVolumes "context" $) | nindent 8 }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if .Values.distributor.networkPolicy.enabled }}
{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.distributor.networkPolicy.enabled }}
kind: NetworkPolicy
apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
metadata:
Expand Down
2 changes: 1 addition & 1 deletion bitnami/grafana-tempo/templates/distributor/pdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if and .Values.distributor.pdb.create .Values.distributor.pdb.create }}
{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.distributor.pdb.create .Values.distributor.pdb.create }}
apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
kind: PodDisruptionBudget
metadata:
Expand Down
4 changes: 3 additions & 1 deletion bitnami/grafana-tempo/templates/distributor/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if eq .Values.tempo.deploymentMode "microservices" }}
apiVersion: v1
kind: Service
metadata:
name: {{ template "grafana-tempo.distributor.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: distributor
{{- if or .Values.commonAnnotations .Values.distributor.service.annotations }}
Expand Down Expand Up @@ -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 }}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
Expand Down Expand Up @@ -44,5 +44,5 @@ spec:
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
- {{ include "common.names.namespace" . }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ template "grafana-tempo.gossip-ring.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: tempo
{{- if or .Values.commonAnnotations .Values.tempo.gossipRing.service.annotations }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if .Values.ingester.networkPolicy.enabled }}
{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.ingester.networkPolicy.enabled }}
kind: NetworkPolicy
apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
metadata:
Expand Down
2 changes: 1 addition & 1 deletion bitnami/grafana-tempo/templates/ingester/pdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if .Values.ingester.pdb.create }}
{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.ingester.pdb.create }}
apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
kind: PodDisruptionBudget
metadata:
Expand Down
4 changes: 3 additions & 1 deletion bitnami/grafana-tempo/templates/ingester/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if eq .Values.tempo.deploymentMode "microservices" }}
apiVersion: v1
kind: Service
metadata:
name: {{ template "grafana-tempo.ingester.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: ingester
{{- if or .Values.commonAnnotations .Values.ingester.service.annotations }}
Expand Down Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions bitnami/grafana-tempo/templates/ingester/servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
Expand Down Expand Up @@ -44,5 +44,5 @@ spec:
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
- {{ include "common.names.namespace" . }}
{{- end }}
4 changes: 3 additions & 1 deletion bitnami/grafana-tempo/templates/ingester/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ 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:
name: {{ template "grafana-tempo.ingester.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: ingester
{{- if .Values.commonAnnotations }}
Expand Down Expand Up @@ -231,3 +232,4 @@ spec:
{{- end }}
{{- include "common.storage.class" (dict "persistence" .Values.ingester.persistence "global" .Values.global) | nindent 8 }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ 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:
name: {{ template "grafana-tempo.metrics-generator.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
app.kubernetes.io/component: metrics-generator
{{- if .Values.commonAnnotations }}
Expand Down Expand Up @@ -175,3 +176,4 @@ spec:
{{- if .Values.metricsGenerator.extraVolumes }}
{{- include "common.tplvalues.render" (dict "value" .Values.metricsGenerator.extraVolumes "context" $) | nindent 8 }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright Broadcom, Inc. All Rights Reserved.
SPDX-License-Identifier: APACHE-2.0
*/}}

{{- if .Values.metricsGenerator.networkPolicy.enabled }}
{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.metricsGenerator.networkPolicy.enabled }}
kind: NetworkPolicy
apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
metadata:
Expand Down
Loading
Loading