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

Sync fork #2

Merged
merged 555 commits into from
Dec 11, 2023
Merged

Sync fork #2

merged 555 commits into from
Dec 11, 2023

Conversation

matej-g
Copy link

@matej-g matej-g commented Dec 11, 2023

No description provided.

TylerHelmuth and others added 30 commits August 1, 2023 09:57
* Bump dotnet

* changelog
* Bump nodejs dependencies

* changelog
* Expose Prometheus exporter port in the OTEL Collector

Signed-off-by: Israel Blancas <[email protected]>

* Format

Signed-off-by: Israel Blancas <[email protected]>

* Allow the usage of multiple exporters

Signed-off-by: Israel Blancas <[email protected]>

* Format

Signed-off-by: Israel Blancas <[email protected]>

* Fix tests

Signed-off-by: Israel Blancas <[email protected]>

* Apply changes requested in CR

---------

Signed-off-by: Israel Blancas <[email protected]>
* adds managementState field to collector crd spec

* changes e2e test case

* cover new case in e2e test case

* fix typo

* fix e2e test cases

* fix e2e test case

* add assertion on config map state
* Make sure port name in ingress and route match service

Port name in service/ingress/route can be longer than 15 characters.
The port name 15 characters is enforced in ports on pods.

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

---------

Signed-off-by: Pavol Loffay <[email protected]>
* parent 2998ccc
author Jacob Aronoff <[email protected]> 1690402542 -0400
committer Jacob Aronoff <[email protected]> 1691001855 -0400

Merge upstream, squash to main

* Fix missing import

* fix whoopsie
* Add groups

* add chlog entry

* remove chloggen
Bumps the prometheus group with 1 update: [github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring](https://github.com/prometheus-operator/prometheus-operator).

- [Release notes](https://github.com/prometheus-operator/prometheus-operator/releases)
- [Changelog](https://github.com/prometheus-operator/prometheus-operator/blob/main/CHANGELOG.md)
- [Commits](prometheus-operator/prometheus-operator@v0.66.0...v0.67.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prometheus
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.45.0 to 0.46.0.
- [Release notes](https://github.com/prometheus/prometheus/releases)
- [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md)
- [Commits](prometheus/prometheus@v0.45.0...v0.46.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/prometheus
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Align management state constant with other constants

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

---------

Signed-off-by: Pavol Loffay <[email protected]>
Bumps the kubernetes group with 1 update: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).

- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.15.0...v0.15.1)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: kubernetes
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#1991)

Bumps the kubernetes group in /cmd/operator-opamp-bridge with 1 update: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).

- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.15.0...v0.15.1)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: kubernetes
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the kubernetes group in /cmd/otel-allocator with 1 update: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).

- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.15.0...v0.15.1)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: kubernetes
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Benedikt Bongartz <[email protected]>
Co-authored-by: Mikołaj Świątek <[email protected]>
* Set the level 4 for the operator

Signed-off-by: Israel Blancas <[email protected]>

* Add missing changelog

Signed-off-by: Israel Blancas <[email protected]>

---------

Signed-off-by: Israel Blancas <[email protected]>
Bumps golang from 1.20 to 1.21.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add changelog

Signed-off-by: Israel Blancas <[email protected]>

* Expose pprof server

Signed-off-by: Israel Blancas <[email protected]>

* Fix changelog

Signed-off-by: Israel Blancas <[email protected]>

* Apply changes requested in CR

Signed-off-by: Israel Blancas <[email protected]>

---------

Signed-off-by: Israel Blancas <[email protected]>
* Adding additional container specs to support sidecars and other containers in the collector pod

Signed-off-by: Matt Christiansen <[email protected]>

* Addressing code review comments: Improving the godoc comment, adding changelog file

* Update apis/v1alpha1/opentelemetrycollector_types.go

Co-authored-by: Tyler Helmuth <[email protected]>

* Update apis/v1alpha1/opentelemetrycollector_types.go

Co-authored-by: Tyler Helmuth <[email protected]>

* Adding in an assertion that the additional container equals input

* Adding webhook validation and improving comments based on PR feedback

---------

Signed-off-by: Matt Christiansen <[email protected]>
Co-authored-by: Tyler Helmuth <[email protected]>
* get servicename from daemonset if possible

Signed-off-by: Angelo Poerio <[email protected]>

* added changelog

Signed-off-by: Angelo Poerio <[email protected]>

---------

