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

Revert "Revert" Add reconciliation for Collector v1beta1 CRD (#2703)"… #2813

Merged
merged 5 commits into from
Apr 12, 2024

Conversation

pavolloffay
Copy link
Member

@pavolloffay pavolloffay commented Apr 5, 2024

… (#2800)"

This reverts commit 57024fc.

Resolves #1907

Adds #2703

Description:

Link to tracking Issue(s):

  • Resolves: #issue-number

Testing:

Documentation:

@pavolloffay pavolloffay requested a review from a team April 5, 2024 09:50
Copy link
Contributor

@swiatekm swiatekm left a comment

Choose a reason for hiding this comment

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

We need to remember to merge #2563 before the next release. @iblancasa can you rebase it once this PR is merged?

@jaronoff97
Copy link
Contributor

We also want to merge this after this merges right? open-telemetry/opentelemetry-collector-releases#507

Signed-off-by: Pavol Loffay <[email protected]>
Signed-off-by: Pavol Loffay <[email protected]>
Signed-off-by: Pavol Loffay <[email protected]>
Signed-off-by: Pavol Loffay <[email protected]>
@pavolloffay pavolloffay merged commit 15bd804 into open-telemetry:main Apr 12, 2024
31 checks passed
ItielOlenick pushed a commit to ItielOlenick/opentelemetry-operator that referenced this pull request May 1, 2024
…lemetry#2703)"… (open-telemetry#2813)

* Revert "Revert" Add reconciliation for Collector v1beta1 CRD (open-telemetry#2703)" (open-telemetry#2800)"

This reverts commit 57024fc.

* Fix image

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

* Clarify hostport

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

* Fix issue after israel

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

* Fix

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

---------

Signed-off-by: Pavol Loffay <[email protected]>
rubenvp8510 pushed a commit to rubenvp8510/opentelemetry-operator that referenced this pull request May 7, 2024
…lemetry#2703)"… (open-telemetry#2813)

* Revert "Revert" Add reconciliation for Collector v1beta1 CRD (open-telemetry#2703)" (open-telemetry#2800)"

This reverts commit 57024fc.

* Fix image

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

* Clarify hostport

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

* Fix issue after israel

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

* Fix

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

---------

Signed-off-by: Pavol Loffay <[email protected]>
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.

Unable to configure servicemonitorselector under prometheusCR under targetallocator section
3 participants