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

[master] Wrap containerd.New #5361

Merged
merged 1 commit into from Mar 30, 2022

Conversation

luthermonson
Copy link
Contributor

problem: While setting up containerd we make a client and the name of the npipe for windows is npipe://./pipe/containerd-containerd but at some point between windows server patches and the winio dialer we got to a place where it's expecting \\.\pipe\containerd-containerd and the npipe:// needed to be dropped. This was fixed CriConnection as the address was wrapped with utils.GetAddressAndDialer but the second call to containerd.New for a client didn't have this.
Fix: wrap the containerd.New call with a func that parses the address properly and pass that down

rancher/rke2#2161
rancher/windows#72

@luthermonson luthermonson requested a review from a team as a code owner March 29, 2022 23:29
@luthermonson luthermonson changed the title add a wrapper around the containerd.New call to fix and pass the prop… [master] Wrap containerd.New Mar 29, 2022
Copy link
Contributor

@phillipsj phillipsj left a comment

Choose a reason for hiding this comment

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

LGTM!

…er npipe connector

Signed-off-by: Luther Monson <luther.monson@gmail.com>
@codecov-commenter
Copy link

codecov-commenter commented Mar 30, 2022

Codecov Report

Merging #5361 (13191da) into master (1339626) will decrease coverage by 0.00%.
The diff coverage is 0.00%.

@@            Coverage Diff            @@
##           master   #5361      +/-   ##
=========================================
- Coverage    9.69%   9.68%   -0.01%     
=========================================
  Files         133     133              
  Lines        9377    9381       +4     
=========================================
  Hits          909     909              
- Misses       8275    8279       +4     
  Partials      193     193              
Flag Coverage Δ
unittests 9.68% <0.00%> (-0.01%) ⬇️

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

Impacted Files Coverage Δ
pkg/agent/containerd/config_linux.go 0.00% <0.00%> (ø)
pkg/agent/containerd/containerd.go 0.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1339626...13191da. Read the comment docs.

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

5 participants