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

[Jsonnet] Make metrics-generator deployment volume mounts customizable #2647

Merged
merged 4 commits into from Jul 12, 2023

Conversation

mdisibio
Copy link
Contributor

@mdisibio mdisibio commented Jul 12, 2023

What this PR does:
The microservices jsonnet was using container.withVolumeMounts on the generator deployment, and this prevents downstream users of the jsonnet from customizing the mounts through the $.tempo_metrics_generator_container. Except they still worked for the statefulset because it doesn't do that, which is unexpected and hard to troubleshoot.

The root cause was that we were attempting to keep the volume mounts on the deployment set to /var/tempo/wal but let the statefulset mount at /var/tempo (because of the new metrics feature that uses /var/tempo/blocks). So the fix here is both removing withVolumeMounts and making the mounts the same between both deployment modes. This addresses the downstream customize issue, but also simplifies.

Which issue(s) this PR fixes:
Fixes n/a

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

…ownstream jsonnet from changing them via $.tempo_metrics_generator_container, make volume mounts idential between deployment and statefulset
Copy link
Contributor

@zalegrala zalegrala left a comment

Choose a reason for hiding this comment

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

Thanks for putting this together. Looks good.

@mdisibio mdisibio merged commit 1419ce0 into grafana:main Jul 12, 2023
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants