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

rim99 · 2024-12-13T02:52:08Z

Description of the change

This change provides a new way of deployment: scaling-monolithic.

If toggle .Values.tempo.deploymentMode, which is "microservices" by default, is set as "scalingMonolithic", single statefulset will be created. Each pod conatins all functions of components: distributor, ingester, query-frontend, querier, metrics-generator and compactor.

Benefits

It helps to maintain a reasonable size of cluster handling small to medium volumes of incoming traces.

Possible drawbacks

Applicable issues

fixes [grafana-tempo] Support of scaling single binary mode #30855

Additional information

Official Doc

Checklist

Chart version bumped in Chart.yaml according to semver. This is not necessary when the changes only affect README.md files.
Variables are documented in the values.yaml and added to the README.md using readme-generator-for-helm
Title of the pull request follows this pattern [bitnami/<name_of_the_chart>] Descriptive title
All commits signed off and in agreement of Developer Certificate of Origin (DCO)

carrodher · 2024-12-13T07:41:51Z

Thank you for this significant contribution, @rim99! The PR is currently in draft status. Please inform us when it's ready for testing and review. Thanks once more!

rim99 · 2024-12-13T08:08:42Z

Hi @jotamartos @migruiz4 , I've tested my changes with minikube locally. New statefulset works fine as a cluster.

Regarding the VIB test, how to achieve 2 different sets of env for testing?

Since it should test both cases:

tempo.deploymentMode=microservices
tempo.deploymentMode=scalingMonolithic

github-actions · 2024-12-29T01:27:53Z

This Pull Request has been automatically marked as "stale" because it has not had recent activity (for 15 days). It will be closed if no further activity occurs. Thank you for your contribution.

rim99 · 2024-12-29T02:58:10Z

Hello, just a reminder that this PR is ready for review
@jotamartos @migruiz4 @carrodher

jotamartos · 2025-01-14T15:22:38Z

Hi @rim99,

Thanks for your contribution and sorry for the delay in getting back to you. We are going to start reviewing the changes and will provide feedback as soon as possible.

jotamartos

Please take a look at my suggestions

jotamartos · 2025-01-14T15:32:01Z

bitnami/grafana-tempo/templates/NOTES.txt

+    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" . }}


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

jotamartos · 2025-01-14T15:33:27Z

bitnami/grafana-tempo/templates/compactor/deployment.yaml

+{{- if eq .Values.tempo.deploymentMode "microservices" }}
 {{- if .Values.compactor.enabled }}


I'd use a single line for this

Suggested change

{{- if eq .Values.tempo.deploymentMode "microservices" }}

{{- if .Values.compactor.enabled }}

{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.compactor.enabled }}

Same for the rest of files unless there are multiple objects deployed

jotamartos · 2025-01-14T15:38:28Z

bitnami/grafana-tempo/templates/scaling-monolithic/headless-service.yaml

+kind: Service
+metadata:
+  name: {{ template "grafana-tempo.scaling-monolithic.fullname" . }}-headless
+  namespace: {{ .Release.Namespace | quote }}


This should be updated

Suggested change

namespace: {{ .Release.Namespace | quote }}

namespace: {{ include "common.names.namespace" . | quote }}

Can you update the other templates too?

jotamartos · 2025-01-15T09:29:08Z

bitnami/grafana-tempo/templates/scaling-monolithic/headless-service.yaml

+      port: {{ .Values.scalingMonolithic.service.ports.grpc }}
+      targetPort: grpc
+      protocol: TCP
+    ## From here we use non-configurable, standard ports


I'm not sure about having all these ports here. As far as I understand, the headless service should only have the Query Frontend's service ports as we currently have in the templates/query-frontend/headless-service.yaml file. Are the rest of ports needed?

That was to keep align with the ClusterIP service, so extraPorts can affect both the ClusterIP service and the headless service.
I changed this, to keep minimal required ports. And added new variable in values.yaml, to allow to set extra ports for headless service specifically

Signed-off-by: Zhang Xin <[email protected]>

Signed-off-by: Bitnami Containers <[email protected]>

Signed-off-by: Zhang Xin <[email protected]>

Signed-off-by: Bitnami Containers <[email protected]>

Signed-off-by: Carlos Rodríguez Hernández <[email protected]>

Signed-off-by: Bitnami Containers <[email protected]>

github-actions bot added the grafana-tempo label Dec 13, 2024

rim99 marked this pull request as draft December 13, 2024 02:52

github-actions bot added the triage Triage is needed label Dec 13, 2024

