Skip to content

Conversation

@siegenthalerroger
Copy link
Contributor

@siegenthalerroger siegenthalerroger commented Mar 19, 2025

What this PR does / why we need it:

The global.extraEnv and global.extraEnvFrom values introduced in chart 6.27.0 where not included for all declared resources and in some cases weren't applied correctly.

Similar PRs:

Which issue(s) this PR fixes:
Fixes #16380
Fixes #16565
Fixes #16683
Fixes #16713
Fixes #16713
Fixes #17284

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@siegenthalerroger siegenthalerroger requested a review from a team as a code owner March 19, 2025 10:23
@CLAassistant
Copy link

CLAassistant commented Mar 19, 2025

CLA assistant check
All committers have signed the CLA.

@reonokiy
Copy link

main...reonokiy:loki:main#diff-2cd62eebae

There are some other areas in the read module that need fixing (I'm mainly referencing the statefulset-read.yaml file). You can see the diff I posted above.

@siegenthalerroger
Copy link
Contributor Author

Tagging @bentonam and @poyzannur for review as original authors of the global extraEnv changes.

@kcolford kcolford mentioned this pull request Apr 30, 2025
6 tasks
Copy link
Contributor

@bentonam bentonam left a comment

Choose a reason for hiding this comment

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

@siegenthalerroger thank you for catching this and submitting the changes! The changes LGTM, I do not have the ability to merge, I will defer to @poyzannur for final approval and merging of the changes. If you could resolve the merge conflict for production/helm/loki/CHANGELOG.md that would be appreciated

@poyzannur
Copy link
Contributor

@siegenthalerroger could you please address failing CI tests
Pull Request labeler should've been fixed by rebasing main, please try again. If not we can ignore it for the purposes of this PR

@pull-request-size pull-request-size bot added size/M and removed size/S labels May 1, 2025
@poyzannur poyzannur merged commit ee479d0 into grafana:main May 1, 2025
72 of 73 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

5 participants