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.

Sign up for GitHub

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

Jump to bottom

Helm: Add extraContainers to write pods #11319

Merged
merged 12 commits into from Dec 1, 2023
Merged

Helm: Add extraContainers to write pods #11319

merged 12 commits into from Dec 1, 2023

Conversation

someStrangerFromTheAbyss
Copy link
Contributor

@someStrangerFromTheAbyss someStrangerFromTheAbyss commented Nov 24, 2023 •
edited

Adds the extraContainers to the write pod:

Which issue(s) this PR fixes:
This fix will allow my team to add a pods that makes modification to the incoming logs before sending them to loki with minimal network transfer.

Special notes for your reviewer:
NONE

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
    • If the change is worth mentioning in the release notes, add add-to-release-notes label
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • 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

@CLAassistant
Copy link

CLAassistant commented Nov 24, 2023 •
edited

CLA assistant check
All committers have signed the CLA.

@github-actions GitHub Actions
Copy link
Contributor

Trivy scan found the following vulnerabilities:

@JStickler
Copy link
Contributor

Could you also please update the version in the and production/helm/loki/README.md?

@someStrangerFromTheAbyss
Copy link
Contributor Author

someStrangerFromTheAbyss commented Nov 27, 2023 •
edited

Could you also please update the version in the and production/helm/loki/README.md?

Updated the version in the README and in the link in the README

@MichelHollands
Copy link
Contributor

@someStrangerFromTheAbyss Thanks for the contribution. Can you update the version to 5.40 as 5.39 is already taken?

@someStrangerFromTheAbyss
Copy link
Contributor Author

@MichelHollands

Bumped to 5.40

@MichelHollands
Copy link
Contributor

@someStrangerFromTheAbyss The CI is failing. As mentioned in the error message "Please generate Helm Chart reference by running 'make -C docs sources/setup/install/helm/reference.md'". You might have to remove the file if no changes are generated at first. Once that is done I'll merge this.

@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Nov 30, 2023
@someStrangerFromTheAbyss
Copy link
Contributor Author

@MichelHollands

I generated the reference file.

MichelHollands
MichelHollands approved these changes Dec 1, 2023
View reviewed changes
Copy link
Contributor

@MichelHollands MichelHollands left a comment

Choose a reason for hiding this comment

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

LGTM

@MichelHollands MichelHollands merged commit 0b9e573 into grafana:main Dec 1, 2023
10 checks passed
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
@someStrangerFromTheAbyss @MichelHollands @rhnasc
Helm: Add extraContainers to write pods (grafana#11319)
d5ddfd6 
**Adds the extraContainers to the write pod**:

**Which issue(s) this PR fixes**:
This fix will allow my team to add a pods that makes modification to the
incoming logs before sending them to loki with minimal network transfer.

**Special notes for your reviewer**:
NONE

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [x] Documentation added
- [x] Tests updated
- [x] `CHANGELOG.md` updated
- [x] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [x] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [x] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](grafana@d10549e)
- [x] 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](grafana@0d4416a)

---------

Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MichelHollands MichelHollands MichelHollands approved these changes

Assignees
No one assigned
Labels
area/helm size/S type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@someStrangerFromTheAbyss @CLAassistant @JStickler @MichelHollands