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

Set default limits to oauth proxy #1106

Merged
merged 4 commits into from
Feb 10, 2025

Conversation

rubenvp8510
Copy link
Collaborator

No description provided.

@rubenvp8510 rubenvp8510 force-pushed the set_recources_tempo_frontend branch from 0060b51 to e26298c Compare January 30, 2025 06:50
@codecov-commenter
Copy link

codecov-commenter commented Jan 30, 2025

Codecov Report

Attention: Patch coverage is 80.00000% with 3 lines in your changes missing coverage. Please review.

Project coverage is 58.61%. Comparing base (45d4a41) to head (480bffb).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
internal/manifests/monolithic/build.go 0.00% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1106      +/-   ##
==========================================
+ Coverage   58.60%   58.61%   +0.01%     
==========================================
  Files         113      113              
  Lines       10160    10168       +8     
==========================================
+ Hits         5954     5960       +6     
- Misses       3900     3902       +2     
  Partials      306      306              
Flag Coverage Δ
unittests 58.61% <80.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -90,13 +90,16 @@ func BuildQueryFrontend(params manifestutils.Params) ([]client.Object, error) {
jaegerUIAuthentication := tempo.Spec.Template.QueryFrontend.JaegerQuery.Authentication

if jaegerUIAuthentication != nil && jaegerUIAuthentication.Enabled {
defaultOauthProxyResources := manifestutils.Resources(tempo, manifestutils.QueryFrontendComponentName, tempo.Spec.Template.QueryFrontend.Replicas)
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think it should take the resources from jaeger-frontend-proxy, not from manifestutils.QueryFrontendComponentName, or am I reading it wrong?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Oh true! a mistake! good catch thanks

@pavolloffay pavolloffay merged commit 1adba61 into grafana:main Feb 10, 2025
11 checks 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.

4 participants