Skip to content

Commit

Permalink
feat: pull upstream changes (#56)
Browse files Browse the repository at this point in the history
* Bump collector version to 0.80.0 (open-telemetry#815)

* [opentelemetry-collector] recombine cri multi-line logs (open-telemetry#818)

* [demo] Bump OTel Collector chart version (open-telemetry#821)

See: open-telemetry#817 (comment)

Signed-off-by: Goutham <gouthamve@gmail.com>

* Feat/extra env from (open-telemetry#820)

* feat(collector-chart): add extraEnvFrom support

* chore(examples): adding examples

* bump operator (open-telemetry#823)

* bump collector (open-telemetry#830)

* JAC: fix checksum config in statefulset template (open-telemetry#827)

* Adds short usage instructions to UPGRADING.md (open-telemetry#826)

* Adds short usage instructions to UPGRADING.md

* Updated chart version and regenerated examples

* Bump operator (open-telemetry#832)

* Fix typo in README.md (open-telemetry#831)

* Add new helm command to README.md, fix typos (open-telemetry#836)

* 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

* Add externalTrafficPolicy value for service type LoadBalancer (open-telemetry#838)

Signed-off-by: Alban HURTAUD <alban.hurtaud@amadeus.com>

* [collector] Respect pipeline order when enabling kubernetesAttributes (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>

* [collector] Allow disabling service even for deployment and statefulset (open-telemetry#843)

* Allow disabling all ports

* temp

* generate examples

* Bump version

* bump collector to 0.82.0 (open-telemetry#847)

* charts/opentelemetry-collector: recommended CPU limit pushes just over 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 (open-telemetry#854)

* Upgrade operator to v0.82.0

* ci: fix operator E2E tests

* [collector] Allow disabling all ports (open-telemetry#842)

* Allow disabling all ports

* bump patch version instead

* chore(demo): update chart dependencies (open-telemetry#856)

* 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>

* Bump collector version (open-telemetry#861)

* Update clusterrole (open-telemetry#860)

* mode: daemonset example indicates hostNetwork: true is required (open-telemetry#849)

* add more extraction to preset (open-telemetry#867)

* bump operator version to 0.83.0 (open-telemetry#874)

* [collector] Update readme (open-telemetry#875)

* Update readme with all presets

* Add generic list reminder

* [collector] Update readme and preset comments (open-telemetry#876)

* Update readme and preset comments

* Add links to docs from values.yaml

* Add missed links

* [collector] Make it possible to specify namespace when running Helm template (open-telemetry#871)

* bump collector to 0.84.0 (open-telemetry#883)

* [collector] limit prometheus rules to opentelemetrycollector application (open-telemetry#885)

Signed-off-by: Andre Baptista Aguas <andre.aguas@protonmail.com>

* [demo] Use k8sattributesprocessor instead of env vars (open-telemetry#817)

* [demo] Use k8sattributesprocessor instead of env vars

Signed-off-by: Goutham <gouthamve@gmail.com>

* Add 0.24 to upgrading.md

Signed-off-by: Goutham <gouthamve@gmail.com>

* Update charts/opentelemetry-demo/UPGRADING.md

---------

Signed-off-by: Goutham <gouthamve@gmail.com>
Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>

* Bump collector to 0.85.0 (open-telemetry#890)

* [operator]: Update UPGRADING.md (open-telemetry#886) (open-telemetry#888)

* Bump actions/checkout from 3 to 4 (open-telemetry#884)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [demo] - update for 1.5 release (open-telemetry#873)

* update chart dependencies

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* update chart dependencies

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* use frontendProxy for all communication

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* update chart dependencies

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* demo 1.5 release

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* demo 1.5 release

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* demo 1.5 release

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* demo 1.5 release

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* (demo): update chart dependencies (open-telemetry#893)

* update demo chart dependencies

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* update demo chart dependencies

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* [operator] bump operator to 0.84.0 (open-telemetry#894)

* update environment variable reference (open-telemetry#898)

* bump operator to 0.85.0 (open-telemetry#896)

* Bump collector to 0.86.0 (open-telemetry#897)

* update charts to use debug exporter (open-telemetry#892)

* update charts to use debug exporter

The logging exporter is being deprecated in favour of the debug
exporter. This changes the charts to use that exporter instead.

Note: this will remain in draft until v0.86.0 is released which will be the first
release to include the debug exporter.

Signed-off-by: Alex Boten <aboten@lightstep.com>

* make generate-examples CHARTS=opentelemetry-collector

Signed-off-by: Alex Boten <aboten@lightstep.com>

* update charts

Signed-off-by: Alex Boten <aboten@lightstep.com>

* revert demo charts

Signed-off-by: Alex Boten <aboten@lightstep.com>

* bump version for collector/operator charts

Signed-off-by: Alex Boten <aboten@lightstep.com>

* patch bump

Signed-off-by: Alex Boten <aboten@lightstep.com>

---------

Signed-off-by: Alex Boten <aboten@lightstep.com>

* update prometheus to use otlp write (open-telemetry#901)

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* [demo] Bump collector chart dep (open-telemetry#903)

* Bump collector chart

* bump version

* Switch to tail mode for logsCollection preset (open-telemetry#904)

* (demo): update grafana dashboards (open-telemetry#902)

* update grafana dashboards

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* update grafana dashboards

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* [collector] re-add the logging exporter config (open-telemetry#907)

* re-add the logging exporter config

* Add warning in NOTES.txt

* [collector] Remove deprecated fields (open-telemetry#908)

* Remove deprecated fields

* update resources warning

* [collector] Add ability to enable GOMEMLIMIT (open-telemetry#900)

* Add ability to enable GOMEMLIMIT

* remove trailing spaces

* Fix title

* Update charts/opentelemetry-collector/UPGRADING.md

Co-authored-by: Pablo Baeyens <pbaeyens31+github@gmail.com>

* Update charts/opentelemetry-collector/UPGRADING.md

Co-authored-by: Pablo Baeyens <pbaeyens31+github@gmail.com>

* update warning

* Cleanup merge

* Apply suggestions from code review

Co-authored-by: Jina Jain <jjain@splunk.com>

---------

Co-authored-by: Pablo Baeyens <pbaeyens31+github@gmail.com>
Co-authored-by: Jina Jain <jjain@splunk.com>

* fix GOMEMLIMIT wrong unit (open-telemetry#913)

* [opentelemetry-operator] Add affinity, tolerations and nodeSelector to tests (open-telemetry#911)

* Add affinity, tolerations and nodeSelector to tests

* Change version from 0.40.0 to 0.39.2

* Generate release notes (open-telemetry#916)

* bump collector version to 0.87.0 (open-telemetry#917)

* fix prometheus endpoint (open-telemetry#920)

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* [operator] bump to 0.86.0 (open-telemetry#919)

* (demo) fix jaeger spm and prometheus config (open-telemetry#922)

* fix jaeger spm and prom config

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* fix jaeger spm and prom config

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>

* [otel-demo] Include namespace in NOTES.txt (open-telemetry#925)

* Include namespace in NOTES.txt

For full copy & paste, the port-forwarding instructions need to 
include the namespace.

* Bump version && regenerate examples

* [otel-demo] Fix exporter environment variable (open-telemetry#927)

* bump operator version (open-telemetry#926)

* Bump collector to 0.88.0 (open-telemetry#935)

* [collector] Update prometheus alerts (open-telemetry#933)

* upgrade to 0.88 include bridge (open-telemetry#938)

* upgrade to 0.88 include bridge

* facepalm

* Fix testing action

* version fix

* update schema

* add rbac for bridges

* Rename

* install prom CRDs for operator e2e tests

* Fix prometheuscr test

* [demo] add replicas support (open-telemetry#934)

* add replicas support

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* note about replicas setting for postgres, kafka, and redis

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* [demo] update to demo 1.6 (open-telemetry#942)

* update to demo 1.6

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* update to demo 1.6

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* update to demo 1.6

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* Bump helm/chart-releaser-action from 1.5.0 to 1.6.0 (open-telemetry#944)

Bumps [helm/chart-releaser-action](https://github.com/helm/chart-releaser-action) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/helm/chart-releaser-action/releases)
- [Commits](helm/chart-releaser-action@v1.5.0...v1.6.0)

---
updated-dependencies:
- dependency-name: helm/chart-releaser-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update clusterrole.yaml (open-telemetry#947)

* Adding namespace scope to webhook config (open-telemetry#940)

* add option to reuse previously auto-generated cert (open-telemetry#936)

* add option to reuse previously auto-generated cert

* bump chart version

* autoGenerateCert as object with enabled, ifNotExists properties

* value renamed, ca in secret, logic moved to _helper

* fix default value

* Update upgrade guidelines

* update UPGRADING.md doc

* remove unused file

* Bump collector version to 0.89.0 (open-telemetry#955)

* [CHORE] adding eBPF helm chart (open-telemetry#855)

* [CHORE] adding eBPF helm chart

Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com>

* Update .github/workflows/ebpf-test.yaml

Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>

* Update charts/opentelemetry-ebpf/Chart.yaml

Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>

* Update CONTRIBUTING.md

Co-authored-by: Jared Tan <jian.tan@daocloud.io>

* Update CONTRIBUTING.md

Co-authored-by: Jared Tan <jian.tan@daocloud.io>

* Update CONTRIBUTING.md

Co-authored-by: Jared Tan <jian.tan@daocloud.io>

* Update README.md

Co-authored-by: Jared Tan <jian.tan@daocloud.io>

* Update README.md

Co-authored-by: Jared Tan <jian.tan@daocloud.io>

* Update README.md

Co-authored-by: Jared Tan <jian.tan@daocloud.io>

* Update charts/opentelemetry-ebpf/CONTRIBUTING.md

* Update charts/opentelemetry-ebpf/values.yaml

* Update charts/opentelemetry-ebpf/values.yaml

Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com>

---------

Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com>
Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
Co-authored-by: Jared Tan <jian.tan@daocloud.io>
Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com>

* [BUMP] Operator v0.89.0/kube-rbac-proxy v0.15.0 (open-telemetry#963)

* [BUMP] Operator v0.89.0/kube-rbac-proxy v0.15.0

* fix

* Add JaredTan95 to approvers list (open-telemetry#965)

* [collector] fix clusterrolebinding binding  wrong namespace (open-telemetry#960)

* fix clusterrolebinding binding  wrong namespace

* remove examples

---------

Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>

* [collector] support add additionalLabels for otel col resources (open-telemetry#968)

* support add additionalLabels for all resources

* add comments

* Update charts/opentelemetry-collector/values.yaml

Co-authored-by: Jina Jain <jjain@splunk.com>

* add comments

* Update charts/opentelemetry-collector/values.yaml

Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>

---------

Co-authored-by: Jina Jain <jjain@splunk.com>
Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>

* Bump collector to 0.90.0 (open-telemetry#972)

* Add k8s infra monitorig demo example (open-telemetry#967)

* Add k8s infra monitorig demo example

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* Upgrade chart version

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

* Bump patch version instead of minor

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

---------

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>
Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>

* Bump collector to 0.90.1 (open-telemetry#975)

* Make the service port for the webhook configurable (open-telemetry#976)

* make the service port for the webhook configurable

* service port

* version bump

* version bump the examples

* enable useGOMEMLIMIT by default (open-telemetry#977)

* Bump operator to 0.90.0 (open-telemetry#979)

* Bump operator to 0.90.0

* Fix E2E test runner in CI

* Bump actions/stale from 8 to 9 (open-telemetry#978)

Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](actions/stale@v8...v9)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [opentelemetry-collector] update collector to v0.91.0 (open-telemetry#981)

---------

Signed-off-by: Goutham <gouthamve@gmail.com>
Signed-off-by: Alban HURTAUD <alban.hurtaud@amadeus.com>
Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Signed-off-by: Andre Baptista Aguas <andre.aguas@protonmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Alex Boten <aboten@lightstep.com>
Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com>
Signed-off-by: ChrsMark <chrismarkou92@gmail.com>
Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
Co-authored-by: Goutham Veeramachaneni <gouthamve+github@gmail.com>
Co-authored-by: PaoloGallina <paologallina1992@gmail.com>
Co-authored-by: Jorge Andreu Calatayud <11544239+jorgeancal@users.noreply.github.com>
Co-authored-by: Peter Kern <peter@nomagic.net>
Co-authored-by: Jan Katins <jasc@gmx.net>
Co-authored-by: Marcin Ziółkowski <62351083+MA3CIN@users.noreply.github.com>
Co-authored-by: Alban Hurtaud <alban.hurtaud@amadeus.com>
Co-authored-by: Jakob Demler <jakob.demler@jedox.com>
Co-authored-by: Kevin Burke <kevin.burke@segment.com>
Co-authored-by: Mikołaj Świątek <mail+sumo@mikolajswiatek.com>
Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Mitch <mitch@yottled.com>
Co-authored-by: Krisztian Fekete <103492698+krisztianfekete@users.noreply.github.com>
Co-authored-by: André Águas <abaguas@users.noreply.github.com>
Co-authored-by: Goutham Veeramachaneni <gouthamve@gmail.com>
Co-authored-by: galen-reltio <104534108+galen-reltio@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Boten <alex@boten.ca>
Co-authored-by: Pablo Baeyens <pbaeyens31+github@gmail.com>
Co-authored-by: Jina Jain <jjain@splunk.com>
Co-authored-by: Jared Tan <jian.tan@daocloud.io>
Co-authored-by: Julia Jia <juliajster@gmail.com>
Co-authored-by: Marco Aurelio Caldas Miranda <17923899+macmiranda@users.noreply.github.com>
Co-authored-by: Cedric Ziel <cedric@cedric-ziel.com>
Co-authored-by: Alex <birca@adobe.com>
Co-authored-by: Jacob Aronoff <jaronoff97@users.noreply.github.com>
Co-authored-by: Abhishek <abhishek.kothari@segment.com>
Co-authored-by: Grétar Hauksson <31700328+b3ndill@users.noreply.github.com>
Co-authored-by: Tomasz Prus <tomasz.prus@gmail.com>
Co-authored-by: Nicolas Takashi <nicolas.tcs@hotmail.com>
Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com>
Co-authored-by: Chris Mark <chrismarkou92@gmail.com>
  • Loading branch information
Show file tree
Hide file tree
Showing 322 changed files with 17,816 additions and 1,208 deletions.
8 changes: 3 additions & 5 deletions .github/actions/setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@ runs:
python-version: '3.10'

- name: Set up chart-testing
uses: helm/chart-testing-action@v2.5.0
with:
version: '3.8.0'
uses: helm/chart-testing-action@v2.6.0

- name: Create kind cluster
uses: helm/kind-action@v1.5.0
uses: helm/kind-action@v1.8.0
if: ${{ inputs.create-kind-cluster == 'true' }}
with:
node_image: kindest/node:v1.24.12
config: ./.github/kind-1.24.yaml

- name: Add Dependencies
shell: bash
Expand Down
11 changes: 11 additions & 0 deletions .github/kind-1.24.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
image: kindest/node:v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab
kubeadmConfigPatches:
- |
kind: InitConfiguration
nodeRegistration:
kubeletExtraArgs:
node-labels: "ingress-ready=true"
37 changes: 37 additions & 0 deletions .github/workflows/ebpf-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Test eBPF Chart

on:
pull_request:
paths:
- "charts/opentelemetry-ebpf/**"
branches:
- main

jobs:
ebpf-test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Setup
uses: ./.github/actions/setup
with:
create-kind-cluster: "true"

- name: Run chart-testing (install)
run: ct install --charts charts/opentelemetry-ebpf

- name: Run daemonset and deployment install test
run: |
kubectl apply -f ./charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered
kubectl rollout status deployment example-opentelemetry-collector --timeout=30s
kubectl apply -f ./charts/opentelemetry-ebpf/examples/cloud-collector/rendered
kubectl rollout status daemonset example-opentelemetry-ebpf-kernel-collector --timeout=30s
kubectl rollout status deployment example-opentelemetry-ebpf-cloud-collector --timeout=30s
kubectl rollout status deployment example-opentelemetry-ebpf-k8s-collector --timeout=30s
kubectl rollout status deployment example-opentelemetry-ebpf-reducer --timeout=30s
12 changes: 10 additions & 2 deletions .github/workflows/operator-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ jobs:
- name: Install Openshift route crd
run: kubectl apply -f https://raw.githubusercontent.com/openshift/router/master/deploy/route_crd.yaml

- name: Install Prometheus CRDs
run: |
kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/main/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/main/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
- name: Install cert-manager
run: |
kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.6.1/cert-manager.yaml
Expand All @@ -42,12 +47,14 @@ jobs:
- name: Use public target-allocator image in tests
run: |
appVersion=$(cat ./charts/opentelemetry-operator/Chart.yaml | sed -nr 's/appVersion: ([0-9]+\.[0-9]+\.[0-9]+)/\1/p')
LOCAL_TARGET_ALLOCATOR_IMG="local\/opentelemetry-operator-targetallocator:e2e"
PUBLIC_TARGET_ALLOCATOR_IMG="ghcr.io\/open-telemetry\/opentelemetry-operator\/target-allocator:0.1.0"
PUBLIC_TARGET_ALLOCATOR_IMG="ghcr.io\/open-telemetry\/opentelemetry-operator\/target-allocator:$appVersion"
sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/smoke-targetallocator/*.yaml
sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/targetallocator-features/00-install.yaml
sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/prometheus-config-validation/*.yaml
sed -i "s/$LOCAL_TARGET_ALLOCATOR_IMG/${PUBLIC_TARGET_ALLOCATOR_IMG}/g" ./opentelemetry-operator/tests/e2e/targetallocator-prometheuscr/00-install.yaml
- name: Install kuttl
run: |
Expand All @@ -67,4 +74,5 @@ jobs:
kubectl wait --timeout=5m --for=condition=available deployment my-opentelemetry-operator -n opentelemetry-operator-system
- name: Run e2e tests
run: kubectl kuttl test ./opentelemetry-operator/tests/e2e --config ./charts/opentelemetry-operator/kuttl-test.yaml
working-directory: ./opentelemetry-operator
run: kubectl kuttl test ./tests/e2e --config ../charts/opentelemetry-operator/kuttl-test.yaml --crd-dir ../charts/opentelemetry-operator/crds
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v4
-
name: Setup Helm Repo
run: |
Expand Down
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TMP_DIRECTORY = ./tmp
CHARTS ?= opentelemetry-collector opentelemetry-operator opentelemetry-demo
CHARTS ?= opentelemetry-collector opentelemetry-operator opentelemetry-demo opentelemetry-ebpf

.PHONY: generate-examples
generate-examples:
Expand Down Expand Up @@ -57,14 +57,16 @@ check-examples:
update-operator-crds:
APP_VERSION=$$(cat ./charts/opentelemetry-operator/Chart.yaml | sed -nr 's/appVersion: ([0-9]+\.[0-9]+\.[0-9]+)/\1/p') ; \
curl -s -o ./charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml ; \
curl -s -o ./charts/opentelemetry-operator/crds/crd-opentelemetryinstrumentation.yaml https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_instrumentations.yaml
curl -s -o ./charts/opentelemetry-operator/crds/crd-opentelemetryinstrumentation.yaml https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_instrumentations.yaml ; \
curl -s -o ./charts/opentelemetry-operator/crds/crd-opentelemetry.io_opampbridges.yaml https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_opampbridges.yaml

.PHONY: check-operator-crds
check-operator-crds:
APP_VERSION=$$(cat ./charts/opentelemetry-operator/Chart.yaml | sed -nr 's/appVersion: ([0-9]+\.[0-9]+\.[0-9]+)/\1/p'); \
mkdir -p ${TMP_DIRECTORY}/crds; \
curl -s -o "${TMP_DIRECTORY}/crds/crd-opentelemetrycollector.yaml" https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml; \
curl -s -o "${TMP_DIRECTORY}/crds/crd-opentelemetryinstrumentation.yaml" https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_instrumentations.yaml; \
curl -s -o "${TMP_DIRECTORY}/crds/crd-opentelemetry.io_opampbridges.yaml" https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v$${APP_VERSION}/config/crd/bases/opentelemetry.io_opampbridges.yaml; \
if diff ${TMP_DIRECTORY}/crds ./charts/opentelemetry-operator/crds > /dev/null; then \
echo "Passed"; \
rm -rf ${TMP_DIRECTORY}; \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ See [CONTRIBUTING.md](./CONTRIBUTING.md).
Approvers ([@open-telemetry/helm-approvers](https://github.com/orgs/open-telemetry/teams/helm-approvers)):

- [Alex Birca](https://github.com/Allex1), Adobe
- [Jared Tan](https://github.com/JaredTan95), DaoCloud
- [Pierre Tessier](https://github.com/puckpuck), Honeycomb
- [Povilas](https://github.com/povilasv), Coralogix

Expand Down
6 changes: 6 additions & 0 deletions charts/opentelemetry-collector/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## OpenTelemetry Collector


### v0.78.0 / 2023-12-13
- [CHORE] Pull upstream changes
- [CHORE] Bump Collector to 0.91.0
- [CHORE] Enable Go memory limit feature flag by default.

### v0.77.5 / 2023-11-30
- [FEAT] Add gke/autopilot distribution.

Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-collector
version: 0.77.8
version: 0.78.0
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand All @@ -12,4 +12,4 @@ sources:
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
maintainers:
- name: povilasv
appVersion: 0.90.1
appVersion: 0.91.0
8 changes: 7 additions & 1 deletion charts/opentelemetry-collector/UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,15 @@ When enabled, the chart will remove the Memory Ballast Extension from the collec
of the configured `resources.limits.memory`. If no `resources.limits.memory` are set when `useGOMEMLIMIT` is enabled then a `GOMEMLIMIT` environment variable WILL NOT be
created but the Memory Ballast Extension will still be removed.

If you are not interested in using `GOMEMLIMIT` then this change does not affect you. But, depending on the progress made in [Issue 891](https://github.com/open-telemetry/opentelemetry-helm-charts/issues/891),
Depending on the progress made in [Issue 891](https://github.com/open-telemetry/opentelemetry-helm-charts/issues/891),
the use of `GOMEMLIMIT` may completely replace the Memory Ballast Extension in the future.

## 0.75.1 to 0.76.0

Enable the `useGOMEMLIMIT` feature flag by default. This means by default the chart now does not use the Memory Ballast Extension and any custom configuraiton applied to the Memory Ballast Extension is ignored.

**If you're still interested in using the Memory Ballast Extension set this back to false.**

## 0.69.3 to 0.70.0

The following deprecated fields have been removed. Please use the new values:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ config:
logs:
exporters:
- otlp
- logging
- debug
metrics:
exporters:
- otlp
- logging
- debug
traces:
exporters:
- otlp
- logging
- debug

resources:
limits:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.77.8
helm.sh/chart: opentelemetry-collector-0.78.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.90.1"
app.kubernetes.io/version: "0.91.0"
app.kubernetes.io/managed-by: Helm

rules:
- apiGroups: [""]
resources: ["pods", "endpoints", "nodes/stats", "nodes/metrics", "nodes", "services"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.77.8
helm.sh/chart: opentelemetry-collector-0.78.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.90.1"
app.kubernetes.io/version: "0.91.0"
app.kubernetes.io/managed-by: Helm

roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.77.8
helm.sh/chart: opentelemetry-collector-0.78.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.90.1"
app.kubernetes.io/version: "0.91.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
debug: {}
logging: {}
otlp:
endpoint: example-opentelemetry-collector:4317
tls:
insecure: true
extensions:
health_check: {}
memory_ballast:
size_in_percentage: 40
processors:
batch: {}
memory_limiter:
Expand Down Expand Up @@ -62,12 +62,11 @@ data:
service:
extensions:
- health_check
- memory_ballast
pipelines:
logs:
exporters:
- otlp
- logging
- debug
processors:
- memory_limiter
- batch
Expand All @@ -76,7 +75,7 @@ data:
metrics:
exporters:
- otlp
- logging
- debug
processors:
- memory_limiter
- batch
Expand All @@ -87,7 +86,7 @@ data:
traces:
exporters:
- otlp
- logging
- debug
processors:
- memory_limiter
- batch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.77.8
helm.sh/chart: opentelemetry-collector-0.78.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.90.1"
app.kubernetes.io/version: "0.91.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
debug: {}
logging: {}
extensions:
health_check: {}
k8s_observer:
auth_type: serviceAccount
observe_pods: true
memory_ballast:
size_in_percentage: 40
processors:
batch: {}
filter/k8s_extra_metrics:
Expand Down Expand Up @@ -97,20 +97,19 @@ data:
service:
extensions:
- health_check
- memory_ballast
- k8s_observer
pipelines:
logs:
exporters:
- logging
- debug
processors:
- memory_limiter
- batch
receivers:
- otlp
metrics:
exporters:
- logging
- debug
processors:
- memory_limiter
- batch
Expand All @@ -121,7 +120,7 @@ data:
- prometheus/k8s_extra_metrics
traces:
exporters:
- logging
- debug
processors:
- memory_limiter
- batch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.77.8
helm.sh/chart: opentelemetry-collector-0.78.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.90.1"
app.kubernetes.io/version: "0.91.0"
app.kubernetes.io/managed-by: Helm

spec:
selector:
matchLabels:
Expand All @@ -22,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 5c10055f755ffbd6be8a9a575a7b7d8504afa4d15c0cb9c230ef90352b1b41b6
checksum/config: 282a36758c865c5a8aeb00d3afcf56ae120194ba8126ce546ee652edfb9066ca

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -41,7 +42,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.90.1"
image: "otel/opentelemetry-collector-contrib:0.91.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down Expand Up @@ -80,6 +81,8 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: status.hostIP
- name: GOMEMLIMIT
value: 156MiB
livenessProbe:
httpGet:
path: /
Expand Down

0 comments on commit 362b44d

Please sign in to comment.