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

[tempo-distributed] Remove duplicated ingester podLabels #3451

Merged
merged 3 commits into from
Nov 27, 2024

Conversation

SimKev2
Copy link
Contributor

@SimKev2 SimKev2 commented Nov 25, 2024

Closes #3237

Ran into an issue when trying to add podLabels into our deploy of tempo.

RUNTIME ERROR: Parsing Helm output: yaml: unmarshal errors:
  line 1752: mapping key "name" already defined at line 1751

Tracking back to the rendering here, it seems like the .Values.ingester.podLabels are duplicated between the statefulset definition and the _helpers.tpl function : https://github.com/grafana/helm-charts/blob/main/charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl#L172-L174

@SimKev2 SimKev2 changed the title Remove duplicated ingester podLabels [tempo-distributed] Remove duplicated ingester podLabels Nov 25, 2024
@SimKev2 SimKev2 force-pushed the simkev2/podLabelFix branch from 310e6ba to 3136fde Compare November 25, 2024 19:18
@Sheikh-Abubaker
Copy link
Collaborator

Sheikh-Abubaker commented Nov 27, 2024

Hey @SimKev2 could you please resolve the conflicts ? Thanks!

Signed-off-by: Kevin Simons <kevin.simons@grafana.com>
Signed-off-by: Kevin Simons <kevin.simons@grafana.com>
Signed-off-by: Kevin Simons <kevin.simons@grafana.com>
@SimKev2 SimKev2 force-pushed the simkev2/podLabelFix branch from a427201 to 1c6c035 Compare November 27, 2024 20:12
@SimKev2 SimKev2 requested a review from a team as a code owner November 27, 2024 20:12
Copy link
Collaborator

@Sheikh-Abubaker Sheikh-Abubaker left a comment

Choose a reason for hiding this comment

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

LGTM!

@Sheikh-Abubaker Sheikh-Abubaker merged commit 624f414 into main Nov 27, 2024
6 checks passed
@Sheikh-Abubaker Sheikh-Abubaker deleted the simkev2/podLabelFix branch November 27, 2024 20:26
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.

[tempo-distributed] Duplicate label because of referencing bug
3 participants