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

[release/1.7] Update HTTP fallback to better account for TLS timeout and previous attempts #10112

Merged
merged 3 commits into from
Apr 23, 2024
Merged

[release/1.7] Update HTTP fallback to better account for TLS timeout and previous attempts #10112

merged 3 commits into from
Apr 23, 2024

Conversation

dmcgowan
Copy link
Member

Backport of #10109

@dmcgowan
Remove empty default tls configuration in ctr
aa14890 
Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit 7c50784)
Signed-off-by: Derek McGowan <derek@mcg.dev>
@dmcgowan
Update HTTPFallback to handle tls handshake timeout
51c649d 
Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit 5e470e1)
Signed-off-by: Derek McGowan <derek@mcg.dev>
@dmcgowan
Add deprecated HTTPFallback for package compatibility
794b0c7 
Signed-off-by: Derek McGowan <derek@mcg.dev>
@fuweid fuweid merged commit 316fcf9 into containerd:release/1.7 Apr 23, 2024
56 checks passed
@kiashok kiashok mentioned this pull request Apr 24, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@fuweid fuweid fuweid approved these changes

Assignees
No one assigned
Labels
impact/changelog size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dmcgowan @AkihiroSuda @fuweid @k8s-ci-robot