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

Merge https://github.com/grafana/tempo-operator:main (f5ce71b) into main #70

Merged
merged 5 commits into from
Sep 10, 2024

Conversation

cloud-team-rebase-bot[bot]
Copy link

No description provided.

* tempoQuery: split tempo and jaeger query

Signed-off-by: Benedikt Bongartz <[email protected]>

* add jaeger container to monolithic statefulset

Signed-off-by: Benedikt Bongartz <[email protected]>

* generate

Signed-off-by: Benedikt Bongartz <[email protected]>

* adapt e2e tests

Signed-off-by: Benedikt Bongartz <[email protected]>

---------

Signed-off-by: Benedikt Bongartz <[email protected]>
Copy link

openshift-ci bot commented Sep 6, 2024

Hi @cloud-team-rebase-bot[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 6, 2024
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 6, 2024
@IshwarKanse
Copy link
Member

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 9, 2024
@IshwarKanse
Copy link
Member

Will add the PR to fix tests after changes due to grafana#1025

@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/grafana/tempo-operator:main (21054a4) into main Merge https://github.com/grafana/tempo-operator:main (f5ce71b) into main Sep 9, 2024
@IshwarKanse
Copy link
Member

/override ci/prow/upstream-ocp-4.15-amd64-aws-tempo-e2e-tests

Copy link
Member

@IshwarKanse IshwarKanse left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link

openshift-ci bot commented Sep 10, 2024

@IshwarKanse: Overrode contexts on behalf of IshwarKanse: ci/prow/upstream-ocp-4.15-amd64-aws-tempo-e2e-tests

In response to this:

/override ci/prow/upstream-ocp-4.15-amd64-aws-tempo-e2e-tests

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link

openshift-ci bot commented Sep 10, 2024

@cloud-team-rebase-bot[bot]: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 10, 2024
Copy link

openshift-ci bot commented Sep 10, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cloud-team-rebase-bot[bot], frzifus, iblancasa, IshwarKanse

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [IshwarKanse,frzifus,iblancasa]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit a5422c5 into openshift:main Sep 10, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants