[chore] merge upstream/main #25
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
See: open-telemetry#817 (comment) Signed-off-by: Goutham <gouthamve@gmail.com>
* feat(collector-chart): add extraEnvFrom support * chore(examples): adding examples
* Adds short usage instructions to UPGRADING.md * Updated chart version and regenerated examples
* Add new helm command to README.md, fix typos + Add link to logging exporter * bump operator chart version * Revert "bump operator chart version" This reverts commit 91430ff. * bump operator patch version
…elemetry#838) Signed-off-by: Alban HURTAUD <alban.hurtaud@amadeus.com>
…open-telemetry#844) * fix pipeline order when enabling k8sattributes * bump collector and document breakage * kubernetesAttributes example * regenerate examples * Update charts/opentelemetry-collector/UPGRADING.md Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --------- Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
…et (open-telemetry#843) * Allow disabling all ports * temp * generate examples * Bump version
…r threshold (open-telemetry#851) * charts/opentelemetry-collector: fix CPU limit While "256m" is a valid setting, the intention was likely to allow 4 pods to be scheduled on a single CPU, which we will currently overshoot by 24/1000, since there are only 1000 units in a CPU fraction. Adjust to "250m", which would allow exactly 4 pods to share a CPU. See e.g. https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu * Update charts/opentelemetry-collector/values.yaml Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --------- Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
* Upgrade operator to v0.82.0 * ci: fix operator E2E tests
* Allow disabling all ports * bump patch version instead
* update chart dependencies Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * update chart dependencies Signed-off-by: Pierre Tessier <pierre@pierretessier.com> * update chart dependencies Signed-off-by: Pierre Tessier <pierre@pierretessier.com> --------- Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
matej-g
approved these changes
Aug 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging changes from upstream:
This also updates collector to 0.83
Fixes: ES-67
Tested manually using