client: add WithExtraDialOpts option#11276
Conversation
|
/test pull-containerd-node-e2e |
|
/retest-required |
|
Not sure why that test keeps failing; should be unrelated, but let me do a rebase to see if we can get CI go green |
thaJeztah
force-pushed
the
client_WithExtraDialOpts
branch
from
4df425e to
ccc9bbf
Compare
It's a k8s side issue kubernetes/kubernetes#129695. A fix seems on the way kubernetes/test-infra#34179. |
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
the client package provides a WithDialOpts option, however, dial-options passed to override all defaults that are set in containerd. This makes it difficult to expand the defaults with custom options, as this requires copying the defaults, and trying to keep those in sync (e.g. see [moby#48617]). This patch introduces a new `WithExtraDialOpts` option which, unlike `WithDialOpts` are appended to, instead of overriding, previous options. This allows setting custom options, while maintaining containerd's defaults. Also unlike `WithDialOpts`, this option can be used multiple times to allow additional options to be set. [moby#48617]: moby/moby#48617 Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
client_WithExtraDialOpts
branch
from
ccc9bbf to
a6dc990
Compare
Thanks for linking those (and thanks for review, both!). I saw the PR was merged, so I did another rebase to see if the problem is fixed now 👍 |
|
🎉 CI is green now 👍 |
7 participants
the client package provides a WithDialOpts option, however, dial-options passed to override all defaults that are set in containerd. This makes it difficult to expand the defaults with custom options, as this requires copying the defaults, and trying to keep those in sync (e.g. see moby#48617).
This patch introduces a new
WithExtraDialOptsoption which, unlikeWithDialOptsare appended to, instead of overriding, previous options. This allows setting custom options, while maintaining containerd's defaults.Also unlike
WithDialOpts, this option can be used multiple times to allow additional options to be set.