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

[Release-1.27] Move proxy dialer out of init() and fix crash #9220

Merged
merged 1 commit into from Jan 12, 2024

Conversation

dereknola
Copy link
Contributor

Proposed Changes

Backport #9219 to release-1.27

  • Fixes issue where proxy support only honored server address via K3S_URL, not CLI or config.
  • Fixes crash when agent proxy is enabled, but proxy env vars do not return a proxy URL for the server address (server URL is in NO_PROXY list).
  • Adds tests

Types of Changes

Verification

Testing

Linked Issues

#9114

User-Facing Change


Further Comments

* Fixes issue where proxy support only honored server address via K3S_URL, not CLI or config.
* Fixes crash when agent proxy is enabled, but proxy env vars do not return a proxy URL for the server address (server URL is in NO_PROXY list).
* Adds tests

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@dereknola dereknola requested a review from a team as a code owner January 11, 2024 23:46
Copy link

codecov bot commented Jan 12, 2024

Codecov Report

Attention: 5 lines in your changes are missing coverage. Please review.

Comparison is base (e9b2e59) 46.68% compared to head (ffbaf80) 45.80%.
Report is 21 commits behind head on release-1.27.

Files Patch % Lines
pkg/agent/proxy/apiproxy.go 0.00% 2 Missing and 1 partial ⚠️
pkg/agent/loadbalancer/servers.go 88.88% 2 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.27    #9220      +/-   ##
================================================
- Coverage         46.68%   45.80%   -0.89%     
================================================
  Files               148      148              
  Lines             15861    15869       +8     
================================================
- Hits               7405     7269     -136     
- Misses             7251     7433     +182     
+ Partials           1205     1167      -38     
Flag Coverage Δ
inttests 43.22% <14.28%> (-1.03%) ⬇️
unittests 18.54% <88.88%> (+0.22%) ⬆️

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.

@dereknola dereknola merged commit 138c5c9 into k3s-io:release-1.27 Jan 12, 2024
15 checks passed
@dereknola dereknola deleted the fix_agent_proxy_127 branch February 22, 2024 20:06
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.

None yet

2 participants