Signed-off-by: Angelo Poerio <[email protected]>
… additional configuration (#1981)

* Make sure OTLP export can report data to OTLP ingress/route without additional configuration.

Signed-off-by: Pavol Loffay <[email protected]>

* Trim CRD description size

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

---------

Signed-off-by: Pavol Loffay <[email protected]>
* Use golang 1.21

Signed-off-by: Pavol Loffay <[email protected]>

* Use golang 1.21

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

---------

Signed-off-by: Pavol Loffay <[email protected]>
#2027)

Bumps the kubernetes group in /cmd/operator-opamp-bridge with 2 updates: [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) and [k8s.io/client-go](https://github.com/kubernetes/client-go).


Updates `k8s.io/apimachinery` from 0.27.4 to 0.28.0
- [Commits](kubernetes/apimachinery@v0.27.4...v0.28.0)

Updates `k8s.io/client-go` from 0.27.4 to 0.28.0
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.27.4...v0.28.0)

---
updated-dependencies:
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: kubernetes
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: kubernetes
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…tewrite exporter (#2016) (#2017)

* Fix getPrometheusExporterPorts incorrectly matching to prometheusremotewrite exporter

* add unit test for collector prometheus rw exporter

* standardized code format
andreasgerstmayr and others added 28 commits November 24, 2023 17:14
Resolves the following warning from the scorecard tests:
```
Warning: Value opentelemetry.io/v1alpha1, Kind=OpAMPBridge: provided API should have an example annotation
```

Signed-off-by: Andreas Gerstmayr <[email protected]>
* add missing pod in the RBAC

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

* add missing pod in the rbac

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

* add missing pod in the rbac

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

---------

Signed-off-by: Husni Alhamdani <[email protected]>
* fix for #2366

* added cloggen

* typo

* typo

* e2e test for lifecycle removal from init container

* e2e test for lifecycle removal in init container
* fix cascading delete problem w/ checking for deletion timestamp, also retry on conflict automatically

* Add a test

* Fix test
…rs (#2287)

* Create a single interface for the Receiver and Exporter parsers

Signed-off-by: Israel Blancas <[email protected]>

* Fix lint

Signed-off-by: Israel Blancas <[email protected]>

* Use ComponentType

Signed-off-by: Israel Blancas <[email protected]>

* Apply changes requested in code review

Signed-off-by: Israel Blancas <[email protected]>

* Simplify getting the enabled components

Signed-off-by: Israel Blancas <[email protected]>

* Fix lint

Signed-off-by: Israel Blancas <[email protected]>

---------

Signed-off-by: Israel Blancas <[email protected]>
* adding error messages

* propagated errors

* added changelog

* working on updating tests

* propagated errors and added test

* Merge conflicts

* changing to debug exporter and adding additional error checks

* changing to debug exporter

* clean up code

* fixed linting errors

* config_to_ports error type

* fixing sha
* minor docs fix

* remove chlog
* remove old autodetection, cleanup

* remove unused
Bumps the prometheus group with 1 update: [github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring](https://github.com/prometheus-operator/prometheus-operator).

- [Release notes](https://github.com/prometheus-operator/prometheus-operator/releases)
- [Changelog](https://github.com/prometheus-operator/prometheus-operator/blob/main/CHANGELOG.md)
- [Commits](prometheus-operator/prometheus-operator@v0.69.1...v0.70.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prometheus
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* add headers to bridge config and include test for parsing config from yaml

* headers to own type and make translation method a method on the headers type

* rename file to headers.go, s/ToHttpHeader/ToHTTPHeader

* add changelog

* add copyright header
* Added PodMonitor when using sidecar mode

Signed-off-by: Yuri Sa <[email protected]>

* Added PodMonitor when using sidecar mode

Signed-off-by: Yuri Sa <[email protected]>

* Added PodMonitor when using sidecar mode

Signed-off-by: Yuri Sa <[email protected]>

* Added PodMonitor when using sidecar mode

Signed-off-by: Yuri Sa <[email protected]>

* Added PodMonitor when using sidecar mode

Signed-off-by: Yuri Sa <[email protected]>

* Added PodMonitor when using sidecar mode

Signed-off-by: Yuri Sa <[email protected]>

* Added PodMonitor when using sidecar mode

Signed-off-by: Yuri Sa <[email protected]>

* Added PodMonitor when using sidecar mode

Signed-off-by: Yuri Sa <[email protected]>

* Added PodMonitor when using sidecar mode

Signed-off-by: Yuri Sa <[email protected]>

* Added PodMonitor when using sidecar mode

Signed-off-by: Yuri Sa <[email protected]>

---------

Signed-off-by: Yuri Sa <[email protected]>
* add headers to opamp bridge spec and pass through to configmap generation

* run make generate

* add changelog

* run make bundle and make api-docs

* run 'VERSION="0.89.0" IMG="ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator" make bundle' from jacobs advice

* put these versions back

* rm another autogenned change

* rm this too

* rerun make bundle after pulling in main
* fix logging err in collector container manifest

* add chlog
* Add targetallocator securitycontext

Signed-off-by: Frances Barcelos <[email protected]>

* Add targetallocator securitycontext

Signed-off-by: Frances Barcelos <[email protected]>

* Adding perms for servicemonitors

* Update 00-assert.yaml

---------

Signed-off-by: Frances Barcelos <[email protected]>
Co-authored-by: Jacob Aronoff <[email protected]>
* bundlings

* Chlog

* forgot some stuff
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3 to 5.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@v3...v5)

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

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Improve developer experience

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

* handle e2e tests

Signed-off-by: Pavol Loffay <[email protected]>

* Fix

Signed-off-by: Pavol Loffay <[email protected]>

---------

Signed-off-by: Pavol Loffay <[email protected]>
Bumps alpine from 3.18 to 3.19.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps alpine from 3.18 to 3.19.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@matej-g matej-g merged commit 2487393 into coralogix:main Dec 11, 2023
1 check passed
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.