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

Helm: Handle overriding extraArgs in components correctly #2751

Merged
merged 1 commit into from
Nov 23, 2023

Conversation

simonswine
Copy link
Contributor

@simonswine simonswine commented Nov 23, 2023

I noticed a bug, when setting extraArgs on a single component (.values.pyroscope.components.querier.extraArgs) they would completely overwrite the whole global (.values.pyroscope.extraArgs) array.

This change will make sure we do a merge of global and component based extraArgs.

@simonswine simonswine changed the title Handle overriding extraArgs in components correctly Helm: Handle overriding extraArgs in components correctly Nov 23, 2023
@simonswine simonswine marked this pull request as ready for review November 23, 2023 11:17
@simonswine simonswine requested a review from a team as a code owner November 23, 2023 11:17
I noticed a bug, when setting extraArgs on a single component
(`.values.pyroscope.components.querier.extraArgs`) they would
completely overwrite the whole global (`.values.pyroscope.extraArgs`)
array.

This change will make sure we do a merge of global and component based
extraArgs.
Copy link
Contributor

@cyriltovena cyriltovena left a comment

Choose a reason for hiding this comment

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

LGTM

@simonswine simonswine merged commit 59fff4c into grafana:main Nov 23, 2023
19 checks passed
simonswine added a commit that referenced this pull request Nov 23, 2023
I noticed a bug, when setting extraArgs on a single component
(`.values.pyroscope.components.querier.extraArgs`) they would
completely overwrite the whole global (`.values.pyroscope.extraArgs`)
array.

This change will make sure we do a merge of global and component based
extraArgs.
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.

2 participants