Skip to content

Allow fallback across default ports#10286

Merged
mxpv merged 2 commits intocontainerd:mainfrom
dmcgowan:update-tls-fallback-default-ports
Jun 11, 2024
Merged

Allow fallback across default ports#10286
mxpv merged 2 commits intocontainerd:mainfrom
dmcgowan:update-tls-fallback-default-ports

Conversation

@dmcgowan
Copy link
Member

When no port is specified in host, allow falling back from 443 to 80 when http is specified along with a TLS configuration. This increases the cases when https can be preferred and fixes a case where fallback does not happen after a connection refused where previously Docker would have fallen back.

Related to moby/buildkit#4915 which uses same approach

@dmcgowan dmcgowan force-pushed the update-tls-fallback-default-ports branch from 8056aa6 to 0ad17bf Compare May 30, 2024 23:24
@dmcgowan dmcgowan marked this pull request as draft May 31, 2024 15:17
@dmcgowan dmcgowan force-pushed the update-tls-fallback-default-ports branch from 1272282 to bd71a33 Compare May 31, 2024 18:04
dmcgowan added 2 commits June 5, 2024 14:39
When no port is specified, allow falling back from 443 to 80 when
http is specified along with a TLS configuration.

Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan dmcgowan force-pushed the update-tls-fallback-default-ports branch from bd71a33 to d23c4b8 Compare June 5, 2024 21:40
@dmcgowan dmcgowan marked this pull request as ready for review June 6, 2024 13:27
@dmcgowan
Copy link
Member Author

dmcgowan commented Jun 6, 2024

This one is ready to go

@mxpv mxpv added this pull request to the merge queue Jun 7, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 7, 2024
@mxpv mxpv added this pull request to the merge queue Jun 7, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Jun 7, 2024
@dmcgowan dmcgowan added this pull request to the merge queue Jun 8, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 8, 2024
@mxpv mxpv added this pull request to the merge queue Jun 11, 2024
Merged via the queue into containerd:main with commit e840d1d Jun 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants