Fix SSH incompatibility with v25 #1039
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Does the PR have any schema changes?Does the PR have any schema changes?Looking good! No breaking changes found. Maintainer note: consult the runbook for dealing with any breaking changes. |
mjeffryes
approved these changes
Mar 26, 2024
| @@ -1108,8 +1107,9 @@ func configureDockerClientInner(configs map[string]string, host string) (*client | |||
| clientOpts = append(clientOpts, | |||
| client.FromEnv, | |||
| client.WithAPIVersionNegotiation(), | |||
| client.WithHost(helper.Host), | |||
There was a problem hiding this comment.
might be worth adding a comment about the ordering constraint.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The v25 upgrade made us sensitive to the ordering of our client options.
In particular if a host was specified last it would take precedence over the SSH dialer. This behavior was accounted for in the upstream patch but not in our own host resolution logic.
The PR adds a failing e2e test and a corresponding fix to our client options.