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.

Sign up for GitHub

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

Jump to bottom

Merge https://github.com/grafana/tempo-operator:main (7271d40) into main #85

Merged
merged 6 commits into from
Feb 13, 2025
Merged

Merge https://github.com/grafana/tempo-operator:main (7271d40) into main #85

merged 6 commits into from
Feb 13, 2025

Conversation

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

No description provided.

@rubenvp8510
Set default limits to oauth proxy (grafana#1106)
1adba61 
* Set default limits to oauth proxy

Signed-off-by: Ruben Vargas <[email protected]>

* fix component name

Signed-off-by: Ruben Vargas <[email protected]>

---------

Signed-off-by: Ruben Vargas <[email protected]>
@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 Feb 10, 2025
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Feb 10, 2025

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.

@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 Feb 11, 2025
@IshwarKanse
Copy link
Member

/retest

@IshwarKanse
Copy link
Member

Most of the tests failing with the oauth proxy PR grafana#1106

        === ERROR
        Internal error occurred: failed calling webhook "mtempostack.tempo.grafana.com": failed to call webhook: Post "https://tempo-operator-controller-service.openshift-tempo-operator.svc:443/mutate-tempo-grafana-com-v1alpha1-tempostack?timeout=10s": no endpoints available for service "tempo-operator-controller-service"
=== NAME  chainsaw/monolithic-route

Will check the issue on a manually provisioned cluster.

@IshwarKanse
Copy link
Member

/test upstream-ocp-4.15-amd64-aws-tempo-e2e-tests

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 11, 2025
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/grafana/tempo-operator:main (1adba61) into main Merge https://github.com/grafana/tempo-operator:main (6ca8752) into main Feb 11, 2025
@cloud-team-rebase-bot cloud-team-rebase-bot bot changed the title Merge https://github.com/grafana/tempo-operator:main (6ca8752) into main Merge https://github.com/grafana/tempo-operator:main (7271d40) into main Feb 12, 2025
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Feb 13, 2025

@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.

IshwarKanse
IshwarKanse approved these changes Feb 13, 2025
View reviewed changes
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

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 13, 2025
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Feb 13, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cloud-team-rebase-bot[bot], frzifus, 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]

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 52ed498 into openshift:main Feb 13, 2025
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IshwarKanse IshwarKanse IshwarKanse approved these changes

@frzifus frzifus frzifus approved these changes

Assignees

@IshwarKanse IshwarKanse

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@IshwarKanse @frzifus @rubenvp8510