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

[1.22] Wrap containerd.New #5362

Merged

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 30, 2022 00:40
@luthermonson luthermonson force-pushed the fix-containerd-npipe-122 branch 2 times, most recently from e299662 to c459950 Compare March 30, 2022 00:58
…er npipe connector

Signed-off-by: Luther Monson <luther.monson@gmail.com>
@luthermonson luthermonson force-pushed the fix-containerd-npipe-122 branch from c459950 to 4a97a7c Compare March 30, 2022 01:08
@codecov-commenter
Copy link

codecov-commenter commented Mar 30, 2022

Codecov Report

Merging #5362 (4a97a7c) into release-1.22 (4cc9a48) will decrease coverage by 0.00%.
The diff coverage is 0.00%.

@@               Coverage Diff               @@
##           release-1.22   #5362      +/-   ##
===============================================
- Coverage          9.54%   9.54%   -0.01%     
===============================================
  Files               134     134              
  Lines              9446    9450       +4     
===============================================
  Hits                902     902              
- Misses             8353    8357       +4     
  Partials            191     191              
Flag Coverage Δ
unittests 9.54% <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 4cc9a48...4a97a7c. Read the comment docs.

@luthermonson luthermonson merged commit 21fed35 into k3s-io:release-1.22 Mar 30, 2022
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