github-actions bot assigned carrodher Dec 13, 2024

github-actions bot requested a review from carrodher December 13, 2024 02:52

rim99 force-pushed the support-scaling-monolithic branch 4 times, most recently from 51d6560 to d8fc985 Compare December 13, 2024 05:07

carrodher added verify Execute verification workflow for these changes in-progress labels Dec 13, 2024

github-actions bot removed the triage Triage is needed label Dec 13, 2024

github-actions bot unassigned carrodher Dec 13, 2024

github-actions bot removed the request for review from carrodher December 13, 2024 07:47

github-actions bot assigned jotamartos Dec 13, 2024

github-actions bot requested a review from jotamartos December 13, 2024 07:47

carrodher requested a review from migruiz4 December 13, 2024 07:48

carrodher assigned migruiz4 Dec 13, 2024

rim99 marked this pull request as ready for review December 13, 2024 08:05

github-actions bot added the stale 15 days without activity label Dec 29, 2024

github-actions bot removed the stale 15 days without activity label Dec 30, 2024

jotamartos requested changes Jan 15, 2025

View reviewed changes

rim99 and others added 3 commits January 19, 2025 10:20

[bitnami/grafana-tempo] support scaling-monolithic mode

6ea18b9

Signed-off-by: Zhang Xin <[email protected]>

Update README.md with readme-generator-for-helm

a6a6831

Signed-off-by: Bitnami Containers <[email protected]>

merge file creation conditions

093cbd0

Signed-off-by: Zhang Xin <[email protected]>

rim99 added 3 commits January 19, 2025 10:25

include namespace from tpl

dec5258

Signed-off-by: Zhang Xin <[email protected]>

allow to define extra ports for headless service specifically

10730d6

Signed-off-by: Zhang Xin <[email protected]>

add validation of deploymentMode

3523936

Signed-off-by: Zhang Xin <[email protected]>

rim99 force-pushed the support-scaling-monolithic branch 2 times, most recently from 326ce34 to 3523936 Compare January 19, 2025 02:32

update

0494f29

Signed-off-by: Zhang Xin <[email protected]>

rim99 force-pushed the support-scaling-monolithic branch from 31e46cd to 0494f29 Compare January 19, 2025 02:43

rim99 requested a review from jotamartos January 19, 2025 02:44

bitnami-bot added 2 commits January 19, 2025 02:49

Update CHANGELOG.md

188d378

Signed-off-by: Bitnami Containers <[email protected]>

Update README.md with readme-generator-for-helm

86c15da

Signed-off-by: Bitnami Containers <[email protected]>

carrodher removed the request for review from jotamartos January 22, 2025 17:24

carrodher unassigned jotamartos Jan 22, 2025

carrodher and others added 2 commits January 31, 2025 08:46

Merge branch 'main' into support-scaling-monolithic

b09ab08

Signed-off-by: Carlos Rodríguez Hernández <[email protected]>

Update CHANGELOG.md

4abcfd8

Signed-off-by: Bitnami Containers <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

rim99 commented Dec 13, 2024 •

edited

Loading

carrodher commented Dec 13, 2024

rim99 commented Dec 13, 2024

github-actions bot commented Dec 29, 2024

rim99 commented Dec 29, 2024

jotamartos commented Jan 14, 2025

jotamartos left a comment

jotamartos Jan 14, 2025

rim99 Jan 19, 2025

jotamartos Jan 14, 2025

rim99 Jan 19, 2025

jotamartos Jan 14, 2025

rim99 Jan 19, 2025

jotamartos Jan 15, 2025

rim99 Jan 19, 2025

		{{- if eq .Values.tempo.deploymentMode "microservices" }}
		{{- if .Values.compactor.enabled }}

	{{- if eq .Values.tempo.deploymentMode "microservices" }}
	{{- if .Values.compactor.enabled }}
	{{- if and (eq .Values.tempo.deploymentMode "microservices") .Values.compactor.enabled }}

	namespace: {{ .Release.Namespace \| quote }}
	namespace: {{ include "common.names.namespace" . \| quote }}

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

Are you sure you want to change the base?

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

Conversation

rim99 commented Dec 13, 2024 • edited Loading

Description of the change

Benefits

Possible drawbacks

Applicable issues

Additional information

Checklist

carrodher commented Dec 13, 2024

rim99 commented Dec 13, 2024

github-actions bot commented Dec 29, 2024

rim99 commented Dec 29, 2024

jotamartos commented Jan 14, 2025

jotamartos left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rim99 commented Dec 13, 2024 •

edited

Loading