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

chore: rebase upstream #63

Merged
merged 102 commits into from
Feb 9, 2024
Merged

chore: rebase upstream #63

merged 102 commits into from
Feb 9, 2024

Conversation

povilasv
Copy link

@povilasv povilasv commented Feb 9, 2024

Merging upstream commits to our branch

Ref: https://coralogix.atlassian.net/browse/ES-201

TylerHelmuth and others added 30 commits June 21, 2023 14:52
* 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
…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 <[email protected]>

---------

Co-authored-by: Tyler Helmuth <[email protected]>
…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 <[email protected]>

---------

Co-authored-by: Tyler Helmuth <[email protected]>
* 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 <[email protected]>

* update chart dependencies

Signed-off-by: Pierre Tessier <[email protected]>

* update chart dependencies

Signed-off-by: Pierre Tessier <[email protected]>

---------

Signed-off-by: Pierre Tessier <[email protected]>
* Update readme with all presets

* Add generic list reminder
* Update readme and preset comments

* Add links to docs from values.yaml

* Add missed links
…#817)

* [demo] Use k8sattributesprocessor instead of env vars

Signed-off-by: Goutham <[email protected]>

* Add 0.24 to upgrading.md

Signed-off-by: Goutham <[email protected]>

* Update charts/opentelemetry-demo/UPGRADING.md

---------

Signed-off-by: Goutham <[email protected]>
Co-authored-by: Tyler Helmuth <[email protected]>
Pionerd and others added 20 commits December 15, 2023 09:23
…en-telemetry#970)

* [opentelemetry-operator] remove default limits for cpu and memory

* adjusted schema and ran make commands

* Updated documentation

Signed-off-by: Pieter van der Giessen <[email protected]>

---------

Signed-off-by: Pieter van der Giessen <[email protected]>
* update to demo 1.7

Signed-off-by: Pierre Tessier <[email protected]>

* update to demo 1.7

Signed-off-by: Pierre Tessier <[email protected]>

---------

Signed-off-by: Pierre Tessier <[email protected]>
* fix readme

* bump chart version
… logsCollection preset (open-telemetry#999)

* enable filelog with retry_on_failure as default config

Signed-off-by: Husni Alhamdani <[email protected]>

* enable filelog with retry_on_failure as default config

Signed-off-by: Husni Alhamdani <[email protected]>

---------

Signed-off-by: Husni Alhamdani <[email protected]>
Co-authored-by: Tyler Helmuth <[email protected]>
* demo: add missing namespace on grafana dashboard

fixes: open-telemetry#1001

Signed-off-by: hsinhoyeh <[email protected]>

* add rendered yamls

Signed-off-by: hsinhoyeh <[email protected]>

---------

Signed-off-by: hsinhoyeh <[email protected]>
* Bump operator version to 0.92.0

* update cluster role

* generate examples

* Bump to 0.92.1

* Revert "update cluster role"

This reverts commit 7f43569.

* regenerate
…y#1011)

* [collector] Enable HPA when deploy mode is statefulset

Signed-off-by: Husni Alhamdani <[email protected]>

* [collector] Enable HPA when deploy mode is statefulset

Signed-off-by: Husni Alhamdani <[email protected]>

* Add test scenario for HPA of deployment and statefulset

Signed-off-by: Husni Alhamdani <[email protected]>

---------

Signed-off-by: Husni Alhamdani <[email protected]>
* add mountedConfigMaps support

Signed-off-by: Pierre Tessier <[email protected]>

* add mountedConfigMaps support

Signed-off-by: Pierre Tessier <[email protected]>

* add mountedConfigMaps support

Signed-off-by: Pierre Tessier <[email protected]>

* add mountedConfigMaps support

Signed-off-by: Pierre Tessier <[email protected]>

---------

Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Jared Tan <[email protected]>
…try#1015)

* set gomemlimit correctly

* minor fixes

* update chart version

* update var

* remove unittest

* remove unittest
* Allow for secure deployments by default.

* Restored data added during testing to original state.

* Updated demo chart README.md.

* Added additional comments to values.yaml to illustrate how the new feature can be used.

* Executed "make generate-examples" and pushing results.
…emetry#1025)

* add helper to set kind in HPA

* update autoscaling comment in values

* bump version
* bump operator to 0.93.0

* Update collector version
@povilasv povilasv marked this pull request as ready for review February 9, 2024 08:48
@povilasv povilasv merged commit 64185fd into main Feb 9, 2024
5 checks passed
@povilasv povilasv deleted the main-rebase2 branch February 9, 2024 09:35
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.